Mercurial > hg
changeset 22010:41e969cb9468
commit: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'normal' and 'amend' are used as ROUTE.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 02 Aug 2014 21:46:27 +0900 |
| parents | 0bbe8ef901d1 |
| children | 97acb4504704 |
| files | mercurial/cmdutil.py mercurial/commands.py |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Aug 02 21:46:27 2014 +0900 +++ b/mercurial/cmdutil.py Sat Aug 02 21:46:27 2014 +0900 @@ -2106,9 +2106,10 @@ user = opts.get('user') or old.user() date = opts.get('date') or old.date() - editor = getcommiteditor(**opts) + editform = 'commit.amend' + editor = getcommiteditor(editform=editform, **opts) if not message: - editor = getcommiteditor(edit=True) + editor = getcommiteditor(edit=True, editform=editform) message = old.description() pureextra = extra.copy()
--- a/mercurial/commands.py Sat Aug 02 21:46:27 2014 +0900 +++ b/mercurial/commands.py Sat Aug 02 21:46:27 2014 +0900 @@ -1449,9 +1449,11 @@ repo.baseui.setconfig('phases', 'new-commit', 'secret', 'commit') + editform = 'commit.normal' + editor = cmdutil.getcommiteditor(editform=editform, **opts) return repo.commit(message, opts.get('user'), opts.get('date'), match, - editor=cmdutil.getcommiteditor(**opts), + editor=editor, extra=extra) finally: ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit')