# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1579008013 -25200
# Node ID 900668a936299b11d721d15367227a480c363aa0
# Parent  e3ab6017a40a6a74ea54ab501588977ccb6cc9f9
obslog: use _successorsetverb() in regular obslog too

It was already used for obslog --filternonlocal.

diff -r e3ab6017a40a -r 900668a93629 CHANGELOG
--- a/CHANGELOG	Sun Feb 02 16:18:18 2020 +0100
+++ b/CHANGELOG	Tue Jan 14 20:20:13 2020 +0700
@@ -9,6 +9,7 @@
   * exchange: dropped more bundle-1 related dead code
   * help: categorizing evolve and topic commands
   * obslog: make templatable
+  * obslog: use more specific verbs when possible
   * compat: cleanup some compatibility code for mercurial < 4.5
   * compat: compatibility with some changes of the upcoming Mercurial 5.3
   * evolve: add content divergence checking to the standard pre-rewrite check,
diff -r e3ab6017a40a -r 900668a93629 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Sun Feb 02 16:18:18 2020 +0100
+++ b/hgext3rd/evolve/obshistory.py	Tue Jan 14 20:20:13 2020 +0700
@@ -503,11 +503,7 @@
 
     fm.startitem()
 
-    # Detect pruned revisions
-    if len(succnodes) == 0:
-        verb = b'pruned'
-    else:
-        verb = b'rewritten'
+    verb = _successorsetverb(succnodes, [marker])[b"verb"]
 
     fm.data(verb=verb)
 
@@ -592,7 +588,6 @@
     fm.startitem()
     fm.plain(b'  ')
 
