465 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
465 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
466 return hg.update(repo, op1) |
466 return hg.update(repo, op1) |
467 finally: |
467 finally: |
468 ui.setconfig('ui', 'forcemerge', '') |
468 ui.setconfig('ui', 'forcemerge', '') |
469 |
469 |
470 commit_opts = opts.copy() |
470 if not opts['message'] and not opts['logfile']: |
471 if not commit_opts['message'] and not commit_opts['logfile']: |
|
472 # we don't translate commit messages |
471 # we don't translate commit messages |
473 commit_opts['message'] = "Backed out changeset %s" % short(node) |
472 opts['message'] = "Backed out changeset %s" % short(node) |
474 commit_opts['force_editor'] = True |
473 opts['force_editor'] = True |
475 commit(ui, repo, **commit_opts) |
474 commit(ui, repo, **opts) |
|
475 |
476 def nice(node): |
476 def nice(node): |
477 return '%d:%s' % (repo.changelog.rev(node), short(node)) |
477 return '%d:%s' % (repo.changelog.rev(node), short(node)) |
478 ui.status(_('changeset %s backs out changeset %s\n') % |
478 ui.status(_('changeset %s backs out changeset %s\n') % |
479 (nice(repo.changelog.tip()), nice(node))) |
479 (nice(repo.changelog.tip()), nice(node))) |
480 if opts.get('merge') and op1 != node: |
480 if opts.get('merge') and op1 != node: |