--- a/tests/test-uncommit.t Tue Jul 25 15:18:09 2017 +0200
+++ b/tests/test-uncommit.t Tue Jul 25 15:18:24 2017 +0200
@@ -4,7 +4,7 @@
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ glog() {
- > hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
+ > hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' "$@"
> }
$ hg init repo
@@ -119,13 +119,13 @@
Add a couple of bookmarks
$ glog --hidden
- @ 3:5eb72dbe0cb4@bar(draft) touncommit
+ @ 3:5eb72dbe0cb4@bar(/draft) touncommit
|
- o 2:f63b90038565@default(draft) merge
+ o 2:f63b90038565@default(/draft) merge
|\
- | o 1:f15c744d48e8@default(draft) addmore
+ | o 1:f15c744d48e8@default(/draft) addmore
|
- o 0:07f494440405@default(draft) adda
+ o 0:07f494440405@default(/draft) adda
$ hg bookmark -r 2 unrelated
$ hg bookmark touncommit-bm
@@ -218,15 +218,15 @@
$ hg cat -r . e
e
$ glog --hidden
- @ 4:e8db4aa611f6@bar(draft) touncommit
+ @ 4:e8db4aa611f6@bar(/draft) touncommit
|
| x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
|/
- o 2:f63b90038565@default(draft) merge
+ o 2:f63b90038565@default(/draft) merge
|\
- | o 1:f15c744d48e8@default(draft) addmore
+ | o 1:f15c744d48e8@default(/draft) addmore
|
- o 0:07f494440405@default(draft) adda
+ o 0:07f494440405@default(/draft) adda
$ hg bookmarks
* touncommit-bm 4:e8db4aa611f6
@@ -266,17 +266,17 @@
R m
R n
$ glog --hidden
- @ 5:a1d4c1ad76cc@bar(draft) touncommit
+ @ 5:a1d4c1ad76cc@bar(/draft) touncommit
|
- | o 4:e8db4aa611f6@bar(draft) touncommit
+ | o 4:e8db4aa611f6@bar(/draft) touncommit
|/
| x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
|/
- o 2:f63b90038565@default(draft) merge
+ o 2:f63b90038565@default(/draft) merge
|\
- | o 1:f15c744d48e8@default(draft) addmore
+ | o 1:f15c744d48e8@default(/draft) addmore
|
- o 0:07f494440405@default(draft) adda
+ o 0:07f494440405@default(/draft) adda
$ hg debugobsolete
5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob)