merge with 5.6.0
A minor one line conflict on test output were encountered.
--- a/tests/test-obsolete-push.t Wed Feb 01 15:27:04 2017 +0100
+++ b/tests/test-obsolete-push.t Wed Feb 01 15:32:59 2017 +0100
@@ -6,7 +6,7 @@
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
- $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
+ $ template='{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
$ glog() {
> hg glog --template "$template" "$@"
> }
@@ -29,7 +29,7 @@
2 changesets pruned
1 new unstable changesets
$ glog --hidden
- @ 2:244232c2222a@default(secret) C
+ @ 2:244232c2222a@default(/secret) C
|
| x 1:6c81ed0049f8@default(obsolete/draft) B
|/
--- a/tests/test-obsolete.t Wed Feb 01 15:27:04 2017 +0100
+++ b/tests/test-obsolete.t Wed Feb 01 15:32:59 2017 +0100
@@ -151,18 +151,18 @@
Test obsolete keyword
$ hg --hidden log -G \
- > --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
- @ 5:a7a6f2b5d8a5@default(draft) add d
+ > --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
+ @ 5:a7a6f2b5d8a5@default(/draft) add d
|
- | o 4:725c380fe99b@default(draft) add obsol_c'
+ | o 4:725c380fe99b@default(/draft) add obsol_c'
| |
x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c
|/
| x 2:4538525df7e2@default(obsolete/draft) add c
|/
- o 1:7c3bad9141dc@default(draft) add b
+ o 1:7c3bad9141dc@default(/draft) add b
|
- o 0:1f0dee641bb7@default(public) add a
+ o 0:1f0dee641bb7@default(/public) add a
Test communication of obsolete relation with a compatible client
--- a/tests/test-prune.t Wed Feb 01 15:27:04 2017 +0100
+++ b/tests/test-prune.t Wed Feb 01 15:32:59 2017 +0100
@@ -1,6 +1,6 @@
$ cat >> $HGRCPATH <<EOF
> [ui]
- > logtemplate={rev}:{node|short}[{bookmarks}] ({separate('/', obsolete ,phase)}) {desc|firstline}\n
+ > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n
> [extensions]
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
@@ -21,15 +21,15 @@
$ mkcommit e
$ hg bookmarks BABAR
$ hg log -G
- @ 4:9d206ffc875e[BABAR] (draft) add e
+ @ 4:9d206ffc875e[BABAR] (/draft) add e
|
- o 3:47d2a3944de8[] (draft) add d
+ o 3:47d2a3944de8[] (/draft) add d
|
- o 2:4538525df7e2[] (draft) add c
+ o 2:4538525df7e2[] (/draft) add c
|
- o 1:7c3bad9141dc[] (draft) add b
+ o 1:7c3bad9141dc[] (/draft) add b
|
- o 0:1f0dee641bb7[] (public) add a
+ o 0:1f0dee641bb7[] (/public) add a
Check arguments exclusive to each other
@@ -109,23 +109,23 @@
$ mkcommit nE
$ hg log -G
- @ 12:6e8148413dd5[] (draft) add nE
+ @ 12:6e8148413dd5[] (/draft) add nE
|
- o 11:8ee176ff1d4b[] (draft) add nD
+ o 11:8ee176ff1d4b[] (/draft) add nD
|
- o 10:aa96dc3f04c2[] (draft) add nC
+ o 10:aa96dc3f04c2[] (/draft) add nC
|
- o 9:6f6f25e4f748[] (draft) add nB
+ o 9:6f6f25e4f748[] (/draft) add nB
|
- | o 8:bb5e90a7ea1f[] (draft) add ee
+ | o 8:bb5e90a7ea1f[] (/draft) add ee
| |
- | o 7:00ded550b1e2[] (draft) add dd
+ | o 7:00ded550b1e2[] (/draft) add dd
| |
- | o 6:354011cd103f[] (draft) add cc
+ | o 6:354011cd103f[] (/draft) add cc
| |
- | o 5:814c38b95e72[] (draft) add bb
+ | o 5:814c38b95e72[] (/draft) add bb
|/
- o 0:1f0dee641bb7[BABAR] (public) add a
+ o 0:1f0dee641bb7[BABAR] (/public) add a
one old, one new
@@ -143,21 +143,21 @@
47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
$ hg log -G
- @ 12:6e8148413dd5[] (draft) add nE
+ @ 12:6e8148413dd5[] (/draft) add nE
|
- o 11:8ee176ff1d4b[] (draft) add nD
+ o 11:8ee176ff1d4b[] (/draft) add nD
|
- o 10:aa96dc3f04c2[] (draft) add nC
+ o 10:aa96dc3f04c2[] (/draft) add nC
|
- o 9:6f6f25e4f748[] (draft) add nB
+ o 9:6f6f25e4f748[] (/draft) add nB
|
- | o 7:00ded550b1e2[] (draft) add dd
+ | o 7:00ded550b1e2[] (/draft) add dd
| |
- | o 6:354011cd103f[] (draft) add cc
+ | o 6:354011cd103f[] (/draft) add cc
| |
- | o 5:814c38b95e72[] (draft) add bb
+ | o 5:814c38b95e72[] (/draft) add bb
|/
- o 0:1f0dee641bb7[BABAR] (public) add a
+ o 0:1f0dee641bb7[BABAR] (/public) add a
one old, two new
@@ -175,19 +175,19 @@
bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob)
$ hg log -G
- @ 12:6e8148413dd5[] (draft) add nE
+ @ 12:6e8148413dd5[] (/draft) add nE
|
- o 11:8ee176ff1d4b[] (draft) add nD
+ o 11:8ee176ff1d4b[] (/draft) add nD
|
- o 10:aa96dc3f04c2[] (draft) add nC
+ o 10:aa96dc3f04c2[] (/draft) add nC
|
- o 9:6f6f25e4f748[] (draft) add nB
+ o 9:6f6f25e4f748[] (/draft) add nB
|
- | o 6:354011cd103f[] (draft) add cc
+ | o 6:354011cd103f[] (/draft) add cc
| |
- | o 5:814c38b95e72[] (draft) add bb
+ | o 5:814c38b95e72[] (/draft) add bb
|/
- o 0:1f0dee641bb7[BABAR] (public) add a
+ o 0:1f0dee641bb7[BABAR] (/public) add a
two old, two new (should be denied)
@@ -373,7 +373,7 @@
(leaving bookmark rg)
$ hg bookmark r10
$ hg log -G
- o 15:cd0038e05e1b[rg] (draft) add rg
+ o 15:cd0038e05e1b[rg] (/draft) add rg
|
| x 14:43227190fef8[] (obsolete/draft) r14
| |
@@ -381,26 +381,26 @@
| | |
| | | x 12:e46a4836065c[] (obsolete/draft) r12
| | |/
- | | o 11:bab5d5bf48bd[] (draft) r11
+ | | o 11:bab5d5bf48bd[] (/draft) r11
| |/
- +---@ 10:ff43616e5d0f[B r10] (draft) r10
+ +---@ 10:ff43616e5d0f[B r10] (/draft) r10
| |
- o | 8:d62d843c9a01[] (draft) r8
+ o | 8:d62d843c9a01[] (/draft) r8
| |
- o | 7:e7d9710d9fc6[] (draft) r7
+ o | 7:e7d9710d9fc6[] (/draft) r7
|/
- o 3:2b6d669947cd[] (draft) r3
+ o 3:2b6d669947cd[] (/draft) r3
|\
- | o 2:fa942426a6fd[] (draft) r2
+ | o 2:fa942426a6fd[] (/draft) r2
| |
- o | 1:66f7d451a68b[] (draft) r1
+ o | 1:66f7d451a68b[] (/draft) r1
|/
- o 0:1ea73414a91b[] (draft) r0
+ o 0:1ea73414a91b[] (/draft) r0
$ hg prune 11
1 changesets pruned
$ hg log -G
- o 15:cd0038e05e1b[rg] (draft) add rg
+ o 15:cd0038e05e1b[rg] (/draft) add rg
|
| x 14:43227190fef8[] (obsolete/draft) r14
| |
@@ -410,19 +410,19 @@
| | |/
| | x 11:bab5d5bf48bd[] (obsolete/draft) r11
| |/
- +---@ 10:ff43616e5d0f[B r10] (draft) r10
+ +---@ 10:ff43616e5d0f[B r10] (/draft) r10
| |
- o | 8:d62d843c9a01[] (draft) r8
+ o | 8:d62d843c9a01[] (/draft) r8
| |
- o | 7:e7d9710d9fc6[] (draft) r7
+ o | 7:e7d9710d9fc6[] (/draft) r7
|/
- o 3:2b6d669947cd[] (draft) r3
+ o 3:2b6d669947cd[] (/draft) r3
|\
- | o 2:fa942426a6fd[] (draft) r2
+ | o 2:fa942426a6fd[] (/draft) r2
| |
- o | 1:66f7d451a68b[] (draft) r1
+ o | 1:66f7d451a68b[] (/draft) r1
|/
- o 0:1ea73414a91b[] (draft) r0
+ o 0:1ea73414a91b[] (/draft) r0
$ hg book CELESTE
$ hg prune -r . --keep
--- a/tests/test-uncommit.t Wed Feb 01 15:27:04 2017 +0100
+++ b/tests/test-uncommit.t Wed Feb 01 15:32:59 2017 +0100
@@ -5,7 +5,7 @@
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
- > hg glog --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
+ > hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' "$@"
> }
$ hg init repo
@@ -118,13 +118,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
@@ -217,15 +217,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
@@ -265,17 +265,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 (*) {'user': 'test'} (glob)