This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1234

rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG306a8604741f: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
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

phillco updated this revision to Diff 4044.Dec 1 2017, 3:09 AM
phillco updated this revision to Diff 4180.Dec 7 2017, 4:22 PM
durin42 accepted this revision.Dec 7 2017, 4:33 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:33 PM
phillco updated this revision to Diff 4199.Dec 7 2017, 4:44 PM
Closed by commit rHG306a8604741f: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts (authored by phillco). · Explain WhyDec 7 2017, 5:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (9 lines)

Diff 4222

hgext/rebase.py

repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
try: try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'rebase') 'rebase')
stats = rebasenode(repo, rev, p1, base, self.state, stats = rebasenode(repo, rev, p1, base, self.state,
self.collapsef, dest) self.collapsef, dest)
if stats and stats[3] > 0: if stats and stats[3] > 0:
if self.wctx.isinmemory():
raise error.InMemoryMergeConflictsError()
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: finally:
ui.setconfig('ui', 'forcemerge', '', 'rebase') 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, **opts) editor = cmdutil.getcommiteditor(editform=editform, **opts)
newnode = concludenode(repo, rev, p1, p2, newnode = concludenode(repo, rev, p1, p2,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),