[PATCH 5 of 5] copies: move debug statement to appropriate place
Matt Mackall
mpm at selenic.com
Wed Sep 23 15:07:11 CDT 2015
# HG changeset patch
# User Matt Mackall <mpm at selenic.com>
# Date 1440015077 18000
# Wed Aug 19 15:11:17 2015 -0500
# Node ID b2dab82de4a48e844528a317c09b345c8a0cb685
# Parent e049591df84e39f58b2615cfdb9a371422295f61
copies: move debug statement to appropriate place
diff -r e049591df84e -r b2dab82de4a4 mercurial/copies.py
--- a/mercurial/copies.py Wed Aug 19 14:05:42 2015 -0500
+++ b/mercurial/copies.py Wed Aug 19 15:11:17 2015 -0500
@@ -277,6 +277,8 @@
if limit is None:
# no common ancestor, no copies
return {}, {}, {}, {}
+ repo.ui.debug(" searching for copies back to rev %d\n" % limit)
+
m1 = c1.manifest()
m2 = c2.manifest()
ma = ca.manifest()
@@ -321,8 +323,6 @@
fullcopy1, fullcopy2 = {}, {}
diverge = {}
- repo.ui.debug(" searching for copies back to rev %d\n" % limit)
-
addedinm1 = m1.filesnotin(ma)
addedinm2 = m2.filesnotin(ma)
u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
More information about the Mercurial-devel
mailing list