Mercurial > hg > evolve

changeset 3202:f06c86fd2ffd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: do to check to topic while amending Right know the 'topic-mode' mess with amend. Especially in case of amending merge where the merge is not properly detected.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 21:29:14 +0200
parents c458c0856ee5
children 87b83a3e0392 9db99aee4b87
files hgext3rd/topic/__init__.py tests/test-topic-mode.t
diffstat 2 files changed, 23 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py
+++ b/hgext3rd/topic/__init__.py
@@ -1004,6 +1004,8 @@
             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)
--- a/tests/test-topic-mode.t
+++ b/tests/test-topic-mode.t
@@ -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)
 
 (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)
+  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