Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
22248:75618a223e18 22249:f5ff18f65b73
2131 except KeyError: 2131 except KeyError:
2132 raise IOError 2132 raise IOError
2133 2133
2134 user = opts.get('user') or old.user() 2134 user = opts.get('user') or old.user()
2135 date = opts.get('date') or old.date() 2135 date = opts.get('date') or old.date()
2136 editform = 'commit.amend' 2136 editform = mergeeditform(old, 'commit.amend')
2137 editor = getcommiteditor(editform=editform, **opts) 2137 editor = getcommiteditor(editform=editform, **opts)
2138 if not message: 2138 if not message:
2139 editor = getcommiteditor(edit=True, editform=editform) 2139 editor = getcommiteditor(edit=True, editform=editform)
2140 message = old.description() 2140 message = old.description()
2141 2141