diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t --- a/tests/test-hgweb-filelog.t +++ b/tests/test-hgweb-filelog.t @@ -8,8 +8,13 @@ $ echo a > a $ hg ci -Am "first a" adding a + $ hg tag -r 1 a-tag + $ hg bookmark -r 1 a-bookmark $ hg rm a $ hg ci -m "del a" + $ hg branch a-branch + marked working directory as branch a-branch + (branches are permanent and global, did you want a bookmark?) $ echo b > a $ hg ci -Am "second a" adding a @@ -20,69 +25,86 @@ $ echo c >> c $ hg ci -m "change c" $ hg log -p - changeset: 6:b7682196df1c + changeset: 7:46c1a66bd8fc + branch: a-branch tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change c - diff -r 1a6696706df2 -r b7682196df1c c + diff -r c9637d3cc8ef -r 46c1a66bd8fc c --- a/c Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,2 @@ b +c - changeset: 5:1a6696706df2 + changeset: 6:c9637d3cc8ef + branch: a-branch user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: mv b - diff -r 52e848cdcd88 -r 1a6696706df2 b + diff -r 958bd88be4eb -r c9637d3cc8ef b --- a/b Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -b - diff -r 52e848cdcd88 -r 1a6696706df2 c + diff -r 958bd88be4eb -r c9637d3cc8ef c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +b - changeset: 4:52e848cdcd88 + changeset: 5:958bd88be4eb + branch: a-branch user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: del2 a - diff -r 01de2d66a28d -r 52e848cdcd88 a + diff -r 3f41bc784e7e -r 958bd88be4eb a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -b - changeset: 3:01de2d66a28d + changeset: 4:3f41bc784e7e + branch: a-branch user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: second a - diff -r be3ebcc91739 -r 01de2d66a28d a + diff -r 292258f86fdf -r 3f41bc784e7e a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +b - changeset: 2:be3ebcc91739 + changeset: 3:292258f86fdf user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: del a - diff -r 5ed941583260 -r be3ebcc91739 a + diff -r 94c9dd5ca9b4 -r 292258f86fdf a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -a + changeset: 2:94c9dd5ca9b4 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: Added tag a-tag for changeset 5ed941583260 + + diff -r 5ed941583260 -r 94c9dd5ca9b4 .hgtags + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +5ed941583260248620985524192fdc382ef57c36 a-tag + changeset: 1:5ed941583260 + bookmark: a-bookmark + tag: a-tag user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: first a @@ -135,29 +157,29 @@ tip - two revisions mercurial @@ -175,8 +197,8 @@ tip - two revisions @@ -192,8 +214,8 @@ tip - two revisions @@ -201,7 +223,7 @@ tip - two revisions @@ -209,8 +231,8 @@ tip - two revisions
Thu, 01 Jan 1970 00:00:00 +0000 test - second a - + second a + a-branch
test first a - + a-tag
@@ -226,7 +248,7 @@ tip - two revisions second version - two revisions - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/3/a') + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/4/a') 200 Script output follows @@ -252,29 +274,29 @@ second version - two revisions mercurial @@ -292,8 +314,8 @@ second version - two revisions @@ -309,8 +331,8 @@ second version - two revisions @@ -318,7 +340,7 @@ second version - two revisions @@ -326,8 +348,8 @@ second version - two revisions
Thu, 01 Jan 1970 00:00:00 +0000 test - second a - + second a + a-branch
test first a - + a-tag
@@ -343,7 +365,7 @@ second version - two revisions first deleted - one revision - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/2/a') + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/3/a') 200 Script output follows @@ -427,7 +449,7 @@ first deleted - one revision test first a - + a-tag @@ -536,7 +558,7 @@ first version - one revision test first a - + a-tag @@ -652,8 +674,8 @@ should show base link, use spartan becau graph tags branches - file - annotate + file + annotate help rss atom @@ -661,19 +683,19 @@ should show base link, use spartan becau

Mercurial / c revision history

-

navigate: (0) tip

+

navigate: (0) tip

- + @@ -691,14 +713,14 @@ should show base link, use spartan becau
Thu, 01 Jan 1970 00:00:00 +0000:change cchange c
revision 1: - b7682196df1c - (diff) - (annotate) + 46c1a66bd8fc + (diff) + (annotate)
- + @@ -749,7 +771,7 @@ rss log a revision history second a - http://*:$HGPORT/log01de2d66a28d/a (glob) + http://*:$HGPORT/log3f41bc784e7e/a (glob) test Thu, 01 Jan 1970 00:00:00 +0000 @@ -778,9 +800,9 @@ atom log 1970-01-01T00:00:00+00:00 - second a - http://*:$HGPORT/#changeset-01de2d66a28df5549090991dccda788726948517 (glob) - (glob) + [a-branch] second a + http://*:$HGPORT/#changeset-3f41bc784e7e73035c6d47112c6cc7efb673adf8 (glob) + (glob) test test @@ -791,11 +813,11 @@ atom log
Thu, 01 Jan 1970 00:00:00 +0000:mv bmv b
revision 0: - 1a6696706df2 - (diff) - (annotate) + c9637d3cc8ef + (diff) + (annotate)
- + - + @@ -842,11 +864,11 @@ atom log - + - +
changeset01de2d66a28d3f41bc784e7e
brancha-branch
bookmark
bookmarka-bookmark
taga-tag
user