Mercurial: comparison hgext/rebase.py

equal deleted inserted replaced

-:3805f4b0f5a9
+:cf3495dfd7ed
 for rev in sortedstate:
 pos += 1
 if state[rev] == -1:
 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
 _('changesets'), total)
-p1, p2 = defineparents(repo, rev, target, state,
+p1, p2, base = defineparents(repo, rev, target, state,
 targetancestors)
 storestatus(repo, originalwd, target, state, collapsef, keepf,
 keepbranchesf, external, activebookmark)
 if len(repo.parents()) == 2:
 repo.ui.debug('resuming interrupted rebase\n')
 else:
 try:
 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
 'rebase')
-stats = rebasenode(repo, rev, p1, state, collapsef,
+stats = rebasenode(repo, rev, p1, base, state,
-target)
+collapsef, target)
 if stats and stats[3] > 0:
 raise error.InterventionRequired(
 _('unresolved conflicts (see hg '
 'resolve, then hg rebase --continue)'))
 finally:
 ui.progress(_('rebasing'), None)
 ui.note(_('rebase merging completed\n'))
 if collapsef and not keepopen:
-p1, p2 = defineparents(repo, min(state), target,
+p1, p2, _base = defineparents(repo, min(state), target,
 state, targetancestors)
 editopt = opts.get('edit')
 editform = 'rebase.collapse'
 if collapsemsg:
 commitmsg = collapsemsg
 else:
 'than one external parent: %s') %
 (max(targetancestors),
 ', '.join(str(p) for p in sorted(parents))))
 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None):
-'''Commit the changes and store useful information in extra.
+'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
+but also store useful information in extra.
 Return node of committed revision.'''
 try:
 repo.dirstate.beginparentchange()
 repo.setparents(repo[p1].node(), repo[p2].node())
 repo.dirstate.endparentchange()
 except util.Abort:
 # Invalidate the previous setparents
 repo.dirstate.invalidate()
 raise
-def rebasenode(repo, rev, p1, state, collapse, target):
+def rebasenode(repo, rev, p1, base, state, collapse, target):
-'Rebase a single revision'
+'Rebase a single revision rev on top of p1 using base as merge ancestor'
 # Merge phase
 # Update to target and merge it with local
 if repo['.'].rev() != p1:
 repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
 merge.update(repo, p1, False, True, False)
 else:
 repo.ui.debug(" already in target\n")
 repo.dirstate.write()
 repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
-if rev == min(state):
-# Case (1) initial changeset of a non-detaching rebase.
-# Let the merge mechanism find the base itself.
-base = None
-elif not repo[rev].p2():
-# Case (2) detaching the node with a single parent, use this parent
-base = repo[rev].p1().rev()
-else:
-# In case of merge, we need to pick the right parent as merge base.
-#
-# Imagine we have:
-# - M: currently rebase revision in this step
-# - A: one parent of M
-# - B: second parent of M
-# - D: destination of this merge step (p1 var)
-#
-# If we are rebasing on D, D is the successors of A or B. The right
-# merge base is the one D succeed to. We pretend it is B for the rest
-# of this comment
-#
-# If we pick B as the base, the merge involves:
-# - changes from B to M (actual changeset payload)
-# - changes from B to D (induced by rebase) as D is a rebased
-#   version of B)
-# Which exactly represent the rebase operation.
-#
-# If we pick the A as the base, the merge involves
-# - changes from A to M (actual changeset payload)
-# - changes from A to D (with include changes between unrelated A and B
-#   plus changes induced by rebase)
-# Which does not represent anything sensible and creates a lot of
-# conflicts.
-for p in repo[rev].parents():
-if state.get(p.rev()) == p1:
-base = p.rev()
-break
-else: # fallback when base not found
-base = None
-# Raise because this function is called wrong (see issue 4106)
-raise AssertionError('no base found to rebase on '
-'(rebasenode called wrong)')
 if base is not None:
 repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
 # When collapsing in-place, the parent is the common ancestor, we
 # have to allow merging with it.
 stats = merge.update(repo, rev, True, True, False, base, collapse,
 raise util.Abort(_('cannot use revision %d as base, result '
 'would have 3 parents') % rev)
 p2 = p2n
 repo.ui.debug(" future parents are %d and %d\n" %
 (repo[p1].rev(), repo[p2].rev()))
-return p1, p2
+if rev == min(state):
+# Case (1) initial changeset of a non-detaching rebase.
+# Let the merge mechanism find the base itself.
+base = None
+elif not repo[rev].p2():
+# Case (2) detaching the node with a single parent, use this parent
+base = repo[rev].p1().rev()
+else:
+# In case of merge, we need to pick the right parent as merge base.
+#
+# Imagine we have:
+# - M: currently rebase revision in this step
+# - A: one parent of M
+# - B: second parent of M
+# - D: destination of this merge step (p1 var)
+#
+# If we are rebasing on D, D is the successors of A or B. The right
+# merge base is the one D succeed to. We pretend it is B for the rest
+# of this comment
+#
+# If we pick B as the base, the merge involves:
+# - changes from B to M (actual changeset payload)
+# - changes from B to D (induced by rebase) as D is a rebased
+#   version of B)
+# Which exactly represent the rebase operation.
+#
+# If we pick the A as the base, the merge involves
+# - changes from A to M (actual changeset payload)
+# - changes from A to D (with include changes between unrelated A and B
+#   plus changes induced by rebase)
+# Which does not represent anything sensible and creates a lot of
+# conflicts.
+for p in repo[rev].parents():
+if state.get(p.rev()) == p1:
+base = p.rev()
+break
+else: # fallback when base not found
+base = None
+# Raise because this function is called wrong (see issue 4106)
+raise AssertionError('no base found to rebase on '
+'(defineparents called wrong)')
+return p1, p2, base
 def isagitpatch(repo, patchname):
 'Return true if the given patch is in git format'
 mqpatch = os.path.join(repo.mq.path, patchname)
 for line in patch.linereader(file(mqpatch, 'rb')):

changeset 23484	cf3495dfd7ed
parent 23461	ffef6d503ab2
child 23489	fe4157d839ac