Mercurial > hg
changeset 21414:37a302f0e297
commit: use "getcommiteditor()" instead of explicit editor choice
This patch also eliminates "forceeditor" no more referred.
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested well.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 11 May 2014 00:49:36 +0900 |
| parents | edc55317de90 |
| children | 0b5d6c062774 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun May 11 00:49:36 2014 +0900 +++ b/mercurial/commands.py Sun May 11 00:49:36 2014 +0900 @@ -1345,8 +1345,6 @@ Returns 0 on success, 1 if nothing changed. """ - forceeditor = opts.get('edit') - if opts.get('subrepos'): if opts.get('amend'): raise util.Abort(_('cannot amend with --subrepos')) @@ -1408,10 +1406,6 @@ bookmarks.setcurrent(repo, bm) newmarks.write() else: - e = cmdutil.commiteditor - if forceeditor: - e = cmdutil.commitforceeditor - def commitfunc(ui, repo, message, match, opts): try: if opts.get('secret'): @@ -1421,7 +1415,9 @@ 'commit') return repo.commit(message, opts.get('user'), opts.get('date'), - match, editor=e, extra=extra) + match, + editor=cmdutil.getcommiteditor(**opts), + extra=extra) finally: ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') repo.baseui.setconfig('phases', 'new-commit', oldcommitphase,