Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 22249:f5ff18f65b73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: change "editform" to distinguish merge commits from other (--amend) "editform" argument for "getcommiteditor" is decided according to the format below: COMMAND[.ROUTE] - COMMAND: name of command - ROUTE: name of route, if there are two or more routes in COMMAND This patch uses "amend.normal" and "amend.merge" as ROUTE of "editform" instead of "amend", to distinguish merge commits from other in "hg commit --amend" case.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 16 Aug 2014 10:43:59 +0900
parents 75618a223e18
children f3200bf460a8
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sat Aug 16 10:43:59 2014 +0900
+++ b/mercurial/cmdutil.py	Sat Aug 16 10:43:59 2014 +0900
@@ -2133,7 +2133,7 @@
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
-            editform = 'commit.amend'
+            editform = mergeeditform(old, 'commit.amend')
             editor = getcommiteditor(editform=editform, **opts)
             if not message:
                 editor = getcommiteditor(edit=True, editform=editform)