Mercurial > hg-stable
changeset 21412:6f6ccb0bb6af
backout: avoid redundant message examination
Before this patch, "hg backout" examines "--message" and "--logfile"
options explicitly.
But this examination is redundant, because "commitfunc()" can receive
the result of same examination by "cmdutil.logmessage()" in
"cmdutil.commit()" through "message" argument.
This patch avoids redundant message examination by "message"
examination in "commitfunc()".
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 11 May 2014 00:49:35 +0900 |
| parents | afff78be4361 |
| children | edc55317de90 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun May 11 00:49:35 2014 +0900 +++ b/mercurial/commands.py Sun May 11 00:49:35 2014 +0900 @@ -487,13 +487,12 @@ cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) - e = cmdutil.commiteditor - if not opts['message'] and not opts['logfile']: - # we don't translate commit messages - opts['message'] = "Backed out changeset %s" % short(node) - e = cmdutil.commitforceeditor - def commitfunc(ui, repo, message, match, opts): + e = cmdutil.commiteditor + if not message: + # we don't translate commit messages + message = "Backed out changeset %s" % short(node) + e = cmdutil.commitforceeditor return repo.commit(message, opts.get('user'), opts.get('date'), match, editor=e) newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)