-    # Detect pruned revisions
     verb = _successorsetverb(succnodes, markers)[b"verb"]
 
     fm.write(b'verb', b'%s', verb,
diff -r e3ab6017a40a -r 900668a93629 tests/test-amend-patch.t
--- a/tests/test-amend-patch.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-amend-patch.t	Tue Jan 14 20:20:13 2020 +0700
@@ -88,7 +88,7 @@
   @  af624b221c0c (1) added a
   |
   x  f7ad41964313 (0) added a
-       rewritten(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff --git a/a b/a
          --- a/a
          +++ b/a
diff -r e3ab6017a40a -r 900668a93629 tests/test-amend.t
--- a/tests/test-amend.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-amend.t	Tue Jan 14 20:20:13 2020 +0700
@@ -25,7 +25,7 @@
   @  6a022cbb61d5 (1) adda
   |
   x  07f494440405 (0) adda
-       rewritten(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       branch-changed(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          note: this a note on the obsmarker and supported for hg>=4.4
   
   $ hg branch
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-basic.t	Tue Jan 14 20:20:13 2020 +0700
@@ -1000,7 +1000,7 @@
   @  8c2a6aae4bc5 (5) E4
   |
   x    aae293050980 (4) <<<<<<< divergent
-  |\     rewritten(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |      diff -r aae293050980 -r 8c2a6aae4bc5 changeset-description
   | |      --- a/changeset-description
   | |      +++ b/changeset-description
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-interrupted.t	Tue Jan 14 20:20:13 2020 +0700
@@ -241,11 +241,11 @@
   | @  491e10505bae (10) added c
   | |
   | x  7398f702a162 (9) added c
-  |/     rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  ca1b80f7960a (3) added c
-       rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ cd ..
 
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-content-divergent-relocation.t
--- a/tests/test-evolve-content-divergent-relocation.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-relocation.t	Tue Jan 14 20:20:13 2020 +0700
@@ -289,16 +289,16 @@
   | |    rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  b4575ed6fcfc (19) added y
-  | |    rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  2a9f6ccbdeba (17) added y
-  | |    rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  96b677f01b81 (18) added y
-  |/     rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  fc6ad2bac162 (16) added y
-       rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000)
        rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-content-divergent-stack.t
--- a/tests/test-evolve-content-divergent-stack.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-stack.t	Tue Jan 14 20:20:13 2020 +0700
@@ -672,11 +672,11 @@
   | |    rewritten(description, content) as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8e222f257bbf (5) watbar to a
-  |/     rewritten(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7586e2a9264 (1) added a
        rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg obslog -r 'desc("added b")' --all
   @  2a955e808c53 (14) added b
@@ -684,14 +684,14 @@
   | *  509103439e5e (17) added b
   | |
   x |  6eb54b5af3fb (11) added b
-  | |    rewritten(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  d5f148423c16 (6) added b
-  |/     rewritten(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  b1661037fa25 (2) added b
-       rewritten(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 Again, let's evolve the stack
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-cycles.t
--- a/tests/test-evolve-cycles.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-cycles.t	Tue Jan 14 20:20:13 2020 +0700
@@ -264,7 +264,7 @@
   | |      rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a8df460dbbfe (3) C
-  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    split(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  c473644ee0e9 (2) B
   | |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -284,7 +284,7 @@
   | |      rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a8df460dbbfe (3) C
-  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    split(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  c473644ee0e9 (2) B
   | |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -380,7 +380,7 @@
                       "868d2e0eb19c2b55a2894d37e1c435c221384d48"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "split"
               }
           ],
           "node": "a8df460dbbfe9ef0c1e5ab4fff02e9514672e379",
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-effectflags.t
--- a/tests/test-evolve-effectflags.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-effectflags.t	Tue Jan 14 20:20:13 2020 +0700
@@ -34,7 +34,7 @@
   @  fdf9bde5129a (2) A1
   |
   x  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "desc(A0)"
   changeset:   1:471f378eab4c
@@ -58,7 +58,7 @@
   @  5485c92d3433 (4) B0
   |
   x  ef4a313b1e0a (3) B0
-       rewritten(user) as 5485c92d3433 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reauthored(user) as 5485c92d3433 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "ef4a313b1e0a"
   changeset:   3:ef4a313b1e0a
@@ -82,7 +82,7 @@
   @  4dd84345082e (6) B1
   |
   x  2ef0680ff450 (5) B1
-       rewritten(date) as 4dd84345082e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       date-changed(date) as 4dd84345082e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "2ef0680ff450"
   changeset:   5:2ef0680ff450
@@ -109,7 +109,7 @@
   @  14a01456e057 (8) B2
   |
   x  bd3db8264cee (7) B2
-       rewritten(branch) as 14a01456e057 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       branch-changed(branch) as 14a01456e057 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "bd3db8264cee"
   changeset:   7:bd3db8264cee
@@ -138,7 +138,7 @@
   @  da86aa2f19a3 (11) D0
   |
   x  c85eff83a034 (10) D0
-       rewritten(parent) as da86aa2f19a3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as da86aa2f19a3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "c85eff83a034"
   changeset:   10:c85eff83a034
@@ -163,7 +163,7 @@
   @  75781fdbdbf5 (13) E0
   |
   x  ebfe0333e0d9 (12) E0
-       rewritten(content) as 75781fdbdbf5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 75781fdbdbf5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "ebfe0333e0d9"
   changeset:   12:ebfe0333e0d9
@@ -244,7 +244,7 @@
   o  e509e2eb3df5 (19) H1
   |
   x  b57fed8d8322 (17) H1
-       rewritten(parent) as e509e2eb3df5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as e509e2eb3df5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "b57fed8d8322"
   changeset:   17:b57fed8d8322
@@ -269,7 +269,7 @@
   @  12c6238b5e37 (22) I0
   |
   x  2f599e54c1c6 (21) I0
-       rewritten(meta) as 12c6238b5e37 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       meta-changed(meta) as 12c6238b5e37 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg log --hidden -r "2f599e54c1c6"
   changeset:   21:2f599e54c1c6
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-issue5958.t
--- a/tests/test-evolve-issue5958.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-issue5958.t	Tue Jan 14 20:20:13 2020 +0700
@@ -70,14 +70,14 @@
   | |    rewritten(parent, content) as 08bc7ba82799 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a25dd7af6cf6 (3) add foo.txt
-  | |    rewritten(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  0065551bd38f (2) add foo.txt
-  |/     rewritten(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  cc71ffbc7c00 (1) add foo.txt
-       rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+       date-changed(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+       date-changed(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg evolve --content-divergent
   merge:[6] add foo.txt
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-issue6097.t
--- a/tests/test-evolve-issue6097.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-issue6097.t	Tue Jan 14 20:20:13 2020 +0700
@@ -89,7 +89,7 @@
   @  bb847d1d3a5f (4) apricot and coconut
   |
   x  2868fe6df617 (3) apricot and coconut
-  |    rewritten(parent) as bb847d1d3a5f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rebased(parent) as bb847d1d3a5f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  32acf8fb1b23 (2) apricot and coconut
   |    rewritten(parent, content) as 2868fe6df617 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Tue Jan 14 20:20:13 2020 +0700
@@ -85,7 +85,7 @@
   @    eb5a0daa2192 (4) C0
   |\
   x |  471f378eab4c (1) A0
-   /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   |        --- a/changeset-description
   |        +++ b/changeset-description
@@ -101,11 +101,11 @@
   |
   |
   x  b7ea6d14e664 (3) B1
-  |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, changesets rebased)
   |
   x  0dec01379d3b (2) B0
-       rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as b7ea6d14e664 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
@@ -119,7 +119,7 @@
   @    eb5a0daa2192 (4) C0
   |\
   x |  471f378eab4c (1) A0
-   /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   |        --- a/changeset-description
   |        +++ b/changeset-description
@@ -135,11 +135,11 @@
   |
   |
   x  b7ea6d14e664 (3) B1
-  |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, changesets rebased)
   |
   x  0dec01379d3b (2) B0
-       rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as b7ea6d14e664 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
@@ -172,7 +172,7 @@
                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "folded"
               }
           ],
           "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
@@ -193,7 +193,7 @@
                       "b7ea6d14e664bdc8922221f7992631b50da3fb07"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               }
           ],
           "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
@@ -215,7 +215,7 @@
                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "folded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-amend.t	Tue Jan 14 20:20:13 2020 +0700
@@ -329,7 +329,7 @@
   @  92210308515b (4) A3
   |
   x  4f1685185907 (3) A2
-  |    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      diff -r 4f1685185907 -r 92210308515b changeset-description
   |      --- a/changeset-description
   |      +++ b/changeset-description
@@ -342,7 +342,7 @@
   |
   |
   x  4ae3a4151de9 (2) A1
-  |    rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
   |      --- a/changeset-description
   |      +++ b/changeset-description
@@ -424,11 +424,11 @@
   o  92210308515b (2) A3
   |
   x  4f1685185907
-  |    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    reworded(description) as 92210308515b using amend 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)
+  |    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, successor is unknown locally)
   |
   x  471f378eab4c
@@ -455,11 +455,11 @@
   92210308515b (2) A3
   
   4f1685185907
-    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    reworded(description) as 92210308515b using amend 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)
+    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, successor is unknown locally)
   
   471f378eab4c
@@ -471,11 +471,11 @@
   92210308515b (2) A3
   
   4f1685185907
-    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+    reworded(description) as 92210308515b using amend 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)
+    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, successor is unknown locally)
   
   471f378eab4c
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Tue Jan 14 20:20:13 2020 +0700
@@ -78,11 +78,11 @@
   @    100cc25b765f (9) fold2
   |\
   x |  0da815c333f6 (5) E
