This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2761

rebase: use configoverride context manager for ui.forcemerge
ClosedPublic

Authored by martinvonz on Mar 9 2018, 4:09 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG36de8a3c429c: rebase: use configoverride context manager for ui.forcemerge
rHG6b6d7f127ee5: rebase: use configoverride context manager for ui.forcemerge
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 9 2018, 4:09 PM
yuja accepted this revision.Mar 13 2018, 10:48 AM
This revision is now accepted and ready to land.Mar 13 2018, 10:48 AM
Closed by commit rHG6b6d7f127ee5: rebase: use configoverride context manager for ui.forcemerge (authored by martinvonz). · Explain WhyMar 13 2018, 10:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)

Diff 6987

hgext/rebase.py

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