Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: use "getcommiteditor()" instead of explicit editor choice
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sun, 11 May 2014 00:49:36 +0900
changeset 21415 0b5d6c062774
parent 21414 37a302f0e297
child 21416 3e717c9376fc
amend: use "getcommiteditor()" instead of explicit editor choice This patch doesn't change any tests like as preceding patches, because editor invocation is already tested in "test-commit-amend.t".
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Sun May 11 00:49:36 2014 +0900
+++ b/mercurial/cmdutil.py	Sun May 11 00:49:36 2014 +0900
@@ -2051,12 +2051,10 @@
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
-            editor = commiteditor
+            editor = getcommiteditor(**opts)
             if not message:
-                editor = commitforceeditor
+                editor = getcommiteditor(edit=True)
                 message = old.description()
-            elif opts.get('edit'):
-                editor = commitforceeditor
 
             pureextra = extra.copy()
             extra['amend_source'] = old.hex()
mercurial