651 hg._showstats(repo, stats) |
651 hg._showstats(repo, stats) |
652 if stats[3]: |
652 if stats[3]: |
653 repo.ui.status(_("use 'hg resolve' to retry unresolved " |
653 repo.ui.status(_("use 'hg resolve' to retry unresolved " |
654 "file merges\n")) |
654 "file merges\n")) |
655 return 1 |
655 return 1 |
656 elif opts.get('no_commit'): |
|
657 msg = _("changeset %s backed out, " |
|
658 "don't forget to commit.\n") |
|
659 ui.status(msg % short(node)) |
|
660 return 0 |
|
661 finally: |
656 finally: |
662 ui.setconfig('ui', 'forcemerge', '', '') |
657 ui.setconfig('ui', 'forcemerge', '', '') |
663 lockmod.release(dsguard) |
658 lockmod.release(dsguard) |
664 else: |
659 else: |
665 hg.clean(repo, node, show_stats=False) |
660 hg.clean(repo, node, show_stats=False) |
666 repo.dirstate.setbranch(branch) |
661 repo.dirstate.setbranch(branch) |
667 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
662 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
668 |
663 |
|
664 if opts.get('no_commit'): |
|
665 msg = _("changeset %s backed out, " |
|
666 "don't forget to commit.\n") |
|
667 ui.status(msg % short(node)) |
|
668 return 0 |
669 |
669 |
670 def commitfunc(ui, repo, message, match, opts): |
670 def commitfunc(ui, repo, message, match, opts): |
671 editform = 'backout' |
671 editform = 'backout' |
672 e = cmdutil.getcommiteditor(editform=editform, **opts) |
672 e = cmdutil.getcommiteditor(editform=editform, **opts) |
673 if not message: |
673 if not message: |