--- a/tests/test-prune.t Mon Feb 04 19:08:27 2013 +0100
+++ b/tests/test-prune.t Mon Feb 04 21:40:58 2013 +0100
@@ -1,6 +1,6 @@
$ cat >> $HGRCPATH <<EOF
> [ui]
- > logtemplate={rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n
+ > logtemplate={rev}:{node|short}[] ({obsolete}/{phase}) {desc|firstline}\n
> [extensions]
> hgext.rebase=
> EOF
@@ -21,15 +21,15 @@
$ mkcommit d
$ mkcommit e
$ hg log -G
- @ 4:9d206ffc875e@default(stable/draft) add e
+ @ 4:9d206ffc875e[] (stable/draft) add e
|
- o 3:47d2a3944de8@default(stable/draft) add d
+ o 3:47d2a3944de8[] (stable/draft) add d
|
- o 2:4538525df7e2@default(stable/draft) add c
+ o 2:4538525df7e2[] (stable/draft) add c
|
- o 1:7c3bad9141dc@default(stable/draft) add b
+ o 1:7c3bad9141dc[] (stable/draft) add b
|
- o 0:1f0dee641bb7@default(stable/public) add a
+ o 0:1f0dee641bb7[] (stable/public) add a
Check simple case
@@ -93,23 +93,23 @@
$ mkcommit nE
$ hg log -G
- @ 12:6e8148413dd5@default(stable/draft) add nE
+ @ 12:6e8148413dd5[] (stable/draft) add nE
|
- o 11:8ee176ff1d4b@default(stable/draft) add nD
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
|
- o 10:aa96dc3f04c2@default(stable/draft) add nC
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
|
- o 9:6f6f25e4f748@default(stable/draft) add nB
+ o 9:6f6f25e4f748[] (stable/draft) add nB
|
- | o 8:bb5e90a7ea1f@default(stable/draft) add ee
+ | o 8:bb5e90a7ea1f[] (stable/draft) add ee
| |
- | o 7:00ded550b1e2@default(stable/draft) add dd
+ | o 7:00ded550b1e2[] (stable/draft) add dd
| |
- | o 6:354011cd103f@default(stable/draft) add cc
+ | o 6:354011cd103f[] (stable/draft) add cc
| |
- | o 5:814c38b95e72@default(stable/draft) add bb
+ | o 5:814c38b95e72[] (stable/draft) add bb
|/
- o 0:1f0dee641bb7@default(stable/public) add a
+ o 0:1f0dee641bb7[] (stable/public) add a
one old, one new
@@ -123,21 +123,21 @@
47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob)
bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
$ hg log -G
- @ 12:6e8148413dd5@default(stable/draft) add nE
+ @ 12:6e8148413dd5[] (stable/draft) add nE
|
- o 11:8ee176ff1d4b@default(stable/draft) add nD
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
|
- o 10:aa96dc3f04c2@default(stable/draft) add nC
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
|
- o 9:6f6f25e4f748@default(stable/draft) add nB
+ o 9:6f6f25e4f748[] (stable/draft) add nB
|
- | o 7:00ded550b1e2@default(stable/draft) add dd
+ | o 7:00ded550b1e2[] (stable/draft) add dd
| |
- | o 6:354011cd103f@default(stable/draft) add cc
+ | o 6:354011cd103f[] (stable/draft) add cc
| |
- | o 5:814c38b95e72@default(stable/draft) add bb
+ | o 5:814c38b95e72[] (stable/draft) add bb
|/
- o 0:1f0dee641bb7@default(stable/public) add a
+ o 0:1f0dee641bb7[] (stable/public) add a
one old, two new
@@ -152,19 +152,19 @@
bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob)
$ hg log -G
- @ 12:6e8148413dd5@default(stable/draft) add nE
+ @ 12:6e8148413dd5[] (stable/draft) add nE
|
- o 11:8ee176ff1d4b@default(stable/draft) add nD
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
|
- o 10:aa96dc3f04c2@default(stable/draft) add nC
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
|
- o 9:6f6f25e4f748@default(stable/draft) add nB
+ o 9:6f6f25e4f748[] (stable/draft) add nB
|
- | o 6:354011cd103f@default(stable/draft) add cc
+ | o 6:354011cd103f[] (stable/draft) add cc
| |
- | o 5:814c38b95e72@default(stable/draft) add bb
+ | o 5:814c38b95e72[] (stable/draft) add bb
|/
- o 0:1f0dee641bb7@default(stable/public) add a
+ o 0:1f0dee641bb7[] (stable/public) add a
two old, two new (should be denied)