##// END OF EJS Templates
rebase: move check for unresolved conflicts into lower-level rebasenode()...
Martin von Zweigbergk -
r46122:e9468f14 default
parent child Browse files
Show More
@@ -615,14 +615,9 b' class rebaseruntime(object):'
615 else:
615 else:
616 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
616 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
617 with ui.configoverride(overrides, b'rebase'):
617 with ui.configoverride(overrides, b'rebase'):
618 stats = rebasenode(
618 rebasenode(
619 repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx,
619 repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx,
620 )
620 )
621 if stats.unresolvedcount > 0:
622 if self.inmemory:
623 raise error.InMemoryMergeConflictsError()
624 else:
625 raise error.ConflictResolutionRequired(b'rebase')
626 if not self.collapsef:
621 if not self.collapsef:
627 merging = p2 != nullrev
622 merging = p2 != nullrev
628 editform = cmdutil.mergeeditform(merging, b'rebase')
623 editform = cmdutil.mergeeditform(merging, b'rebase')
@@ -1500,7 +1495,12 b' def rebasenode(repo, rev, p1, p2, base, '
1500 # duplicate copies between the revision we're
1495 # duplicate copies between the revision we're
1501 # rebasing and its first parent.
1496 # rebasing and its first parent.
1502 copies.graftcopies(wctx, ctx, ctx.p1())
1497 copies.graftcopies(wctx, ctx, ctx.p1())
1503 return stats
1498
1499 if stats.unresolvedcount > 0:
1500 if wctx.isinmemory():
1501 raise error.InMemoryMergeConflictsError()
1502 else:
1503 raise error.ConflictResolutionRequired(b'rebase')
1504
1504
1505
1505
1506 def adjustdest(repo, rev, destmap, state, skipped):
1506 def adjustdest(repo, rev, destmap, state, skipped):
General Comments 0
You need to be logged in to leave comments. Login now