Mercurial > evolve

changeset 3122:c80ba40d4c87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable back into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 23:03:11 +0200
parents 504f914efd29 (current diff) 663dbef40f97 (diff)
children 8a390749ff67
files
diffstat 16 files changed, 132 insertions(+), 95 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Fri Oct 20 15:13:28 2017 +0200
+++ b/CHANGELOG	Fri Oct 20 23:03:11 2017 +0200
@@ -4,17 +4,15 @@
 6.8.0 -- in progress
 ----------------
 
+  * compatibility with Mercurial 4.4
+    (use upstream implementation for obsfate and effect-flags starting hg 4.4+)
+  * pager: pager support to `obslog` and `evolve --list`
+
 topic(0.4.0)
 
   * topic: fix handling of bookmarks and phases while changing topics.
-
-6.7.2 -- in progress
-----------------
-
-  * pager: pager support to `obslog` and `evolve --list`
-
-topic(0.3.2)
-
+           (mercurial 4.2 and above only)
+  * topic: fix 'topic-mode' behavior when amending
   * pager: pager support to `topics` and `stack`
 
 6.7.1 -- 2017-10-10
--- a/hgext3rd/evolve/__init__.py	Fri Oct 20 15:13:28 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Oct 20 23:03:11 2017 +0200
@@ -382,7 +382,8 @@
 eh.configitem('experimental', 'prunestrip')
 
 # hack around because we need an actual default there
-configtable['experimental']['evolution.allnewcommands'].default = None
+if configtable:
+    configtable['experimental']['evolution.allnewcommands'].default = None
 
 # pre hg 4.0 compat
 
--- a/hgext3rd/evolve/obshistory.py	Fri Oct 20 15:13:28 2017 +0200
+++ b/hgext3rd/evolve/obshistory.py	Fri Oct 20 23:03:11 2017 +0200
@@ -17,12 +17,17 @@
     mdiff,
     patch,
     obsolete,
-    obsutil,
     node as nodemod,
     scmutil,
     util,
 )
 
