Show More
@@ -393,12 +393,11 b' def tags(web, req, tmpl):' | |||||
393 |
|
393 | |||
394 | def bookmarks(web, req, tmpl): |
|
394 | def bookmarks(web, req, tmpl): | |
395 | i = web.repo._bookmarks.items() |
|
395 | i = web.repo._bookmarks.items() | |
396 | i.reverse() |
|
|||
397 | parity = paritygen(web.stripecount) |
|
396 | parity = paritygen(web.stripecount) | |
398 |
|
397 | |||
399 | def entries(notip=False, limit=0, **map): |
|
398 | def entries(notip=False, limit=0, **map): | |
400 | count = 0 |
|
399 | count = 0 | |
401 | for k, n in i: |
|
400 | for k, n in sorted(i): | |
402 | if notip and k == "tip": |
|
401 | if notip and k == "tip": | |
403 | continue |
|
402 | continue | |
404 | if limit > 0 and count >= limit: |
|
403 | if limit > 0 and count >= limit: |
@@ -16,6 +16,7 b' Set up the repo' | |||||
16 | adding foo |
|
16 | adding foo | |
17 | $ hg tag 1.0 |
|
17 | $ hg tag 1.0 | |
18 | $ hg bookmark something |
|
18 | $ hg bookmark something | |
|
19 | $ hg bookmark -r0 anotherthing | |||
19 | $ echo another > foo |
|
20 | $ echo another > foo | |
20 | $ hg branch stable |
|
21 | $ hg branch stable | |
21 | marked working directory as branch stable |
|
22 | marked working directory as branch stable | |
@@ -256,7 +257,7 b' Logs and changes' | |||||
256 | <tr class="parity0"> |
|
257 | <tr class="parity0"> | |
257 | <td class="age">1970-01-01</td> |
|
258 | <td class="age">1970-01-01</td> | |
258 | <td class="author">test</td> |
|
259 | <td class="author">test</td> | |
259 | <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> </td> |
|
260 | <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> <span class="tag">anotherthing</span> </td> | |
260 | </tr> |
|
261 | </tr> | |
261 |
|
262 | |||
262 | </table> |
|
263 | </table> | |
@@ -317,7 +318,7 b' Logs and changes' | |||||
317 | <div class="main"> |
|
318 | <div class="main"> | |
318 |
|
319 | |||
319 | <h2><a href="/">test</a></h2> |
|
320 | <h2><a href="/">test</a></h2> | |
320 | <h3>changeset 0:2ef0ac749a14 <span class="tag">1.0</span> </h3> |
|
321 | <h3>changeset 0:2ef0ac749a14 <span class="tag">1.0</span> <span class="tag">anotherthing</span> </h3> | |
321 |
|
322 | |||
322 | <form class="search" action="/log"> |
|
323 | <form class="search" action="/log"> | |
323 |
|
324 | |||
@@ -443,7 +444,7 b' Logs and changes' | |||||
443 | <tr class="parity0"> |
|
444 | <tr class="parity0"> | |
444 | <td class="age">1970-01-01</td> |
|
445 | <td class="age">1970-01-01</td> | |
445 | <td class="author">test</td> |
|
446 | <td class="author">test</td> | |
446 | <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> </td> |
|
447 | <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> <span class="tag">anotherthing</span> </td> | |
447 | </tr> |
|
448 | </tr> | |
448 |
|
449 | |||
449 | </table> |
|
450 | </table> | |
@@ -606,6 +607,7 b' Overviews' | |||||
606 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-bookmarks' |
|
607 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-bookmarks' | |
607 | 200 Script output follows |
|
608 | 200 Script output follows | |
608 |
|
609 | |||
|
610 | anotherthing 2ef0ac749a14e4f57a5a822464a0902c6f7f448f | |||
609 | something 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe |
|
611 | something 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe | |
610 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb' |
|
612 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb' | |
611 | 200 Script output follows |
|
613 | 200 Script output follows | |
@@ -695,7 +697,7 b' Overviews' | |||||
695 | <td> |
|
697 | <td> | |
696 | <a class="list" href="/rev/2ef0ac749a14?style=gitweb"> |
|
698 | <a class="list" href="/rev/2ef0ac749a14?style=gitweb"> | |
697 | <b>base</b> |
|
699 | <b>base</b> | |
698 | <span class="logtags"><span class="tagtag" title="1.0">1.0</span> </span> |
|
700 | <span class="logtags"><span class="tagtag" title="1.0">1.0</span> <span class="bookmarktag" title="anotherthing">anotherthing</span> </span> | |
699 | </a> |
|
701 | </a> | |
700 | </td> |
|
702 | </td> | |
701 | <td class="link" nowrap> |
|
703 | <td class="link" nowrap> | |
@@ -821,7 +823,7 b' Overviews' | |||||
821 | <script> |
|
823 | <script> | |
822 | <!-- hide script content |
|
824 | <!-- hide script content | |
823 |
|
825 | |||
824 | var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], []]]; |
|
826 | var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], ["anotherthing"]]]; | |
825 | var graph = new Graph(); |
|
827 | var graph = new Graph(); | |
826 | graph.scale(39); |
|
828 | graph.scale(39); | |
827 |
|
829 | |||
@@ -1086,7 +1088,7 b' Graph json escape of multibyte character' | |||||
1086 |
|
1088 | |||
1087 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \ |
|
1089 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \ | |
1088 | > | grep '^var data =' |
|
1090 | > | grep '^var data =' | |
1089 | var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "\u80fd", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], [], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], []]]; |
|
1091 | var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "\u80fd", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], [], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], ["anotherthing"]]]; | |
1090 |
|
1092 | |||
1091 | ERRORS ENCOUNTERED |
|
1093 | ERRORS ENCOUNTERED | |
1092 |
|
1094 |
General Comments 0
You need to be logged in to leave comments.
Login now