--- a/tests/test-evolve-obshistory-amend-then-fold.t Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-obshistory-amend-then-fold.t Thu May 07 01:29:48 2020 +0200
@@ -80,7 +80,7 @@
-----------
Check that obslog on head shows a coherent graph
- $ hg obslog eb5a0daa2192 --patch
+ $ hg obslog eb5a0daa2192 --patch --no-origin
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
@@ -113,8 +113,27 @@
+B1
+ $ hg obslog eb5a0daa2192 --patch
+ @ eb5a0daa2192 (4) C0
+ |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | (No patch available, too many predecessors (2))
+ | |
+ x | 471f378eab4c (1) A0
+ /
+ x b7ea6d14e664 (3) B1
+ | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
+ | @@ -1,1 +1,1 @@
+ | -B0
+ | +B1
+ |
+ |
+ x 0dec01379d3b (2) B0
+
Check that obslog on A0 with all option shows everything
- $ hg obslog 1 --hidden --all --patch
+ $ hg obslog 1 --hidden --all --patch --no-origin
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
@@ -147,7 +166,26 @@
+B1
- $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
+ $ hg obslog 1 --hidden --all --patch
+ @ eb5a0daa2192 (4) C0
+ |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | (No patch available, too many predecessors (2))
+ | |
+ x | 471f378eab4c (1) A0
+ /
+ x b7ea6d14e664 (3) B1
+ | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
+ | @@ -1,1 +1,1 @@
+ | -B0
+ | +B1
+ |
+ |
+ x 0dec01379d3b (2) B0
+
+ $ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | python -m json.tool
[
{
"markers": [],
@@ -239,6 +277,80 @@
"shortdescription": "A0"
}
]
+ $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
+ [
+ {
+ "markers": [
+ {
+ "dates": [
+ [
+ *, (glob)
+ 0
+ ],
+ [
+ *, (glob)
+ 0
+ ]
+ ],
+ "effects": [
+ *, (glob)
+ *, (glob)
+ "content"
+ ],
+ "operations": [
+ "fold"
+ ],
+ "prednodes": [
+ "471f378eab4c5e25f6c77f785b27c936efb22874",
+ "b7ea6d14e664bdc8922221f7992631b50da3fb07"
+ ],
+ "users": [
+ "test"
+ ],
+ "verb": "folded"
+ }
+ ],
+ "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",
+ "shortdescription": "C0"
+ },
+ {
+ "markers": [
+ {
+ "dates": [
+ [
+ *, (glob)
+ 0
+ ]
+ ],
+ "effects": [
+ "description"
+ ],
+ "operations": [
+ "amend"
+ ],
+ "prednodes": [
+ "0dec01379d3be6318c470ead31b1fe7ae7cb53d5"
+ ],
+ "users": [
+ "test"
+ ],
+ "verb": "reworded"
+ }
+ ],
+ "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
+ "shortdescription": "B1"
+ },
+ {
+ "markers": [],
+ "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
+ "shortdescription": "B0"
+ },
+ {
+ "markers": [],
+ "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
+ "shortdescription": "A0"
+ }
+ ]
$ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
(use --hidden to access hidden revisions)