Mercurial > evolve
diff tests/test-evolve-obshistory.t @ 3001:67b59d1657cf mercurial-4.2
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:07:22 +0200 |
| parents | 2280461343e5 bd7e8be29542 |
| children | 00e4d31b8cdb 9c9c8c1eeb93 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Tue Jul 25 15:17:17 2017 +0200 +++ b/tests/test-evolve-obshistory.t Wed Sep 27 01:07:22 2017 +0200 @@ -59,7 +59,7 @@ @ 4ae3a4151de9 (3) A1 | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) + rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/4ae3a4151de9-changeset-description @@ -1,1 +1,3 @@ @@ -76,40 +76,66 @@ +42 + + $ hg obslog --no-graph --patch 4ae3a4151de9 + 4ae3a4151de9 (3) A1 + 471f378eab4c (1) A0 + rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) + --- a/471f378eab4c-changeset-description + +++ b/4ae3a4151de9-changeset-description + @@ -1,1 +1,3 @@ + -A0 + +A1 + + + +Better commit message + + diff -r 471f378eab4c -r 4ae3a4151de9 A0 + --- a/A0 Thu Jan 01 00:00:00 1970 +0000 + +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 + @@ -1,1 +1,2 @@ + A0 + +42 + + + $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' + @ A1 + | + x A0 at * by test (glob) + $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [], - "debugobshistory.node": "4ae3a4151de9", - "debugobshistory.rev": 3, - "debugobshistory.shortdescription": "A1" + "markers": [], + "node": "4ae3a4151de9", + "rev": 3, + "shortdescription": "A1" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ "description", "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "4ae3a4151de9" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" } ] $ hg obslog --hidden --patch 471f378eab4c x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) + rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/4ae3a4151de9-changeset-description @@ -1,1 +1,3 @@ @@ -129,26 +155,26 @@ $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - *, (glob) - "content" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + *, (glob) + "content" + ], + "succnodes": [ "4ae3a4151de9" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" } ] $ hg update 471f378eab4c @@ -221,19 +247,19 @@ $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.verb": "pruned" + "user": "test", + "verb": "pruned" } ], - "debugobshistory.node": "0dec01379d3b", - "debugobshistory.rev": 2, - "debugobshistory.shortdescription": "B0" + "node": "0dec01379d3b", + "rev": 2, + "shortdescription": "B0" } ] $ hg obslog 'desc(A0)' --patch @@ -242,10 +268,10 @@ $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "markers": [], + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" } ] $ hg up 1 @@ -349,33 +375,33 @@ Check that debugobshistory on splitted commit show both targets $ hg obslog 471597cad322 --hidden --patch x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 [ { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - "parent", - "content" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "parent", + "content" + ], + "succnodes": [ "337fec4d2edc", "f257fde29c7a" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471597cad322", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471597cad322", + "rev": 1, + "shortdescription": "A0" } ] Check that debugobshistory on the first successor after split show @@ -384,7 +410,7 @@ o 337fec4d2edc (2) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 @@ -394,7 +420,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 @@ -403,7 +429,7 @@ @ f257fde29c7a (3) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 @@ -413,7 +439,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 @@ -423,7 +449,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + 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 @@ -434,7 +460,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) $ hg update 471597cad322 @@ -601,7 +627,7 @@ $ hg obslog de7290d8b885 --hidden --patch x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + 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 @@ -614,76 +640,76 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + 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 [ { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ "parent", "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "1ae8bc733a14", "337fec4d2edc", "c7f044602e9b", "f257fde29c7a" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "de7290d8b885", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "de7290d8b885", + "rev": 1, + "shortdescription": "A0" } ] $ hg obslog c7f044602e9b --patch @ c7f044602e9b (5) A0 | x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + 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 [ { - "debugobshistory.markers": [], - "debugobshistory.node": "c7f044602e9b", - "debugobshistory.rev": 5, - "debugobshistory.shortdescription": "A0" + "markers": [], + "node": "c7f044602e9b", + "rev": 5, + "shortdescription": "A0" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ "parent", "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "1ae8bc733a14", "337fec4d2edc", "c7f044602e9b", "f257fde29c7a" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "de7290d8b885", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "de7290d8b885", + "rev": 1, + "shortdescription": "A0" } ] Check that debugobshistory on all heads show a coherent graph @@ -697,7 +723,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg obslog 5 --all --patch @@ -710,7 +736,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg update de7290d8b885 @@ -783,7 +809,7 @@ the revision with the target $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -802,11 +828,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -824,7 +850,7 @@ the revision with the target $ hg obslog --hidden 0dec01379d3b --patch x 0dec01379d3b (2) B0 - rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) (No patch available yet, changesets rebased) Check that with all option, all changesets are shown @@ -832,11 +858,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -856,11 +882,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -877,55 +903,55 @@ $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [], - "debugobshistory.node": "eb5a0daa2192", - "debugobshistory.rev": 3, - "debugobshistory.shortdescription": "C0" + "markers": [], + "node": "eb5a0daa2192", + "rev": 3, + "shortdescription": "C0" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - "description", - "content" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + *, (glob) + "content" + ], + "succnodes": [ "eb5a0daa2192" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ "description", "parent", "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "eb5a0daa2192" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "0dec01379d3b", - "debugobshistory.rev": 2, - "debugobshistory.shortdescription": "B0" + "node": "0dec01379d3b", + "rev": 2, + "shortdescription": "B0" } ] $ hg update 471f378eab4c @@ -1014,14 +1040,14 @@ Check that debugobshistory on the divergent revision show both destinations $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1037,14 +1063,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1055,39 +1081,39 @@ $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - "description" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "description" + ], + "succnodes": [ "65b757b745b9" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" }, { - "debugobshistory.effect": [ - "description" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "description" + ], + "succnodes": [ "fdf9bde5129a" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" } ] Check that debugobshistory on the first diverged revision show the revision @@ -1096,14 +1122,14 @@ o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1119,14 +1145,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1140,14 +1166,14 @@ @ 65b757b745b9 (3) A2 | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1162,14 +1188,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1185,14 +1211,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1203,51 +1229,51 @@ $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [], - "debugobshistory.node": "65b757b745b9", - "debugobshistory.rev": 3, - "debugobshistory.shortdescription": "A2" + "markers": [], + "node": "65b757b745b9", + "rev": 3, + "shortdescription": "A2" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - "description" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "description" + ], + "succnodes": [ "65b757b745b9" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" }, { - "debugobshistory.effect": [ - "description" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "description" + ], + "succnodes": [ "fdf9bde5129a" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" }, { - "debugobshistory.markers": [], - "debugobshistory.node": "fdf9bde5129a", - "debugobshistory.rev": 2, - "debugobshistory.shortdescription": "A1" + "markers": [], + "node": "fdf9bde5129a", + "rev": 2, + "shortdescription": "A1" } ] $ hg update 471f378eab4c @@ -1257,7 +1283,7 @@ $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) - (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) + (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) Test output with amended + folded commit ======================================== @@ -1334,7 +1360,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | --- a/471f378eab4c-changeset-description | +++ b/eb5a0daa2192-changeset-description | @@ -1,1 +1,1 @@ @@ -1349,11 +1375,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) by test (*) as b7ea6d14e664 (glob) + rewritten(description) as b7ea6d14e664 by test (*) (glob) --- a/0dec01379d3b-changeset-description +++ b/b7ea6d14e664-changeset-description @@ -1,1 +1,1 @@ @@ -1366,7 +1392,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | --- a/471f378eab4c-changeset-description | +++ b/eb5a0daa2192-changeset-description | @@ -1,1 +1,1 @@ @@ -1381,11 +1407,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) by test (*) as b7ea6d14e664 (glob) + rewritten(description) as b7ea6d14e664 by test (*) (glob) --- a/0dec01379d3b-changeset-description +++ b/b7ea6d14e664-changeset-description @@ -1,1 +1,1 @@ @@ -1396,76 +1422,76 @@ $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool [ { - "debugobshistory.markers": [], - "debugobshistory.node": "eb5a0daa2192", - "debugobshistory.rev": 4, - "debugobshistory.shortdescription": "C0" + "markers": [], + "node": "eb5a0daa2192", + "rev": 4, + "shortdescription": "C0" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ *, (glob) *, (glob) "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "eb5a0daa2192" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "b7ea6d14e664", - "debugobshistory.rev": 3, - "debugobshistory.shortdescription": "B1" + "node": "b7ea6d14e664", + "rev": 3, + "shortdescription": "B1" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ - "description" - ], - "debugobshistory.marker_date": [ + "date": [ *, (glob) 0 (glob) ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "effect": [ + "description" + ], + "succnodes": [ "b7ea6d14e664" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "0dec01379d3b", - "debugobshistory.rev": 2, - "debugobshistory.shortdescription": "B0" + "node": "0dec01379d3b", + "rev": 2, + "shortdescription": "B0" }, { - "debugobshistory.markers": [ + "markers": [ { - "debugobshistory.effect": [ + "date": [ + *, (glob) + 0 (glob) + ], + "effect": [ "description", "content" ], - "debugobshistory.marker_date": [ - *, (glob) - 0 (glob) - ], - "debugobshistory.marker_user": "test", - "debugobshistory.succnodes": [ + "succnodes": [ "eb5a0daa2192" ], - "debugobshistory.verb": "rewritten" + "user": "test", + "verb": "rewritten" } ], - "debugobshistory.node": "471f378eab4c", - "debugobshistory.rev": 1, - "debugobshistory.shortdescription": "A0" + "node": "471f378eab4c", + "rev": 1, + "shortdescription": "A0" } ] $ hg update 471f378eab4c @@ -1561,7 +1587,7 @@ @ 7a230b46bf61 (3) A2 | x fdf9bde5129a (2) A1 - | rewritten(description) by test (*) as 7a230b46bf61 (glob) + | rewritten(description) as 7a230b46bf61 by test (*) (glob) | --- a/fdf9bde5129a-changeset-description | +++ b/7a230b46bf61-changeset-description | @@ -1,1 +1,1 @@ @@ -1570,7 +1596,7 @@ | | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1596,21 +1622,21 @@ o 7a230b46bf61 (2) A2 | x fdf9bde5129a - | rewritten(description) by test (*) as 7a230b46bf61 (glob) + | rewritten(description) as 7a230b46bf61 by test (*) (glob) | (No patch available yet, context is not local) | @ 471f378eab4c (1) A0 - rewritten(description) by test (*) as fdf9bde5129a (glob) + 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) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) + | [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) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) + [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) (No patch available yet, succ is unknown locally)