-   /     rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: folding changesets to test
   |
   x  d9f908fde1a1 (6) F
-       rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          note: folding changesets to test
   
   $ hg log -G 
@@ -402,25 +402,25 @@
   *    7b3290f6e0a0 (12) fold1
   |\
   x |    d15d0ffc75f6 (8) fold1
-  |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   | | |
   | | x  e036916b63ea (11) fold0
   | | |    rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | | |
   x | |  868d2e0eb19c (4) D
-   / /     rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   / /     folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a8df460dbbfe (3) C
-   /     rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x    b868bc49b0a4 (7) fold0
-  |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  2a34000d3544 (1) A
-   /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-       rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   
 While with all option, we should see 15 changesets
 
@@ -434,7 +434,7 @@
   | | | | *  ec31316faa9d (14) fold2
   | | | |/|
   | | | x |    100cc25b765f (9) fold2
-  | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  | | | |\ \     split(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
   | | | | | |
   | +-------x  d0f33db50670 (13) fold1
   | | | | |      rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -444,28 +444,28 @@
   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | | | |
   | | x |  0da815c333f6 (5) E
-  | |  /     rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |  /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | | |        note: folding changesets to test
   | | |
   x | |    b868bc49b0a4 (7) fold0
-  |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\ \ \     split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   | | | |
   | | x |    d15d0ffc75f6 (8) fold1
-  | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  | | |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   | | | | |
   | | | | x  d9f908fde1a1 (6) F
-  | | | |      rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | | | |      folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | | | |        note: folding changesets to test
   | | | |
   x | | |  2a34000d3544 (1) A
-   / / /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   / / /     folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | | |
   | x |  868d2e0eb19c (4) D
-  |  /     rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |  /     folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  a8df460dbbfe (3) C
-  |      rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-       rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-content-divergent.t
--- a/tests/test-evolve-obshistory-content-divergent.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-content-divergent.t	Tue Jan 14 20:20:13 2020 +0700
@@ -82,7 +82,7 @@
 Check that debugobshistory on the divergent revision show both destinations
   $ hg obslog --hidden 471f378eab4c --patch
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -90,7 +90,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -107,7 +107,7 @@
   | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -115,7 +115,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -141,7 +141,7 @@
                       "65b757b745b935093c87a2bccd877521cccffcbd"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               },
               {
                   "date": [
@@ -156,7 +156,7 @@
                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
@@ -169,7 +169,7 @@
   *  fdf9bde5129a (2) A1
   |
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -177,7 +177,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -194,7 +194,7 @@
   | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -202,7 +202,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -217,7 +217,7 @@
   @  65b757b745b9 (3) A2
   |
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -225,7 +225,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -241,7 +241,7 @@
   | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -249,7 +249,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -266,7 +266,7 @@
   | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
-       rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -274,7 +274,7 @@
          -A0
          +A2
   
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -305,7 +305,7 @@
                       "65b757b745b935093c87a2bccd877521cccffcbd"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               },
               {
                   "date": [
@@ -320,7 +320,7 @@
                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-fold.t
--- a/tests/test-evolve-obshistory-fold.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-fold.t	Tue Jan 14 20:20:13 2020 +0700
@@ -73,7 +73,7 @@
 the revision with the target
   $ hg obslog --hidden 471f378eab4c --patch
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -93,11 +93,11 @@
   @    eb5a0daa2192 (3) C0
   |\
   x |  0dec01379d3b (2) B0
-   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        (No patch available, changesets rebased)
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -116,7 +116,7 @@
 the revision with the target
   $ hg obslog --hidden 0dec01379d3b --patch
   x  0dec01379d3b (2) B0
-       rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, changesets rebased)
   
 Check that with all option, all changesets are shown
@@ -124,11 +124,11 @@
   @    eb5a0daa2192 (3) C0
   |\
   x |  0dec01379d3b (2) B0
-   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        (No patch available, changesets rebased)
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -149,11 +149,11 @@
   @    eb5a0daa2192 (3) C0
   |\
   x |  0dec01379d3b (2) B0
-   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        (No patch available, changesets rebased)
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -191,7 +191,7 @@
                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "folded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
@@ -214,7 +214,7 @@
                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "folded"
               }
           ],
           "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
