diff -r e6e34c17b1cc -r a1a1bd09e4f4 mercurial/commands.py --- a/mercurial/commands.py Wed Apr 16 02:04:41 2014 +0900 +++ b/mercurial/commands.py Wed Apr 16 02:38:11 2014 +0900 @@ -1403,23 +1403,12 @@ if (not obsolete._enabled) and old.children(): raise util.Abort(_('cannot amend changeset with children')) - e = cmdutil.commiteditor - if forceeditor: - e = cmdutil.commitforceeditor - # commitfunc is used only for temporary amend commit by cmdutil.amend def commitfunc(ui, repo, message, match, opts): - editor = e - # message contains text from -m or -l, if it's empty, - # open the editor with the old message - if not message: - message = old.description() - editor = cmdutil.commitforceeditor return repo.commit(message, opts.get('user') or old.user(), opts.get('date') or old.date(), match, - editor=editor, extra=extra) current = repo._bookmarkcurrent