comparison hgext/rebase.py @ 36930:36de8a3c429c

rebase: use configoverride context manager for ui.forcemerge

Differential Revision: https://phab.mercurial-scm.org/D2761

36929:cc2bfc7d5362

                                             self.obsoletenotrebased)
                self.storestatus(tr=tr)
                if len(repo[None].parents()) == 2:
                    repo.ui.debug('resuming interrupted rebase\n')
                else:
                    try:
                        ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                     'rebase')
                        stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                           dest, wctx=self.wctx)
                        if stats and stats[3] > 0:
                            if self.wctx.isinmemory():
                                raise error.InMemoryMergeConflictsError()
                            else:
                                raise error.InterventionRequired(
                                    _('unresolved conflicts (see hg '
                                      'resolve, then hg rebase --continue)'))
                    finally:
                        ui.setconfig('ui', 'forcemerge', '', 'rebase')
                if not self.collapsef:
                    merging = p2 != nullrev
                    editform = cmdutil.mergeeditform(merging, 'rebase')
                    editor = cmdutil.getcommiteditor(editform=editform,
                                                     **pycompat.strkwargs(opts))

36930:36de8a3c429c

                                             self.obsoletenotrebased)
                self.storestatus(tr=tr)
                if len(repo[None].parents()) == 2:
                    repo.ui.debug('resuming interrupted rebase\n')
                else:
                    overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
                    with ui.configoverride(overrides, 'rebase'):
                        stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                           dest, wctx=self.wctx)
                        if stats and stats[3] > 0:
                            if self.wctx.isinmemory():
                                raise error.InMemoryMergeConflictsError()
                            else:
                                raise error.InterventionRequired(
                                    _('unresolved conflicts (see hg '
                                      'resolve, then hg rebase --continue)'))
                if not self.collapsef:
                    merging = p2 != nullrev
                    editform = cmdutil.mergeeditform(merging, 'rebase')
                    editor = cmdutil.getcommiteditor(editform=editform,
                                                     **pycompat.strkwargs(opts))