--- a/tests/test-evolve-obshistory-amend.t Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-evolve-obshistory-amend.t Fri Aug 03 00:22:50 2018 +0200
@@ -25,17 +25,23 @@
> Better commit message"
$ sync
$ hg log --hidden -G
- @ changeset: 2:4ae3a4151de9
+ @ changeset: 3: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
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -46,10 +52,10 @@
Check output on the client side
-------------------------------
$ hg obslog --patch 4ae3a4151de9
- @ 4ae3a4151de9 (2) A1
+ @ 4ae3a4151de9 (3) A1
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -68,10 +74,10 @@
$ hg obslog --patch --color debug
- @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
+ @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
|
x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
[diff.file_a|--- a/changeset-description]
[diff.file_b|+++ b/changeset-description]
@@ -91,9 +97,9 @@
$ hg obslog --no-graph --patch 4ae3a4151de9
- 4ae3a4151de9 (2) A1
+ 4ae3a4151de9 (3) A1
471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -121,7 +127,7 @@
{
"markers": [],
"node": "4ae3a4151de9",
- "rev": 2,
+ "rev": 3,
"shortdescription": "A1"
},
{
@@ -135,7 +141,6 @@
"description",
"content"
],
- "operation": "amend",
"succnodes": [
"4ae3a4151de9"
],
@@ -150,7 +155,7 @@
]
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -181,7 +186,6 @@
*, (glob)
"content"
],
- "operation": "amend",
"succnodes": [
"4ae3a4151de9"
],
@@ -210,7 +214,7 @@
o 4ae3a4151de9 (1) A1
|
x 471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
@@ -219,13 +223,13 @@
$ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
Amend two more times
@@ -234,17 +238,23 @@
Amend again
-----------
$ hg log --hidden -G
- o changeset: 2:4ae3a4151de9
+ o changeset: 3: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
+ | |
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -262,31 +272,37 @@
> Better better better commit message"
$ sync
$ hg log --hidden -G
- @ changeset: 4:92210308515b
+ @ changeset: 5:92210308515b
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A3
|
- | x changeset: 3:4f1685185907
+ | x changeset: 4:4f1685185907
+ |/ parent: 0:ea207398892e
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | obsolete: reworded as 92210308515b
+ | summary: A2
+ |
+ | x changeset: 3:4ae3a4151de9
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 4:92210308515b
- | summary: A2
- |
- | x changeset: 2:4ae3a4151de9
- |/ parent: 0:ea207398892e
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:4f1685185907
+ | obsolete: reworded as 4f1685185907
| 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
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -298,10 +314,10 @@
------------------------------
$ hg obslog --patch 92210308515b
- @ 92210308515b (4) A3
+ @ 92210308515b (5) A3
|
- x 4f1685185907 (3) A2
- | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 4f1685185907 (4) A2
+ | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4f1685185907 -r 92210308515b changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -313,8 +329,8 @@
| +Better better better commit message
|
|
- x 4ae3a4151de9 (2) A1
- | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 4ae3a4151de9 (3) A1
+ | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -327,7 +343,7 @@
|
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -352,53 +368,42 @@
o 92210308515b (2) A3
|
x 4f1685185907
- | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, context is not local)
|
x 4ae3a4151de9 (1) A1
- | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, successor is unknown locally)
|
x 471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server -f --patch 92210308515b
o 92210308515b (2) A3
|
x 4ae3a4151de9 (1) A1
- reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
- diff -r 4ae3a4151de9 -r 92210308515b changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,3 +1,3 @@
- -A1
- +A3
-
- -Better commit message
- +Better better better commit message
-
$ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
92210308515b (2) A3
4f1685185907
- rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
92210308515b (2) A3
4f1685185907
- rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)