Mercurial > evolve

changeset 2896:462adae9fea7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsfate: use effect flag information for computing a better verb
author Boris Feld <boris.feld@octobus.net>
date Wed, 09 Aug 2017 11:32:19 +0200
parents e4ee0b6170e9
children bd04a614b866
files README hgext3rd/evolve/obshistory.py tests/test-drop.t tests/test-evolve-effectflags.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-topic-tutorial.t
diffstat 10 files changed, 143 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/README	Tue Aug 29 17:30:07 2017 +0200
+++ b/README	Wed Aug 09 11:32:19 2017 +0200
@@ -124,6 +124,8 @@
 6.7.0 - in progress
 -------------------
 
+  * obslog/log: improve verb used to describe and evolution
+
   * topic: gain a --current flag
 
 6.6.0 -- 2017-07-25
--- a/hgext3rd/evolve/obshistory.py	Tue Aug 29 17:30:07 2017 +0200
+++ b/hgext3rd/evolve/obshistory.py	Wed Aug 09 11:32:19 2017 +0200
@@ -726,13 +726,39 @@
 
     return {'users': sorted(users)}
 
+VERBMAPPING = {
+    DESCCHANGED: "reworded",
+    METACHANGED: "meta-changed",
+    USERCHANGED: "reauthored",
+    DATECHANGED: "date-changed",
+    BRANCHCHANGED: "branch-changed",
+    PARENTCHANGED: "rebased",
+    DIFFCHANGED: "amended"
+}
+
 def _successorsetverb(successorset, markers):
     """ Return the verb summarizing the successorset
     """
+    verb = None
     if not successorset:
         verb = 'pruned'
     elif len(successorset) == 1:
-        verb = 'rewritten'
+        # Check for effect flag
+
+        metadata = [dict(marker[3]) for marker in markers]
+        ef1 = [data.get('ef1') for data in metadata]
+
+        if all(ef1):
+            combined = 0
+            for ef in ef1:
+                combined |= int(ef)
+
+            # Combined will be in VERBMAPPING only of one bit is set
+            if combined in VERBMAPPING:
+                verb = VERBMAPPING[combined]
+
+        if verb is None:
+            verb = 'rewritten'
     else:
         verb = 'split'
     return {'verb': verb}
--- a/tests/test-drop.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-drop.t	Wed Aug 09 11:32:19 2017 +0200
@@ -212,7 +212,7 @@
   | x  changeset:   2:34b6c051bf1f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as a2c06c884bfe
+  |    obsolete:    amended as a2c06c884bfe
   |    summary:     add child
   |
   o  changeset:   1:19509a42b0d0
--- a/tests/test-evolve-effectflags.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-evolve-effectflags.t	Wed Aug 09 11:32:19 2017 +0200
@@ -36,6 +36,13 @@
   x  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a by test (*) (glob)
   
+  $ hg log --hidden -r "desc(A0)"
+  changeset:   1:471f378eab4c
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    reworded as fdf9bde5129a
+  summary:     A0
+  
 
 amend touching the user only
 ----------------------------
@@ -53,6 +60,13 @@
   x  ef4a313b1e0a (3) B0
        rewritten(user) as 5485c92d3433 by test (*) (glob)
   
+  $ hg log --hidden -r "ef4a313b1e0a"
+  changeset:   3:ef4a313b1e0a
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    reauthored as 5485c92d3433
+  summary:     B0
+  
 
 amend touching the date only
 ----------------------------
@@ -70,6 +84,13 @@
   x  2ef0680ff450 (5) B1
        rewritten(date) as 4dd84345082e by test (*) (glob)
   
+  $ hg log --hidden -r "2ef0680ff450"
+  changeset:   5:2ef0680ff450
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    date-changed as 4dd84345082e
+  summary:     B1
+  
 
 amend touching the branch only
 ----------------------------
@@ -91,6 +112,13 @@
   x  bd3db8264cee (7) B2
        rewritten(branch) as 14a01456e057 by test (*) (glob)
   
+  $ hg log --hidden -r "bd3db8264cee"
+  changeset:   7:bd3db8264cee
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    branch-changed as 14a01456e057
+  summary:     B2
+  
 
   $ hg up default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -113,6 +141,13 @@
   x  c85eff83a034 (11) D0
        rewritten(parent) as da86aa2f19a3 by test (*) (glob)
   
+  $ hg log --hidden -r "c85eff83a034"
+  changeset:   11:c85eff83a034
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    rebased as da86aa2f19a3
+  summary:     D0
+  
 
 amend touching the diff
 -----------------------
@@ -132,6 +167,13 @@
   x  ebfe0333e0d9 (13) E0
        rewritten(content) as 75781fdbdbf5 by test (*) (glob)
   
