tests: adapt output to the new graphlog style
Core have change the way graphmod handle missing parent. We adapt our output.
--- a/tests/test-evolve-order.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-evolve-order.t Thu Apr 14 13:02:23 2016 -0700
@@ -155,6 +155,7 @@
|/
o 15:739f18ac1d03@default(draft) add _d
|
+ ~
Second set of stack with no successor for b2_:
$ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
@@ -196,6 +197,7 @@
|/
o 15:739f18ac1d03@default(draft) add _d
|
+ ~
Solve the full second stack and only part of the first one
$ echo "(desc(_d)::) - desc(c3_)"
@@ -232,6 +234,7 @@
|/
o 15:739f18ac1d03@default(draft) add _d
|
+ ~
Test multiple revision with some un-evolvable because parent is splitted
------------------------------------------------------------------------
--- a/tests/test-evolve.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-evolve.t Thu Apr 14 13:02:23 2016 -0700
@@ -1224,6 +1224,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
$ hg evolve --rev 23 --any
abort: cannot specify both "--rev" and "--any"
@@ -1262,6 +1263,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
Check that prune respects the allowunstable option
$ hg up -C .
@@ -1291,6 +1293,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
$ hg up 19
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit c5_
@@ -1312,6 +1315,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
Check that fold respects the allowunstable option
$ hg up edc3c9de504e
@@ -1329,6 +1333,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
$ hg fold --exact "19 + 18"
abort: cannot fold chain not ending with a head or with branching
@@ -1356,6 +1361,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
Create a split commit
$ printf "oo" > oo;
@@ -1392,6 +1398,7 @@
|/
o 18:edc3c9de504e@default(draft) a3
|
+ ~
$ hg evolve --rev "18::"
move:[33] add uu
atop:[35] _pp
@@ -1446,6 +1453,7 @@
|/
o 36:43c3f5ef149f@default(draft) add uu
|
+ ~
$ hg status newlyadded
A newlyadded
--- a/tests/test-inhibit.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-inhibit.t Thu Apr 14 13:02:23 2016 -0700
@@ -536,6 +536,7 @@
|/
o 14:d66ccb8c5871 add cL
|
+ ~
$ hg strip -r 210589181b14
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at d66ccb8c5871
@@ -557,6 +558,7 @@
|/
o 14:d66ccb8c5871 add cL
|
+ ~
Test prunestrip
@@ -572,6 +574,7 @@
|
@ 14:d66ccb8c5871 add cL foo
|
+ ~
Check that --hidden used with inhibit does not hide every obsolete commit
We show the log before and after a log -G --hidden, they should be the same
@@ -803,6 +806,7 @@
$ hg log -G -r "25::"
@ 25:71eb4f100663 add pk
|
+ ~
$ hg up -C 22
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit Dk
@@ -816,6 +820,7 @@
|
o 25:71eb4f100663 add pk
|
+ ~
Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
Rebase the first two revs of the stack onto dest, we expect to see one new
@@ -837,6 +842,7 @@
|/
o 25:71eb4f100663 add pk
|
+ ~
$ hg prune 28 -s 27
1 changesets pruned
$ hg up 25
@@ -857,6 +863,7 @@
|/
@ 25:71eb4f100663 add pk
|
+ ~
Rebase the same stack in full on the destination, we expect it to disappear
and only see the top revision added to destination. We don\'t expect 29 to be
@@ -874,6 +881,7 @@
|
@ 25:71eb4f100663 add pk
|
+ ~
Pulling from a inhibit repo to a non-inhibit repo should work
--- a/tests/test-sharing.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-sharing.t Thu Apr 14 13:02:23 2016 -0700
@@ -221,6 +221,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
Bob commits a draft changeset, pushes to review repo.
$ cd ../bob
@@ -296,11 +297,13 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg --hidden -R ../public shortlog -G -r 1::
o 2:540ba8f317e6 public implement feature X (v3)
|
o 1:de6151c48e1c public fix bug 37
|
+ ~
How do things look in the review repo?
$ cd ../review
@@ -317,6 +320,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
Meantime, Alice is back from lunch. While she was away, Bob approved
her change, so now she can publish it.
@@ -330,6 +334,7 @@
|/
o 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg outgoing -q ../public
4:cbdfbd5a5db2
$ hg push ../public
@@ -351,8 +356,10 @@
$ hg log -G -q -r 'head()'
o 5:540ba8f317e6
|
- | @ 4:cbdfbd5a5db2
- |/
+ ~
+ @ 4:cbdfbd5a5db2
+ |
+ ~
$ hg --hidden shortlog -G -r 1::
o 5:540ba8f317e6 public implement feature X (v3)
|
@@ -364,6 +371,7 @@
|/
o 1:de6151c48e1c public fix bug 37
|
+ ~
Alice rebases her draft changeset on top of Bob's public changeset and
publishes the result.
@@ -403,6 +411,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg --hidden -R ../public shortlog -G -r 1::
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
@@ -410,6 +419,7 @@
|
o 1:de6151c48e1c public fix bug 37
|
+ ~
$ cd ..
Setup for "cowboy mode" shared mutable history (to illustrate divergent
@@ -464,6 +474,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
Bob discovers the divergence.
$ hg pull ../alice
@@ -489,6 +500,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
$ hg --hidden shortlog -r 'successors(2fe6)'
6:a360947f6faf draft fix bug 24 (v2 by bob)
7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
@@ -518,6 +530,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
$ hg --hidden shortlog -r 'precursors(9)'
6:a360947f6faf draft fix bug 24 (v2 by bob)
7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
--- a/tests/test-split.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-split.t Thu Apr 14 13:02:23 2016 -0700
@@ -267,9 +267,9 @@
|
o changeset: 14:aec57822a8ff
| user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: split1
- |
+ ~ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: split1
+
$ hg split <<EOF
> y
> y
@@ -313,9 +313,9 @@
|
o changeset: 14:aec57822a8ff
| user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: split1
- |
+ ~ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: split1
+
$ hg book
bookA 19:a2b5c9d9b362
* bookB 19:a2b5c9d9b362
--- a/tests/test-userguide.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-userguide.t Thu Apr 14 13:02:23 2016 -0700
@@ -76,6 +76,7 @@
|
@ 3:934359450037 draft implement feature Y
|
+ ~
example 5: uncommit files at head (figure 4)
$ echo 'relevant' >> file1.c
@@ -91,6 +92,7 @@
|/
o 3:934359450037 draft implement feature Y
|
+ ~
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n'
6:c8defeecf7a4 fix bug 234
file1.c
@@ -121,6 +123,7 @@
|/
o 6:c8defeecf7a4 draft fix bug 234
|
+ ~
$ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)'
10:171c6a79a27b
$ hg --hidden log -q -r 'precursors(10)'
@@ -156,6 +159,7 @@
|
o 10:171c6a79a27b draft fix bug 64
|
+ ~
example 7: amend an older changeset (figures 6, 7)
$ hg update -q 11
@@ -180,6 +184,7 @@
|/
o 10:171c6a79a27b draft fix bug 64
|
+ ~
$ hg evolve -q --all
$ hg shortlog -G -r 10::
@ 17:91b4b0f8b5c5 draft feature 23
@@ -190,6 +195,7 @@
|
o 10:171c6a79a27b draft fix bug 64
|
+ ~
setup for example 8: prune an older changeset (figure 8)
$ echo 'useful' >> file1.c
@@ -207,6 +213,7 @@
|
o 17:91b4b0f8b5c5 draft feature 23
|
+ ~
example 8: prune an older changeset (figures 8, 9)
$ hg prune 19
@@ -219,6 +226,7 @@
|
o 18:1f33e68b18b9 draft useful work
|
+ ~
$ hg evolve -q --all --any
$ hg --hidden shortlog -G -r 18::
@ 21:4393e5877437 draft more work
@@ -229,6 +237,7 @@
|/
o 18:1f33e68b18b9 draft useful work
|
+ ~
example 9: uncommit files from an older changeset (discard changes)
(figure 10)
@@ -246,6 +255,7 @@
|
o 21:4393e5877437 draft more work
|
+ ~
$ hg uncommit file2.c
1 new unstable changesets
$ hg status
@@ -266,6 +276,7 @@
|/
o 21:4393e5877437 draft more work
|
+ ~
$ rm file2.c.orig
example 10: uncommit files from an older changeset (keep changes)
@@ -284,6 +295,7 @@
|
o 25:0d972d6888e6 draft fix bug 67
|
+ ~
$ hg uncommit file2.c
1 new unstable changesets
$ hg status
@@ -300,6 +312,7 @@
|/
o 25:0d972d6888e6 draft fix bug 67
|
+ ~
$ hg evolve --all --any
move:[27] new feature
atop:[28] fix a bug
@@ -317,3 +330,4 @@
|/
o 25:0d972d6888e6 draft fix bug 67
|
+ ~