equal
deleted
inserted
replaced
860 def nice(node): |
860 def nice(node): |
861 return b'%d:%s' % (repo.changelog.rev(node), short(node)) |
861 return b'%d:%s' % (repo.changelog.rev(node), short(node)) |
862 |
862 |
863 ui.status( |
863 ui.status( |
864 _(b'changeset %s backs out changeset %s\n') |
864 _(b'changeset %s backs out changeset %s\n') |
865 % (nice(repo.changelog.tip()), nice(node)) |
865 % (nice(newnode), nice(node)) |
866 ) |
866 ) |
867 if opts.get(b'merge') and op1 != node: |
867 if opts.get(b'merge') and op1 != node: |
868 hg.clean(repo, op1, show_stats=False) |
868 hg.clean(repo, op1, show_stats=False) |
869 ui.status( |
869 ui.status(_(b'merging with changeset %s\n') % nice(newnode)) |
870 _(b'merging with changeset %s\n') % nice(repo.changelog.tip()) |
|
871 ) |
|
872 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
870 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
873 with ui.configoverride(overrides, b'backout'): |
871 with ui.configoverride(overrides, b'backout'): |
874 return hg.merge(repo[b'tip']) |
872 return hg.merge(repo[b'tip']) |
875 return 0 |
873 return 0 |
876 |
874 |