--- a/tests/test-rewind.t Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-rewind.t Thu May 07 01:29:48 2020 +0200
@@ -90,13 +90,20 @@
$ hg debugobsolete
7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog -r 'desc("c_B0")'
+ $ hg obslog -r 'desc("c_B0")' --no-origin
o 073989a581cf (3) c_B0
|
x 7e594302a05d (2) c_B0
pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
+ $ hg obslog -r 'desc("c_B0")'
+ o 073989a581cf (3) c_B0
+ | meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
+ |
+ x 7e594302a05d (2) c_B0
+ pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+
$ hg log -G
o changeset: 3:073989a581cf
| tag: tip
@@ -165,7 +172,7 @@
7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
073989a581cf430a844192364fa37606357cbbc2 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog -r 'desc("c_B0")' --all
+ $ hg obslog -r 'desc("c_B0")' --all --no-origin
x 073989a581cf (3) c_B0
| pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
|
@@ -176,6 +183,17 @@
meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ $ hg obslog -r 'desc("c_B0")' --all
+ x 073989a581cf (3) c_B0
+ | meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
+ | pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
+ |
+ | o b13b032065ef (4) c_B0
+ |/ meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ |
+ x 7e594302a05d (2) c_B0
+ pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+
$ hg log -G
o changeset: 4:b13b032065ef
| tag: tip
@@ -268,13 +286,19 @@
$ hg debugobsolete
7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog --rev 'desc("c_B0")'
+ $ hg obslog --rev 'desc("c_B0")' --no-origin
* b13b032065ef (4) c_B0
|
x 7e594302a05d (2) c_B0
rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ $ hg obslog --rev 'desc("c_B0")'
+ * b13b032065ef (4) c_B0
+ | meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ |
+ x 7e594302a05d (2) c_B0
+
$ hg log -G
* changeset: 4:b13b032065ef
| tag: tip
@@ -372,7 +396,7 @@
b13b032065ef57a68d9a4cead38ba0f34f95529b 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
25c8f5ab0c3bb569ec672570f1a901be4c6f032b 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog --rev 'desc("c_B0")'
+ $ hg obslog --rev 'desc("c_B0")' --no-origin
@ 837cd997bb05 (5) c_B0
|\
x | 25c8f5ab0c3b (3) c_B1
@@ -383,6 +407,16 @@
meta-changed(meta) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ $ hg obslog --rev 'desc("c_B0")'
+ @ 837cd997bb05 (5) c_B0
+ |\ rewritten(description, meta, content) from 25c8f5ab0c3b using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ | | meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ | |
+ x | 25c8f5ab0c3b (3) c_B1
+ |/ rewritten(description, content) from 7e594302a05d using amend by test (Thu Jan 01 00:00:01 1970 +0000)
+ |
+ x 7e594302a05d (2) c_B0
+
$ hg log -G
@ changeset: 5:837cd997bb05
| tag: tip
@@ -514,7 +548,7 @@
$ hg debugobsolete
49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
- $ hg obslog --all
+ $ hg obslog --all --no-origin
@ 9576e80d6851 (5) c_CD0
|
| o a0316c4c5417 (4) c_CD0
@@ -522,6 +556,15 @@
x 49fb7d900906 (3) c_CD0
split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ $ hg obslog --all
+ @ 9576e80d6851 (5) c_CD0
+ | split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ |
+ | o a0316c4c5417 (4) c_CD0
+ |/ split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ |
+ x 49fb7d900906 (3) c_CD0
+
Actual rewind
`````````````
@@ -535,7 +578,7 @@
49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ 4535d0af405c (6) c_CD0
|\
| \
@@ -550,6 +593,22 @@
meta-changed(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ $ hg obslog
+ @ 4535d0af405c (6) c_CD0
+ |\ meta-changed(meta) from 49fb7d900906 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ | | rewritten(meta, parent, content) from 9576e80d6851 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ | | rewritten(meta, content) from a0316c4c5417 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ | |
+ | \
+ | |\
+ | x | 9576e80d6851 (5) c_CD0
+ |/ / split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ | |
+ | x a0316c4c5417 (4) c_CD0
+ |/ split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ |
+ x 49fb7d900906 (3) c_CD0
+
$ hg log -G
@ changeset: 6:4535d0af405c
| tag: tip
@@ -597,7 +656,7 @@
a0316c4c54179357e71d068fb8884678ebc7c351 e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
9576e80d6851ce79cd535e2dc5fa01b444d89a39 95d72d892df7fec59107e10914c5729bdf03665f 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 95d72d892df7fec59107e10914c5729bdf03665f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog -r -2:
+ $ hg obslog -r -2: --no-origin
@ 95d72d892df7 (8) c_CD0
|\
+---o e76375de0bfc (7) c_CD0
@@ -673,7 +732,7 @@
$ hg debugobsolete
579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- $ hg obslog -r 'desc("c_A1")::'
+ $ hg obslog -r 'desc("c_A1")::' --no-origin
@ a65fceb2324a (4) c_B0
|
| o d952d1794ff6 (3) c_A1
@@ -684,6 +743,17 @@
x 7e594302a05d (2) c_B0
rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ $ hg obslog -r 'desc("c_A1")::'
+ @ a65fceb2324a (4) c_B0
+ | rebased(parent) from 7e594302a05d using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ |
+ | o d952d1794ff6 (3) c_A1
+ | | rewritten(description, content) from 579f120ba918 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
+ | |
+ | x 579f120ba918 (1) c_A0
+ |
+ x 7e594302a05d (2) c_B0
+
$ hg log -G
@ changeset: 4:a65fceb2324a
| tag: tip
@@ -716,7 +786,7 @@
7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 ac979e0aac4e63ccbbf88ac33942192942302766 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ ac979e0aac4e (5) c_B0
|\
| x a65fceb2324a (4) c_B0
@@ -726,6 +796,16 @@
rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
meta-changed(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ $ hg obslog
+ @ ac979e0aac4e (5) c_B0
+ |\ meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | | rewritten(meta, parent) from a65fceb2324a using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | |
+ | x a65fceb2324a (4) c_B0
+ |/ rebased(parent) from 7e594302a05d using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ |
+ x 7e594302a05d (2) c_B0
+
$ hg log -G
@ changeset: 5:ac979e0aac4e
| tag: tip
@@ -790,7 +870,7 @@
a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
a65fceb2324ae1eb1231610193d24a5fa02c7c0e a5dd64adbb2af2e646859b35d0d7128daa73cb2b 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
ac979e0aac4e63ccbbf88ac33942192942302766 a5dd64adbb2af2e646859b35d0d7128daa73cb2b 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ a5dd64adbb2a (6) c_B0
|\
| x ac979e0aac4e (5) c_B0
@@ -822,7 +902,7 @@
ac979e0aac4e63ccbbf88ac33942192942302766 3f2d8862657d20af331f0c0531f5228eef4d36c5 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
a5dd64adbb2af2e646859b35d0d7128daa73cb2b 3f2d8862657d20af331f0c0531f5228eef4d36c5 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
d952d1794ff657f5c2a82225d2e6307ed930b32f 9c28b7ed3951fd15b20ab75449c1e0fdec445958 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ 3f2d8862657d (8) c_B0
|\
x | a5dd64adbb2a (6) c_B0
@@ -882,7 +962,7 @@
a5dd64adbb2af2e646859b35d0d7128daa73cb2b d36d6d267714108384f31762b6193c32f9f97514 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
3f2d8862657d20af331f0c0531f5228eef4d36c5 d36d6d267714108384f31762b6193c32f9f97514 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
9c28b7ed3951fd15b20ab75449c1e0fdec445958 fef4355b4cc9e2d3ddc154f60e4f4f1a286e9ce7 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ d36d6d267714 (10) c_B0
|\
x | 3f2d8862657d (8) c_B0
@@ -1009,7 +1089,7 @@
30704102d912d9d35a3d51400c4c93ad1e8bc7f3 2ea5be2f87510c7d26d5866dec83b57a7d939c4a 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
30704102d912d9d35a3d51400c4c93ad1e8bc7f3 b4c97fddc16aa57693fa0a730d4b44ceb75bb35c 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
2ea5be2f87510c7d26d5866dec83b57a7d939c4a b4c97fddc16aa57693fa0a730d4b44ceb75bb35c 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
- $ hg obslog
+ $ hg obslog --no-origin
@ b4c97fddc16a (3) initial
|\
x | 2ea5be2f8751 (2) amended
@@ -1019,6 +1099,16 @@
rewritten(description, content) as 2ea5be2f8751 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
meta-changed(meta) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
+ $ hg obslog
+ @ b4c97fddc16a (3) initial
+ |\ rewritten(description, meta, content) from 2ea5be2f8751 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
+ | | meta-changed(meta) from 30704102d912 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
+ | |
+ x | 2ea5be2f8751 (2) amended
+ |/ rewritten(description, content) from 30704102d912 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
+ |
+ x 30704102d912 (1) initial
+
$ hg glf --hidden
@ 3: initial (a b)
|