@@ -249,11 +249,11 @@
   o    eb5a0daa2192 (2) C0
   |\
   x |  0dec01379d3b
-   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        (No patch available, context is not local)
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -292,11 +292,11 @@
   o    eb5a0daa2192 (2) C0
   |\
   x |  0dec01379d3b
-   /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        (No patch available, context is not local)
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Tue Jan 14 20:20:13 2020 +0700
@@ -176,7 +176,7 @@
 
   $ hg obslog de7290d8b885 --hidden --patch
   x  de7290d8b885 (1) A0
-       rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
   $ hg obslog de7290d8b885 --hidden --all --patch
@@ -189,7 +189,7 @@
   | o  f257fde29c7a (3) A0
   |/
   x  de7290d8b885 (1) A0
-       rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split 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
@@ -213,7 +213,7 @@
                       "f257fde29c7a847c9b607f6e958656d0df0fb15c"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "split"
               }
           ],
           "node": "de7290d8b885925115bb9e88887252dfc20ef2a8",
@@ -224,7 +224,7 @@
   @  c7f044602e9b (5) A0
   |
   x  de7290d8b885 (1) A0
-       rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split 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
@@ -253,7 +253,7 @@
                       "f257fde29c7a847c9b607f6e958656d0df0fb15c"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "split"
               }
           ],
           "node": "de7290d8b885925115bb9e88887252dfc20ef2a8",
@@ -271,7 +271,7 @@
   | o  f257fde29c7a (3) A0
   |/
   x  de7290d8b885 (1) A0
-       rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
   $ hg obslog 5 --all --patch
@@ -284,7 +284,7 @@
   | o  f257fde29c7a (3) A0
   |/
   x  de7290d8b885 (1) A0
-       rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
   $ hg update de7290d8b885
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-phase-divergent.t
--- a/tests/test-evolve-obshistory-phase-divergent.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-phase-divergent.t	Tue Jan 14 20:20:13 2020 +0700
@@ -69,7 +69,7 @@
 Check that debugobshistory on the divergent revision show both destinations
   $ hg obslog --hidden 471f378eab4c --patch
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -84,7 +84,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -110,7 +110,7 @@
                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
