--- a/tests/test-evolve-obshistory.t Mon Apr 23 12:23:00 2018 +0200
+++ b/tests/test-evolve-obshistory.t Wed Apr 25 01:58:45 2018 +0100
@@ -405,7 +405,7 @@
Check that debugobshistory on splitted commit show both targets
$ hg obslog 471597cad322 --hidden --patch
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -418,6 +418,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"note": "testing split",
"succnodes": [
"337fec4d2edc",
@@ -438,7 +442,7 @@
o 337fec4d2edc (2) A0
|
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -449,7 +453,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -459,7 +463,7 @@
@ f257fde29c7a (3) A0
|
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -470,7 +474,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -481,7 +485,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -493,7 +497,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -662,7 +666,7 @@
$ hg obslog de7290d8b885 --hidden --patch
x de7290d8b885 (1) A0
- rewritten 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 (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --all --patch
@@ -675,7 +679,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten 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 (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
@@ -687,6 +691,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -706,7 +714,7 @@
@ c7f044602e9b (5) A0
|
x de7290d8b885 (1) A0
- rewritten 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 (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
@@ -724,6 +732,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -750,7 +762,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten 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 (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog 5 --all --patch
@@ -763,7 +775,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten 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 (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg update de7290d8b885
@@ -838,7 +850,7 @@
the revision with the target
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -858,11 +870,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -881,7 +893,7 @@
the revision with the target
$ hg obslog --hidden 0dec01379d3b --patch
x 0dec01379d3b (2) B0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, changesets rebased)
Check that with all option, all changesets are shown
@@ -889,11 +901,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -914,11 +926,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -948,6 +960,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ *, (glob)
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -963,9 +979,14 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -1403,7 +1424,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -1419,7 +1440,7 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
@@ -1437,7 +1458,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -1453,7 +1474,7 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
@@ -1481,6 +1502,11 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ *, (glob)
+ *, (glob)
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -1496,7 +1522,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
"effect": [
@@ -1517,9 +1543,13 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
+ "effect": [
+ "description",
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],