+try:
+    from mercurial import obsutil
+    obsutil.marker
+except ImportError:
+    obsutil = None
+
 from mercurial.i18n import _
 
 from . import (
@@ -810,13 +815,6 @@
             # Replace the old one
             obsutil.successorsetverb = old
 
-# XXX temporary disable operation to clarify tests changes
-if util.safehasattr(obsutil, 'markersoperations'):
-
-    @eh.wrapfunction(obsutil, 'markersoperations')
-    def markersoperations(orig, *args, **kwargs):
-        return []
-
 FORMATSSETSFUNCTIONS = [
     _successorsetdates,
     _successorsetusers,
--- a/hgext3rd/topic/__init__.py	Fri Oct 20 15:13:28 2017 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Oct 20 23:03:11 2017 +0200
@@ -769,8 +769,11 @@
 
         # phase handling
         commitphase = c.phase()
-        overrides = {('phases', 'new-commit'): commitphase}
-        with repo.ui.configoverride(overrides, 'changetopic'):
+        if util.safehasattr(repo.ui, 'configoverride'):
+            overrides = {('phases', 'new-commit'): commitphase}
+            with repo.ui.configoverride(overrides, 'changetopic'):
+                newnode = repo.commitctx(mc)
+        else: # do not attempt to preserver phase (hg <= 4.0)
             newnode = repo.commitctx(mc)
 
         successors[c.node()] = (newnode,)
@@ -778,7 +781,9 @@
         rewrote += 1
 
     # create obsmarkers and move bookmarks
-    scmutil.cleanupnodes(repo, successors, 'changetopics')
+    # XXX we should be creating marker as we go instead of only at the end,
+    # this makes the operations more modulars
+    compat.cleanupnodes(repo, successors, 'changetopics')
 
     # move the working copy too
     wctx = repo[None]
@@ -999,13 +1004,15 @@
             t = opts['topic']
             with repo.vfs.open('topic', 'w') as f:
                 f.write(t)
+        elif opts.get('amend'):
+            pass
         elif notopic and mayabort:
             msg = _("no active topic")
             raise error.Abort(msg, hint=hint)
         elif notopic and maywarn:
             ui.warn(_("warning: new draft commit without topic\n"))
             if not ui.quiet:
-                ui.warn(("(%s)") % hint)
+                ui.warn(("(%s)\n") % hint)
         elif notopic and mayrandom:
             with repo.vfs.open('topic', 'w') as f:
                 f.write(randomname.randomtopicname(ui))
--- a/hgext3rd/topic/compat.py	Fri Oct 20 15:13:28 2017 +0200
+++ b/hgext3rd/topic/compat.py	Fri Oct 20 23:03:11 2017 +0200
@@ -7,7 +7,11 @@
 """
 from __future__ import absolute_import
 
-from mercurial import obsolete
+from mercurial import (
+    obsolete,
+    scmutil,
+    util,
+)
 
 getmarkers = None
 successorssets = None
@@ -29,3 +33,15 @@
         ui.pager(cmd)
     except AttributeError:
         pass
+
+def cleanupnodes(repo, replacements, operation, moves=None):
+    # create obsmarkers and move bookmarks
+    # XXX we should be creating marker as we go instead of only at the end,
+    # this makes the operations more modulars
+    if util.safehasattr(scmutil, 'cleanupnodes'):
+        scmutil.cleanupnodes(repo, replacements, 'changetopics',
+                             moves=moves)
+    else:
+        relations = [(repo[o], tuple(repo[n] for n in new))
+                     for (o, new) in replacements.iteritems()]
+        obsolete.createmarkers(repo, relations)
--- a/tests/test-drop.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-drop.t	Fri Oct 20 23:03:11 2017 +0200
@@ -206,7 +206,7 @@
   | x  changeset:   2:34b6c051bf1f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as 3:a2c06c884bfe
+  |    obsolete:    amended using amend as 3:a2c06c884bfe
   |    summary:     add child
   |
   o  changeset:   1:19509a42b0d0
--- a/tests/test-evolve-effectflags.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-evolve-effectflags.t	Fri Oct 20 23:03:11 2017 +0200
@@ -40,7 +40,7 @@
   changeset:   1:471f378eab4c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reworded as 2:fdf9bde5129a
+  obsolete:    reworded using amend as 2:fdf9bde5129a
   summary:     A0
   
 
@@ -64,7 +64,7 @@
   changeset:   3:ef4a313b1e0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reauthored as 4:5485c92d3433
+  obsolete:    reauthored using amend as 4:5485c92d3433
   summary:     B0
   
 
@@ -88,7 +88,7 @@
   changeset:   5:2ef0680ff450
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    date-changed as 6:4dd84345082e
+  obsolete:    date-changed using amend as 6:4dd84345082e
   summary:     B1
   
 
@@ -115,7 +115,7 @@
   changeset:   7:bd3db8264cee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    branch-changed as 8:14a01456e057
+  obsolete:    branch-changed using amend as 8:14a01456e057
   summary:     B2
   
 
@@ -144,7 +144,7 @@
   changeset:   10:c85eff83a034
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased as 11:da86aa2f19a3
+  obsolete:    rebased using rebase as 11:da86aa2f19a3
   summary:     D0
   
 
@@ -169,7 +169,7 @@
   changeset:   12:ebfe0333e0d9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    amended as 13:75781fdbdbf5
+  obsolete:    amended using amend as 13:75781fdbdbf5
   summary:     E0
   
 
@@ -195,7 +195,7 @@
   changeset:   14:fad47e5bd78e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rewritten as 15:a94e0fd5f1c8
+  obsolete:    rewritten using amend as 15:a94e0fd5f1c8
   summary:     F0
   
 
@@ -251,7 +251,7 @@
   branch:      my-other-branch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased as 19:e509e2eb3df5
+  obsolete:    rebased using rebase as 19:e509e2eb3df5
   summary:     H1
   
 amend closing the branch should be detected as meta change
@@ -276,6 +276,6 @@
   branch:      closedbranch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    meta-changed as 22:12c6238b5e37
+  obsolete:    meta-changed using amend as 22:12c6238b5e37
   summary:     I0
   
--- a/tests/test-evolve-obshistory.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Fri Oct 20 23:03:11 2017 +0200
@@ -41,7 +41,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 2:4ae3a4151de9
+  |    obsolete:    rewritten using amend as 2:4ae3a4151de9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -996,7 +996,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1029,8 +1029,8 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
-  |    obsolete:    reworded as 3:65b757b745b9
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1312,7 +1312,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:b7ea6d14e664
+  |    obsolete:    reworded using amend as 3:b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -1346,7 +1346,7 @@
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded as 3:b7ea6d14e664
+  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
@@ -1576,13 +1576,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:7a230b46bf61
+  |    obsolete:    reworded using amend as 3:7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
--- a/tests/test-evolve-templates.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 23:03:11 2017 +0200
@@ -47,13 +47,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:d004c8f274b9 by test2
+  |    obsolete:    reworded using amend as 3:d004c8f274b9 by test2
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 2:a468dc9b3633
+  |    obsolete:    rewritten using amend as 2:a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -85,7 +85,7 @@
   | @  471f378eab4c
   |/     Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: rewritten as 3:d004c8f274b9 by test, test2
+  |      Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
@@ -101,7 +101,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 3:d004c8f274b9 by test, test2
+  |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -114,7 +114,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9
   |
   o  ea207398892e
   
@@ -123,7 +123,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9 by test, test2
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
@@ -131,7 +131,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -167,7 +167,7 @@
   | @  a468dc9b3633
   |/     Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   o  ea207398892e
   
@@ -182,12 +182,12 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   | x  471f378eab4c
   |/     Successors: 2:a468dc9b3633
   |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten as 2:a468dc9b3633
+  |      Fate: rewritten using amend as 2:a468dc9b3633
   |
   o  ea207398892e
   
@@ -195,7 +195,7 @@
   o  d004c8f274b9
   |
   | @  a468dc9b3633
-  |/     Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   o  ea207398892e
   
@@ -215,12 +215,12 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   | x  471f378eab4c
   |/     Successors: 2:a468dc9b3633
   |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten as 2:a468dc9b3633
+  |      Fate: rewritten using amend as 2:a468dc9b3633
   |
   o  ea207398892e
   
@@ -234,10 +234,10 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -609,7 +609,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -642,8 +642,8 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
-  |    obsolete:    reworded as 3:65b757b745b9
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -672,8 +672,8 @@
   | @  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
   |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
-  |      Fate: reworded as 2:fdf9bde5129a
-  |      Fate: reworded as 4:019fadeab383
+  |      Fate: reworded using amend as 2:fdf9bde5129a
+  |      Fate: reworded using amend as 4:019fadeab383
   |
   o  ea207398892e
   
@@ -683,7 +683,7 @@
   | o  fdf9bde5129a
   |/
   | @  471f378eab4c
-  |/     Obsfate: reworded as 2:fdf9bde5129a; reworded as 4:019fadeab383
+  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
   |
   o  ea207398892e
   
@@ -717,7 +717,7 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 4:019fadeab383
   |      semi-colon: 4:019fadeab383
-  |      Fate: reworded as 4:019fadeab383
+  |      Fate: reworded using amend as 4:019fadeab383
   |
   | @  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
@@ -725,8 +725,8 @@
   | x  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
   |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
-  |      Fate: reworded as 2:fdf9bde5129a
-  |      Fate: reworded as 3:65b757b745b9
+  |      Fate: reworded using amend as 2:fdf9bde5129a
+  |      Fate: reworded using amend as 3:65b757b745b9
   |
   o  ea207398892e
   
@@ -734,12 +734,12 @@
   o  019fadeab383
   |
   | x  65b757b745b9
-  |/     Obsfate: reworded as 4:019fadeab383
+  |/     Obsfate: reworded using amend as 4:019fadeab383
   |
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
-  |/     Obsfate: reworded as 2:fdf9bde5129a; reworded as 3:65b757b745b9
+  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
   |
   o  ea207398892e
   
@@ -779,7 +779,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:b7ea6d14e664
+  |    obsolete:    reworded using amend as 3:b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -813,7 +813,7 @@
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded as 3:b7ea6d14e664
+  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
@@ -864,7 +864,7 @@
   | @  0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten as 4:eb5a0daa2192
+  | |    Fate: rewritten using amend as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
@@ -877,7 +877,7 @@
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
-  | |    Obsfate: rewritten as 4:eb5a0daa2192
+  | |    Obsfate: rewritten using amend as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
@@ -938,7 +938,7 @@
   | | x  0dec01379d3b
   | |/     Successors: 3:b7ea6d14e664
   | |      semi-colon: 3:b7ea6d14e664
-  | |      Fate: reworded as 3:b7ea6d14e664
+  | |      Fate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
@@ -954,7 +954,7 @@
   | |    Obsfate: rewritten as 4:eb5a0daa2192
   | |
   | | x  0dec01379d3b
-  | |/     Obsfate: reworded as 3:b7ea6d14e664
+  | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
@@ -1014,13 +1014,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:7a230b46bf61
+  |    obsolete:    reworded using amend as 3:7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1053,7 +1053,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:7a230b46bf61
+  |    obsolete:    reworded using amend as 2:7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1071,7 +1071,7 @@
   | @  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded as 2:7a230b46bf61
+  |      Fate: reworded using amend as 2:7a230b46bf61
   |
   o  ea207398892e
   
@@ -1079,7 +1079,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1102,7 +1102,7 @@
   | x  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded as 2:7a230b46bf61
+  |      Fate: reworded using amend as 2:7a230b46bf61
   |
   o  ea207398892e
   
@@ -1110,7 +1110,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
--- a/tests/test-obsolete.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-obsolete.t	Fri Oct 20 23:03:11 2017 +0200
@@ -756,7 +756,7 @@
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    amended as 14:705ab2a6b72e
+  | | |    obsolete:    amended using amend as 14:705ab2a6b72e
   | | |    summary:     add f
   | | |
   | | | o  changeset:   12:6db5e282cb91
@@ -788,7 +788,7 @@
   | | |  parent:      3:0d3f46688ccc
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rebased as 11:9468a5f5d8b2
+  | | |  obsolete:    rebased using rebase as 11:9468a5f5d8b2
   | | |  summary:     add obsol_d''
   | | |
   | | | x  changeset:   7:909a0fb57e5d
@@ -824,7 +824,7 @@
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    obsolete:    rewritten as 4:725c380fe99b
-  | |    obsolete:    rebased as 10:2033b4e49474
+  | |    obsolete:    rebased using rebase as 10:2033b4e49474
   | |    summary:     add obsol_c
   | |
   x |  changeset:   2:4538525df7e2
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 23:03:11 2017 +0200
@@ -152,7 +152,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as 5:e04690b09bc6
+  |    obsolete:    amended using amend as 5: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:    amended as 7:b20d08eea373
+  |    obsolete:    amended using amend as 7:b20d08eea373
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
--- a/tests/test-stabilize-order.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Oct 20 23:03:11 2017 +0200
@@ -220,7 +220,7 @@
   | x  changeset:   9:2256dae6521f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 12:f83a0bce03e4
+  |    obsolete:    reworded using amend as 12:f83a0bce03e4
   |    summary:     addc
   |
   o  changeset:   8:7a68bc4596ea
--- a/tests/test-topic-mode.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-topic-mode.t	Fri Oct 20 23:03:11 2017 +0200
@@ -50,15 +50,32 @@
   > EOF
   $ touch a b c d
   $ hg add a
-  $ hg ci -m "Added a"
-  warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
 
 (same test, checking we abort before the editor)
 
-  $ EDITOR=cat hg ci --amend -m "Added a" --edit
+  $ HGEDITOR=cat hg ci -m "Added a" --edit
   warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
+  (see 'hg help -e topic.topic-mode' for details)
+  Added a
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added a
+
+  $ HGEDITOR=cat hg ci --amend -m "Added a" --edit
+  Added a
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added a
   $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore
   $ hg log
   changeset:   2:2e862d8b5eff
@@ -103,7 +120,7 @@
   (branch merge, don't forget to commit)
   $ hg commit -m "merge mytopic"
   warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
+  (see 'hg help -e topic.topic-mode' for details)
 
   $ hg log -G
   @    changeset:   3:676a445d1c09
--- a/tests/test-topic-push.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-topic-push.t	Fri Oct 20 23:03:11 2017 +0200
@@ -212,8 +212,8 @@
   |/
   o  0 default  public CA
   
-  $ hg strip --config extensions.strip= --no-backup -r 5: --quiet
-  $ hg strip --config extensions.strip= -R $TESTTMP/draft --no-backup -r 4: --quiet
+  $ hg strip --config extensions.strip= --no-backup -r 7a9e34dbf547: --quiet
+  $ hg strip --config extensions.strip= -R $TESTTMP/draft --no-backup -r 7a9e34dbf547: --quiet
 
 Pushing a new topic to a publishing server should be seen as a new head
 
--- a/tests/test-topic-tutorial.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-topic-tutorial.t	Fri Oct 20 23:03:11 2017 +0200
@@ -1227,7 +1227,7 @@
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 18:b7509bd417f8
+  |    obsolete:    reworded using amend as 18:b7509bd417f8
   |    summary:     Adding hammer
   |
   o  changeset:   12:fbff9bc37a43
--- a/tests/test-uncommit-interactive.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-uncommit-interactive.t	Fri Oct 20 23:03:11 2017 +0200
@@ -525,7 +525,7 @@
   |
   o  0:7733902a8d94@default(draft) The base commit
   
-  $ hg up 6
+  $ hg up 905eb2a23ea2
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ touch bar