@@ -123,7 +123,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -138,7 +138,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -153,7 +153,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -167,7 +167,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -182,7 +182,7 @@
   *  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -213,7 +213,7 @@
                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "reworded"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory-split.t
--- a/tests/test-evolve-obshistory-split.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory-split.t	Tue Jan 14 20:20:13 2020 +0700
@@ -106,7 +106,7 @@
 Check that debugobshistory on split commit show both targets
   $ hg obslog 471597cad322 --hidden --patch
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -130,7 +130,7 @@
                       "f257fde29c7a847c9b607f6e958656d0df0fb15c"
                   ],
                   "user": "test",
-                  "verb": "rewritten"
+                  "verb": "split"
               }
           ],
           "node": "471597cad322d1f659bb169751be9133dad92ef3",
@@ -143,7 +143,7 @@
   o  337fec4d2edc (2) A0
   |
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -154,7 +154,7 @@
   | @  f257fde29c7a (3) A0
   |/
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -164,7 +164,7 @@
   @  f257fde29c7a (3) A0
   |
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -175,7 +175,7 @@
   | @  f257fde29c7a (3) A0
   |/
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -186,7 +186,7 @@
   | @  f257fde29c7a (3) A0
   |/
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -198,7 +198,7 @@
   | @  f257fde29c7a (3) A0
   |/
   x  471597cad322 (1) A0
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, too many successors (2))
   
@@ -220,7 +220,7 @@
   o  f257fde29c7a (2) A0
   |
   x  471597cad322
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, context is not local)
   
@@ -233,7 +233,7 @@
   | o  f257fde29c7a (2) A0
   |/
   x  471597cad322
-       rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          note: testing split
          (No patch available, context is not local)
   
@@ -246,7 +246,7 @@
   f257fde29c7a (2) A0
   
   471597cad322
-    rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+    split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
       note: testing split
       (No patch available, context is not local)
   
@@ -255,7 +255,7 @@
   f257fde29c7a (2) A0
   
   471597cad322
-    rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+    split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
       note: testing split
       (No patch available, context is not local)
   
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-obshistory.t	Tue Jan 14 20:20:13 2020 +0700
@@ -97,7 +97,7 @@
   @  7a230b46bf61 (3) A2
   |
   x  fdf9bde5129a (2) A1
-  |    rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    reworded(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
   |      --- a/changeset-description
   |      +++ b/changeset-description
@@ -107,7 +107,7 @@
   |
   |
   x  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -136,11 +136,11 @@
   o  7a230b46bf61 (2) A2
   |
   x  fdf9bde5129a
-  |    rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    reworded(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, context is not local)
   |
   @  471f378eab4c (1) A0
-       rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, successor is unknown locally)
   
 
@@ -161,11 +161,11 @@
   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
   |
   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
