Mercurial > hg
changeset 18687:1d183b33f007
backout: remove unnecessary dict copy
This is step 1 to remove backout's call to commands.commit. We don't use
the options again anywhere below except for backout's own purposes,
specifically choosing a merge tool, so we just write the commit options
in directly.
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Tue, 12 Feb 2013 16:05:00 +0000 |
| parents | 0bca4d31f647 |
| children | 79107fad06aa |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Feb 12 15:47:30 2013 +0000 +++ b/mercurial/commands.py Tue Feb 12 16:05:00 2013 +0000 @@ -467,12 +467,12 @@ finally: ui.setconfig('ui', 'forcemerge', '') - commit_opts = opts.copy() - if not commit_opts['message'] and not commit_opts['logfile']: + if not opts['message'] and not opts['logfile']: # we don't translate commit messages - commit_opts['message'] = "Backed out changeset %s" % short(node) - commit_opts['force_editor'] = True - commit(ui, repo, **commit_opts) + opts['message'] = "Backed out changeset %s" % short(node) + opts['force_editor'] = True + commit(ui, repo, **opts) + def nice(node): return '%d:%s' % (repo.changelog.rev(node), short(node)) ui.status(_('changeset %s backs out changeset %s\n') %