+  $ hg log --hidden -r "ebfe0333e0d9"
+  changeset:   13:ebfe0333e0d9
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    amended as 75781fdbdbf5
+  summary:     E0
+  
 
 amend with multiple effect (desc and meta)
 -------------------------------------------
@@ -152,6 +194,14 @@
   x  fad47e5bd78e (16) F0
        rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
   
+  $ hg log --hidden -r "fad47e5bd78e"
+  changeset:   16:fad47e5bd78e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    rewritten as a94e0fd5f1c8
+  summary:     F0
+  
+
 rebase not touching the diff
 ----------------------------
 
@@ -199,6 +249,14 @@
   x  b57fed8d8322 (20) H1
        rewritten(parent) as e509e2eb3df5 by test (*) (glob)
   
+  $ hg log --hidden -r "b57fed8d8322"
+  changeset:   20:b57fed8d8322
+  branch:      my-other-branch
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    rebased as e509e2eb3df5
+  summary:     H1
+  
 amend closing the branch should be detected as meta change
 ----------------------------------------------------------
 
@@ -216,3 +274,11 @@
   x  2f599e54c1c6 (24) I0
        rewritten(meta) as 12c6238b5e37 by test (*) (glob)
   
+  $ hg log --hidden -r "2f599e54c1c6"
+  changeset:   24:2f599e54c1c6
+  branch:      closedbranch
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  obsolete:    meta-changed as 12c6238b5e37
+  summary:     I0
+  
--- a/tests/test-evolve-obshistory.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Wed Aug 09 11:32:19 2017 +0200
@@ -976,7 +976,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1009,8 +1009,8 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
-  |    obsolete:    rewritten as 65b757b745b9
+  |    obsolete:    reworded as fdf9bde5129a
+  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1292,7 +1292,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as b7ea6d14e664
+  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -1326,7 +1326,7 @@
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten as b7ea6d14e664
+  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
@@ -1556,13 +1556,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
--- a/tests/test-evolve-templates.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-evolve-templates.t	Wed Aug 09 11:32:19 2017 +0200
@@ -47,7 +47,7 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten by test2 as d004c8f274b9
+  |    obsolete:    reworded by test2 as d004c8f274b9
   |    summary:     A1
   |
   | x  changeset:   2:f137d23bb3e1
@@ -152,7 +152,7 @@
   | @  a468dc9b3633
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten as d004c8f274b9 by test2
+  |      Fate: reworded as d004c8f274b9 by test2
   |
   o  ea207398892e
   
@@ -167,7 +167,7 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten as d004c8f274b9 by test2
+  |      Fate: reworded as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned by test1
@@ -183,7 +183,7 @@
   o  d004c8f274b9
   |
   | @  a468dc9b3633
-  |/     Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   o  ea207398892e
   
@@ -203,7 +203,7 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten as d004c8f274b9 by test2
+  |      Fate: reworded as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned by test1
@@ -225,7 +225,7 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   | x  f137d23bb3e1
   | |    Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000)
@@ -239,7 +239,7 @@
   $ hg fatelogjson --hidden
   @  d004c8f274b9 ""
   |
-  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "rewritten"}]
+  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
   |/
   | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test1"], "verb": "pruned"}]
   | |
@@ -605,7 +605,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -638,8 +638,8 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
-  |    obsolete:    rewritten as 65b757b745b9
+  |    obsolete:    reworded as fdf9bde5129a
+  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -668,8 +668,8 @@
   | @  471f378eab4c
   |/     Successors: [fdf9bde5129a], [019fadeab383]
   |      semi-colon: [fdf9bde5129a]; [019fadeab383]
-  |      Fate: rewritten as fdf9bde5129a
-  |      Fate: rewritten as 019fadeab383
+  |      Fate: reworded as fdf9bde5129a
+  |      Fate: reworded as 019fadeab383
   |
   o  ea207398892e
   
@@ -679,7 +679,7 @@
   | o  fdf9bde5129a
   |/
   | @  471f378eab4c
-  |/     Obsfate: rewritten as fdf9bde5129a; rewritten as 019fadeab383
+  |/     Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
   |
   o  ea207398892e
   
@@ -713,7 +713,7 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [019fadeab383]
   |      semi-colon: [019fadeab383]
-  |      Fate: rewritten as 019fadeab383
+  |      Fate: reworded as 019fadeab383
   |
   | @  fdf9bde5129a
   |/     Precursors: 471f378eab4c
@@ -721,8 +721,8 @@
   | x  471f378eab4c
   |/     Successors: [fdf9bde5129a], [65b757b745b9]
   |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