-  |    [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+  |    [evolve.verb|reworded](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
   |      (No patch available, context is not local)
   |
   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
-       [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+       [evolve.verb|reworded](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
          (No patch available, successor is unknown locally)
   
 
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-phase-divergence.t	Tue Jan 14 20:20:13 2020 +0700
@@ -162,7 +162,7 @@
   @  98bb3a6cfe1a (2) tweak a
   |
   o  4d1169d82e47 (1) modify a
-       rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reworded(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
 Solving the phase divergence using evolve command
 --------------------------------------------------
@@ -586,7 +586,7 @@
   @  334e300d6db5 (10) added x to x
   |
   o  2352021b3785 (9) added x to x
-       rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg glog -r .^::
   @  10:334e300d6db5 added x to x
@@ -634,10 +634,10 @@
   |    pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  334e300d6db5 (10) added x to x
-  |    rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rebased(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   @  2352021b3785 (9) added x to x
-       rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ hg exp
@@ -717,10 +717,10 @@
   @  13015a180eee (14) y to y and foobar to foo
   |
   x  211ab84d1689 (13) y to y and foobar to foo
-  |    rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    amended(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   o  dc88f5aa9bc9 (12) y to y and foobar to foo
-       rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 Resolving divergence using `hg evolve`
 -------------------------------------
@@ -789,10 +789,10 @@
   @  5fd38c0de46e (19) added l to l
   |
   x  2bfd56949cf0 (18) added l to l
-  |    rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    amended(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  f3794e5a91dc (17) added l to l
-       rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
   $ hg phase -r f3794e5a91dc --public --hidden
@@ -1033,10 +1033,10 @@
   | |    rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  e1154ec0206a (3) added n
-  |/     rewritten(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   o  a51bce62c219 (1) added m and n
-       rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 XXX: not sure this is the correct
@@ -1163,7 +1163,7 @@
   |/     rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   o  90859808ece6 (1) added p and q
-       rewritten(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 XXX: not sure this is correct
@@ -1294,13 +1294,13 @@
   | |    rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  52ca78bb98c7 (4) added n
-  | |    rewritten(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  e1154ec0206a (3) added n
-  |/     rewritten(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   o  a51bce62c219 (1) added m and n
-       rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+       split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 XXX: not sure this is correct
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-public-content-divergent-corner-cases.t
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Tue Jan 14 20:20:13 2020 +0700
@@ -372,7 +372,7 @@
   | *  e568fd1029bb (4) added c e
   |/
   x  9150fe93bec6 (3) added d
-       rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 9150fe93bec6 -r 93cd84bbdaca d
          --- a/d	Thu Jan 01 00:00:00 1970 +0000
          +++ b/d	Thu Jan 01 00:00:00 1970 +0000
@@ -759,9 +759,9 @@
   | |    rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8ae8db670b4a (10) c_F
-  |/     rewritten(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  77ccbf8d837e (6) c_F
-       rewritten(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-templates.t	Tue Jan 14 20:20:13 2020 +0700
@@ -76,7 +76,7 @@
   o  d004c8f274b9 (3) A2
   |
   x  a468dc9b3633 (2) A1
-  |    rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
+  |    reworded(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
   |
   @  471f378eab4c (1) A0
        rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000)
diff -r e3ab6017a40a -r 900668a93629 tests/test-evolve.t
--- a/tests/test-evolve.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve.t	Tue Jan 14 20:20:13 2020 +0700
@@ -761,10 +761,10 @@
   @    d26d339c513f (12) add 4
   |\
   x |  ce341209337f (4) add 4
-   /     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     folded(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x    cf0c3904643c (11) add 3
-  |\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     folded(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | \
   | |\
diff -r e3ab6017a40a -r 900668a93629 tests/test-metaedit.t
--- a/tests/test-metaedit.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-metaedit.t	Tue Jan 14 20:20:13 2020 +0700
@@ -136,15 +136,15 @@
   @    a08d35fd7d9d (9) E
   |\
   x |  212b2a2b87cd (8) F
-  | |    rewritten(description, user, parent, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    folded(description, user, parent, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   | |      note: folding changesets using metaedit
   | |
   | x  c2bd843aa246 (6) E
-  |      rewritten(description, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      folded(description, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: folding changesets using metaedit
   |
   x  587528abfffe (7) F
-       rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+       reauthored(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg debugobsolete --rev . --exclusive
   212b2a2b87cdbae992f001e9baba64db389fbce7 a08d35fd7d9d0f8cb33d5bd2074e9bafb5cbc70f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '29', 'fold-id': 'c5832a81', 'fold-idx': '2', 'fold-size': '2', 'note': 'folding changesets using metaedit', 'operation': 'metaedit', 'user': 'test'}
diff -r e3ab6017a40a -r 900668a93629 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-obsolete.t	Tue Jan 14 20:20:13 2020 +0700
@@ -726,7 +726,7 @@
   [2]
   $ hg olog
   @  0d3f46688ccc (3) add obsol_c
-  |    rewritten(parent) as 2033b4e49474 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rebased(parent) as 2033b4e49474 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |    rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  4538525df7e2 (2) add c
diff -r e3ab6017a40a -r 900668a93629 tests/test-rewind.t
--- a/tests/test-rewind.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-rewind.t	Tue Jan 14 20:20:13 2020 +0700
@@ -95,7 +95,7 @@
   |
   x  7e594302a05d (2) c_B0
        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(meta) as 073989a581cf using rewind 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 log -G
   o  changeset:   3:073989a581cf
@@ -173,8 +173,8 @@
   |/
   x  7e594302a05d (2) c_B0
        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+       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 log -G
   o  changeset:   4:b13b032065ef
@@ -273,7 +273,7 @@
   |
   x  7e594302a05d (2) c_B0
        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
-       rewritten(meta) as b13b032065ef using rewind 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 log -G
   *  changeset:   4:b13b032065ef
@@ -380,8 +380,8 @@
   |
   x  7e594302a05d (2) c_B0
        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
-       rewritten(meta) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
-       rewritten(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+       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 log -G
   @  changeset:   5:837cd997bb05
@@ -520,7 +520,7 @@
   | o  a0316c4c5417 (4) c_CD0
   |/
   x  49fb7d900906 (3) c_CD0
-       rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split 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)
   
 
 Actual rewind
@@ -547,8 +547,8 @@
   |/     rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   |
   x  49fb7d900906 (3) c_CD0
-       rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
-       rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+       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 log -G
   @  changeset:   6:4535d0af405c
@@ -603,7 +603,7 @@
   +---o  e76375de0bfc (7) c_CD0
   | | |
   x---+  4535d0af405c (6) c_CD0
-  |\| |    rewritten(meta, parent, content) as 95d72d892df7, e76375de0bfc using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+  |\| |    split(meta, parent, content) as 95d72d892df7, e76375de0bfc using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   | | |
   | x |  9576e80d6851 (5) c_CD0
   |/ /     rewritten(meta, parent, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
@@ -611,11 +611,11 @@
   | |
   | x  a0316c4c5417 (4) c_CD0
   |/     rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
-  |      rewritten(meta) as e76375de0bfc using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+  |      meta-changed(meta) as e76375de0bfc using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  49fb7d900906 (3) c_CD0
-       rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
-       rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+       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 log -G
   @  changeset:   8:95d72d892df7
@@ -682,7 +682,7 @@
   |      rewritten(description, content) as d952d1794ff6 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  7e594302a05d (2) c_B0
-       rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+       rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
   
   $ hg log -G
   @  changeset:   4:a65fceb2324a
@@ -723,8 +723,8 @@
   |/     rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  7e594302a05d (2) c_B0
-       rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
-       rewritten(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+       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 log -G
   @  changeset:   5:ac979e0aac4e
@@ -797,12 +797,12 @@
   |/|    rewritten(meta, parent) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   | |
   x |  a65fceb2324a (4) c_B0
-  |/     rewritten(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+  |/     meta-changed(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   |      rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  7e594302a05d (2) c_B0
-       rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
-       rewritten(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+       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)
   
 Automatically rewinding the full stack (with --to)
 --------------------------------------------------
@@ -833,12 +833,12 @@
   | |    rewritten(meta, parent) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   | |
   x |  a65fceb2324a (4) c_B0
-  |/     rewritten(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+  |/     meta-changed(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   |      rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  7e594302a05d (2) c_B0
-       rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
-       rewritten(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+       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 log -G
   @  changeset:   8:3f2d8862657d
@@ -897,12 +897,12 @@
   | |    rewritten(meta, parent) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   | |
   | x  a65fceb2324a (4) c_B0
-  |/     rewritten(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+  |/     meta-changed(meta) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   |      rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   |
   x  7e594302a05d (2) c_B0
-       rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
-       rewritten(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+       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 log -G
   @  changeset:   10:d36d6d267714
@@ -1013,7 +1013,7 @@
   |
   x  30704102d912 (1) initial
        rewritten(description, content) as 2ea5be2f8751 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
-       rewritten(meta) as b4c97fddc16a using rewind 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 glf --hidden
   @  3: initial (a b)
diff -r e3ab6017a40a -r 900668a93629 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-topic-stack.t	Tue Jan 14 20:20:13 2020 +0700
@@ -961,16 +961,16 @@
   | @  e7ea874afbd5 (22) c_G
   |/
   x  b24bab30ac12 (20) c_G
-  |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    split(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    amended(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rebased(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       reauthored(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg export .
   # HG changeset patch
diff -r e3ab6017a40a -r 900668a93629 tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-uncommit-interactive.t	Tue Jan 14 20:20:13 2020 +0700
@@ -177,7 +177,7 @@
   @  678a59e5ff90 (3) another one
   |
   x  f70fb463d5bf (1) another one
-       rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
          note: note on amend --extract
   
 The unselected part should be in the diff
@@ -312,11 +312,11 @@
   @  46e35360be47 (5) another one
   |
   x  678a59e5ff90 (3) another one
-  |    rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    amended(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
   |      note: testing uncommit on dirty wdir
   |
   x  f70fb463d5bf (1) another one
-       rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
          note: note on amend --extract