Mercurial > hg
comparison mercurial/commands.py @ 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 | 0aa2cb965f4c |
comparison
equal
deleted
inserted
replaced
22009:0bbe8ef901d1 | 22010:41e969cb9468 |
---|---|
1447 ui.setconfig('phases', 'new-commit', 'secret', 'commit') | 1447 ui.setconfig('phases', 'new-commit', 'secret', 'commit') |
1448 # Propagate to subrepos | 1448 # Propagate to subrepos |
1449 repo.baseui.setconfig('phases', 'new-commit', 'secret', | 1449 repo.baseui.setconfig('phases', 'new-commit', 'secret', |
1450 'commit') | 1450 'commit') |
1451 | 1451 |
1452 editform = 'commit.normal' | |
1453 editor = cmdutil.getcommiteditor(editform=editform, **opts) | |
1452 return repo.commit(message, opts.get('user'), opts.get('date'), | 1454 return repo.commit(message, opts.get('user'), opts.get('date'), |
1453 match, | 1455 match, |
1454 editor=cmdutil.getcommiteditor(**opts), | 1456 editor=editor, |
1455 extra=extra) | 1457 extra=extra) |
1456 finally: | 1458 finally: |
1457 ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') | 1459 ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') |
1458 repo.baseui.setconfig('phases', 'new-commit', oldcommitphase, | 1460 repo.baseui.setconfig('phases', 'new-commit', oldcommitphase, |
1459 'commit') | 1461 'commit') |