( )⚙ D9075 rebase: move check for unresolved conflicts into lower-level rebasenode()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9075

rebase: move check for unresolved conflicts into lower-level rebasenode()
ClosedPublic

Authored by martinvonz on Sep 23 2020, 1:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe9468f14379a: rebase: move check for unresolved conflicts into lower-level rebasenode()
Summary

I want to add another call to rebasenode() and it's better to not
have to duplicate the check.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (14 lines)

Diff 22823

hgext/rebase.py

self.obsoletenotrebased, self.obsoletenotrebased,
) )
if self.resume and self.wctx.p1().rev() == p1: if self.resume and self.wctx.p1().rev() == p1:
repo.ui.debug(b'resuming interrupted rebase\n') repo.ui.debug(b'resuming interrupted rebase\n')
self.resume = False self.resume = False
else: else:
overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
with ui.configoverride(overrides, b'rebase'): with ui.configoverride(overrides, b'rebase'):
stats = rebasenode( rebasenode(
repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx, repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx,
) )
if stats.unresolvedcount > 0:
if self.inmemory:
raise error.InMemoryMergeConflictsError()
else:
raise error.ConflictResolutionRequired(b'rebase')
if not self.collapsef: if not self.collapsef:
merging = p2 != nullrev merging = p2 != nullrev
editform = cmdutil.mergeeditform(merging, b'rebase') editform = cmdutil.mergeeditform(merging, b'rebase')
editor = cmdutil.getcommiteditor( editor = cmdutil.getcommiteditor(
editform=editform, **pycompat.strkwargs(opts) editform=editform, **pycompat.strkwargs(opts)
) )
# We need to set parents again here just in case we're continuing # We need to set parents again here just in case we're continuing
# a rebase started with an old hg version (before 9c9cfecd4600), # a rebase started with an old hg version (before 9c9cfecd4600),
wctx.setparents(p1ctx.node(), repo[p2].node()) wctx.setparents(p1ctx.node(), repo[p2].node())
if collapse: if collapse:
copies.graftcopies(wctx, ctx, p1ctx) copies.graftcopies(wctx, ctx, p1ctx)
else: else:
# If we're not using --collapse, we need to # If we're not using --collapse, we need to
# duplicate copies between the revision we're # duplicate copies between the revision we're
# rebasing and its first parent. # rebasing and its first parent.
copies.graftcopies(wctx, ctx, ctx.p1()) copies.graftcopies(wctx, ctx, ctx.p1())
return stats
if stats.unresolvedcount > 0:
if wctx.isinmemory():
raise error.InMemoryMergeConflictsError()
else:
raise error.ConflictResolutionRequired(b'rebase')
def adjustdest(repo, rev, destmap, state, skipped): def adjustdest(repo, rev, destmap, state, skipped):
r"""adjust rebase destination given the current rebase state r"""adjust rebase destination given the current rebase state
rev is what is being rebased. Return a list of two revs, which are the rev is what is being rebased. Return a list of two revs, which are the
adjusted destinations for rev's p1 and p2, respectively. If a parent is adjusted destinations for rev's p1 and p2, respectively. If a parent is
nullrev, return dest without adjustment for it. nullrev, return dest without adjustment for it.