--- a/tests/test-evolve-obshistory.t Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-evolve-obshistory.t Wed Sep 27 16:26:30 2017 +0200
@@ -31,19 +31,13 @@
>
> Better commit message"
$ hg log --hidden -G
- @ changeset: 3:4ae3a4151de9
+ @ changeset: 2:4ae3a4151de9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A1
|
- | x changeset: 2:f137d23bb3e1
- | | user: test
- | | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
- | | summary: temporary amend commit for 471f378eab4c
- | |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -58,10 +52,10 @@
Actual test
-----------
$ hg obslog --patch 4ae3a4151de9
- @ 4ae3a4151de9 (3) A1
+ @ 4ae3a4151de9 (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/4ae3a4151de9-changeset-description
@@ -1,1 +1,3 @@
@@ -80,7 +74,7 @@
$ hg obslog --no-graph --patch 4ae3a4151de9
- 4ae3a4151de9 (3) A1
+ 4ae3a4151de9 (2) A1
471f378eab4c (1) A0
rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/471f378eab4c-changeset-description
@@ -109,7 +103,7 @@
{
"markers": [],
"node": "4ae3a4151de9",
- "rev": 3,
+ "rev": 2,
"shortdescription": "A1"
},
{
@@ -137,7 +131,7 @@
]
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/4ae3a4151de9-changeset-description
@@ -1,1 +1,3 @@
@@ -379,7 +373,7 @@
Check that debugobshistory on splitted commit show both targets
$ hg obslog 471597cad322 --hidden --patch
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
$ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
@@ -414,7 +408,7 @@
o 337fec4d2edc (2) A0
|
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
With the all option, it should show the three changesets
@@ -424,7 +418,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
Check that debugobshistory on the second successor after split show
@@ -433,7 +427,7 @@
@ f257fde29c7a (3) A0
|
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
With the all option, it should show the three changesets
@@ -443,7 +437,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
Obslog with all option all should also works on the splitted commit
@@ -453,7 +447,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
Check that debugobshistory on both successors after split show
@@ -464,7 +458,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (2))
$ hg update 471597cad322
@@ -632,7 +626,7 @@
$ hg obslog de7290d8b885 --hidden --patch
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (4))
$ hg obslog de7290d8b885 --hidden --all --patch
@@ -645,7 +639,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (4))
$ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
@@ -680,7 +674,7 @@
@ c7f044602e9b (5) A0
|
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (4))
$ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
@@ -728,7 +722,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (4))
$ hg obslog 5 --all --patch
@@ -741,7 +735,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available yet, too many successors (4))
$ hg update de7290d8b885
@@ -816,7 +810,7 @@
the revision with the target
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/eb5a0daa2192-changeset-description
@@ -1,1 +1,1 @@
@@ -835,11 +829,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available yet, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/eb5a0daa2192-changeset-description
@@ -1,1 +1,1 @@
@@ -857,7 +851,7 @@
the revision with the target
$ hg obslog --hidden 0dec01379d3b --patch
x 0dec01379d3b (2) B0
- rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
(No patch available yet, changesets rebased)
Check that with all option, all changesets are shown
@@ -865,11 +859,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available yet, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/eb5a0daa2192-changeset-description
@@ -1,1 +1,1 @@
@@ -889,11 +883,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available yet, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/eb5a0daa2192-changeset-description
@@ -1,1 +1,1 @@
@@ -923,7 +917,7 @@
0 (glob)
],
"effect": [
- *, (glob)
+ "description",
"content"
],
"succnodes": [
@@ -941,7 +935,7 @@
"markers": [
{
"date": [
- 0.0,
+ *, (glob)
0 (glob)
],
"effect": [
@@ -1015,21 +1009,21 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg amend -m "A2"
- 2 new divergent changesets
+ 2 new content-divergent changesets
$ hg log --hidden -G
@ changeset: 3:65b757b745b9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | trouble: divergent
+ | instability: content-divergent
| summary: A2
|
| o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | trouble: divergent
+ | instability: content-divergent
| summary: A1
|
| x changeset: 1:471f378eab4c
@@ -1050,14 +1044,14 @@
Check that debugobshistory on the divergent revision show both destinations
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1073,14 +1067,14 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1132,14 +1126,14 @@
o fdf9bde5129a (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1155,14 +1149,14 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1176,14 +1170,14 @@
@ 65b757b745b9 (3) A2
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1198,14 +1192,14 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1221,14 +1215,14 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/65b757b745b9-changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1374,7 +1368,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
| --- a/471f378eab4c-changeset-description
| +++ b/eb5a0daa2192-changeset-description
| @@ -1,1 +1,1 @@
@@ -1389,11 +1383,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available yet, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (*) (glob)
--- a/0dec01379d3b-changeset-description
+++ b/b7ea6d14e664-changeset-description
@@ -1,1 +1,1 @@
@@ -1406,7 +1400,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
| --- a/471f378eab4c-changeset-description
| +++ b/eb5a0daa2192-changeset-description
| @@ -1,1 +1,1 @@
@@ -1421,11 +1415,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available yet, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (*) (glob)
--- a/0dec01379d3b-changeset-description
+++ b/b7ea6d14e664-changeset-description
@@ -1,1 +1,1 @@
@@ -1603,7 +1597,7 @@
@ 7a230b46bf61 (3) A2
|
x fdf9bde5129a (2) A1
- | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (*) (glob)
| --- a/fdf9bde5129a-changeset-description
| +++ b/7a230b46bf61-changeset-description
| @@ -1,1 +1,1 @@
@@ -1612,7 +1606,7 @@
|
|
x 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/fdf9bde5129a-changeset-description
@@ -1,1 +1,1 @@
@@ -1639,21 +1633,21 @@
o 7a230b46bf61 (2) A2
|
x fdf9bde5129a
- | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (*) (glob)
| (No patch available yet, context is not local)
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
(No patch available yet, succ is unknown locally)
$ hg obslog 7a230b46bf61 --color=debug --patch
o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
|
x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
- | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob)
| (No patch available yet, context is not local)
|
@ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob)
(No patch available yet, succ is unknown locally)