Show More
@@ -487,13 +487,12 b' def backout(ui, repo, node=None, rev=Non' | |||||
487 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
487 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
488 |
|
488 | |||
489 |
|
489 | |||
490 | e = cmdutil.commiteditor |
|
|||
491 | if not opts['message'] and not opts['logfile']: |
|
|||
492 | # we don't translate commit messages |
|
|||
493 | opts['message'] = "Backed out changeset %s" % short(node) |
|
|||
494 | e = cmdutil.commitforceeditor |
|
|||
495 |
|
||||
496 | def commitfunc(ui, repo, message, match, opts): |
|
490 | def commitfunc(ui, repo, message, match, opts): | |
|
491 | e = cmdutil.commiteditor | |||
|
492 | if not message: | |||
|
493 | # we don't translate commit messages | |||
|
494 | message = "Backed out changeset %s" % short(node) | |||
|
495 | e = cmdutil.commitforceeditor | |||
497 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
496 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
498 | match, editor=e) |
|
497 | match, editor=e) | |
499 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
498 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
General Comments 0
You need to be logged in to leave comments.
Login now