3682 for node in nodes: |
3682 for node in nodes: |
3683 displayer.show(repo[node]) |
3683 displayer.show(repo[node]) |
3684 displayer.close() |
3684 displayer.close() |
3685 return 0 |
3685 return 0 |
3686 |
3686 |
3687 try: |
3687 # ui.forcemerge is an internal variable, do not document |
3688 # ui.forcemerge is an internal variable, do not document |
3688 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
3689 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
3689 with ui.configoverride(overrides, 'merge'): |
3690 force = opts.get('force') |
3690 force = opts.get('force') |
3691 labels = ['working copy', 'merge rev'] |
3691 labels = ['working copy', 'merge rev'] |
3692 return hg.merge(repo, node, force=force, mergeforce=force, |
3692 return hg.merge(repo, node, force=force, mergeforce=force, |
3693 labels=labels, abort=abort) |
3693 labels=labels, abort=abort) |
3694 finally: |
|
3695 ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
3696 |
3694 |
3697 @command('outgoing|out', |
3695 @command('outgoing|out', |
3698 [('f', 'force', None, _('run even when the destination is unrelated')), |
3696 [('f', 'force', None, _('run even when the destination is unrelated')), |
3699 ('r', 'rev', [], |
3697 ('r', 'rev', [], |
3700 _('a changeset intended to be included in the destination'), _('REV')), |
3698 _('a changeset intended to be included in the destination'), _('REV')), |