-  |      Fate: rewritten as fdf9bde5129a
-  |      Fate: rewritten as 65b757b745b9
+  |      Fate: reworded as fdf9bde5129a
+  |      Fate: reworded as 65b757b745b9
   |
   o  ea207398892e
   
@@ -730,12 +730,12 @@
   o  019fadeab383
   |
   | x  65b757b745b9
-  |/     Obsfate: rewritten as 019fadeab383
+  |/     Obsfate: reworded as 019fadeab383
   |
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
-  |/     Obsfate: rewritten as fdf9bde5129a; rewritten as 65b757b745b9
+  |/     Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
   |
   o  ea207398892e
   
@@ -743,11 +743,11 @@
   $ hg fatelogjson --hidden
   o  019fadeab383 ""
   |
-  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "rewritten"}]
+  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
   |/
   | @  fdf9bde5129a ""
   |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "rewritten"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "rewritten"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
   |/
   o  ea207398892e ""
   
@@ -775,7 +775,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as b7ea6d14e664
+  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -809,7 +809,7 @@
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten as b7ea6d14e664
+  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
@@ -934,7 +934,7 @@
   | | x  0dec01379d3b
   | |/     Successors: [b7ea6d14e664]
   | |      semi-colon: [b7ea6d14e664]
-  | |      Fate: rewritten as b7ea6d14e664
+  | |      Fate: reworded as b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
@@ -950,7 +950,7 @@
   | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | | x  0dec01379d3b
-  | |/     Obsfate: rewritten as b7ea6d14e664
+  | |/     Obsfate: reworded as b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Obsfate: rewritten as eb5a0daa2192
@@ -962,7 +962,7 @@
   |
   | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   | |
-  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "rewritten"}]
+  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
   | |/
   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   |/
@@ -1010,13 +1010,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1048,7 +1048,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1066,7 +1066,7 @@
   | @  471f378eab4c
   |/     Successors: [7a230b46bf61]
   |      semi-colon: [7a230b46bf61]
-  |      Fate: rewritten as 7a230b46bf61
+  |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
   
@@ -1074,7 +1074,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1097,7 +1097,7 @@
   | x  471f378eab4c
   |/     Successors: [7a230b46bf61]
   |      semi-colon: [7a230b46bf61]
-  |      Fate: rewritten as 7a230b46bf61
+  |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
   
@@ -1105,7 +1105,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1113,7 +1113,7 @@
   $ hg fatelogjson --hidden
   @  7a230b46bf61 ""
   |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "rewritten"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
   |/
   o  ea207398892e ""
   
--- a/tests/test-obsolete.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-obsolete.t	Wed Aug 09 11:32:19 2017 +0200
@@ -760,7 +760,7 @@
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    rewritten as 705ab2a6b72e
+  | | |    obsolete:    amended as 705ab2a6b72e
   | | |    summary:     add f
   | | |
   | | | o  changeset:   12:6db5e282cb91
@@ -792,7 +792,7 @@
   | | |  parent:      3:0d3f46688ccc
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rewritten as 9468a5f5d8b2
+  | | |  obsolete:    rebased as 9468a5f5d8b2
   | | |  summary:     add obsol_d''
   | | |
   | | | x  changeset:   7:909a0fb57e5d
@@ -828,7 +828,7 @@
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    obsolete:    rewritten as 725c380fe99b
-  | |    obsolete:    rewritten as 2033b4e49474
+  | |    obsolete:    rebased as 2033b4e49474
   | |    summary:     add obsol_c
   | |
   x |  changeset:   2:4538525df7e2
--- a/tests/test-stabilize-conflict.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Wed Aug 09 11:32:19 2017 +0200
@@ -152,7 +152,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as e04690b09bc6
+  |    obsolete:    amended as e04690b09bc6
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
@@ -244,7 +244,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as b20d08eea373
+  |    obsolete:    amended as b20d08eea373
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
--- a/tests/test-stabilize-order.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-stabilize-order.t	Wed Aug 09 11:32:19 2017 +0200
@@ -220,7 +220,7 @@
   | x  changeset:   12:2256dae6521f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as f83a0bce03e4
+  |    obsolete:    reworded as f83a0bce03e4
   |    summary:     addc
   |
   o  changeset:   11:7a68bc4596ea
--- a/tests/test-topic-tutorial.t	Tue Aug 29 17:30:07 2017 +0200
+++ b/tests/test-topic-tutorial.t	Wed Aug 09 11:32:19 2017 +0200
@@ -700,7 +700,7 @@
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as b7509bd417f8
+  |    obsolete:    reworded as b7509bd417f8
   |    summary:     Adding hammer
   |
   o  changeset:   12:fbff9bc37a43