[PATCH 13 of 17] rebase: replace "future parents" message with more detailed debug info
Mads Kiilerich
mads at kiilerich.com
Sun Nov 30 19:08:40 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1417374421 -3600
# Sun Nov 30 20:07:01 2014 +0100
# Node ID 134387edbb48bbdac778267e5566fd02d2ebe421
# Parent 303cb3b88ef835c2dad3e1917b0d21715f461756
rebase: replace "future parents" message with more detailed debug info
(Enable this to prove that the next refactoring doesn't change anything.)
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -381,6 +381,9 @@ def rebase(ui, repo, **opts):
_('changesets'), total)
m1, m2, anc, p1, p2 = computerebase(repo, rev, target, state,
targetancestors)
+ repo.ui.debug(" merging %d and %d using ancestor %s, "
+ "setting parents %d and %d\n"
+ % (m1, m2, anc, p1, p2))
storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external, activebookmark)
if len(repo.parents()) == 2:
@@ -440,6 +443,7 @@ def rebase(ui, repo, **opts):
if collapsef and not keepopen:
_m1, _m2, _anc, p1, _p2 = computerebase(repo, min(state), target,
state, targetancestors)
+ repo.ui.debug(" collapsing using p1 %d\n" % p1)
editopt = opts.get('edit')
editform = 'rebase.collapse'
if collapsemsg:
@@ -637,8 +641,6 @@ def computerebase(repo, rev, target, sta
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()))
if rev == min(state):
# Case (1) initial changeset of a non-detaching rebase.
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -231,7 +231,7 @@ Check that the right ancestors is used w
skipping null merge of 8:8e4e2c1a07ae
rebasing 9:e31216eec445 "more changes to f1"
rebasing: 9:e31216eec445 5/6 changesets (83.33%)
- future parents are 2 and -1
+ merging 2 and 9 using ancestor 8, setting parents 2 and -1
rebase status stored
update to 2:4bc80088dc6b
resolving manifests
@@ -256,7 +256,7 @@ Check that the right ancestors is used w
rebased 9:e31216eec445 as 19c888675e13
rebasing 10:2f2496ddf49d "merge" (tip)
rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
- future parents are 11 and 7
+ merging 11 and 10 using ancestor 9, setting parents 11 and 7
rebase status stored
already in target
merge against 10:2f2496ddf49d
More information about the Mercurial-devel
mailing list