[PATCH 03 of 11] copies: split u1/u2 to u1u/u2u and u1r/u2r (issue4028)
Gábor Stefanik
gabor.stefanik at nng.com
Tue Oct 4 14:39:46 UTC 2016
# HG changeset patch
# User Gábor Stefanik <gabor.stefanik at nng.com>
# Date 1475493799 -7200
# Mon Oct 03 13:23:19 2016 +0200
# Node ID 15adeba2cc0fdea04c81404fcb4092cae816de17
# Parent 39fce69a645a8f1f20d67ed953d5822212fb81d0
copies: split u1/u2 to u1u/u2u and u1r/u2r (issue4028)
These will be made different in case of grafts by another patch in this series.
diff -r 39fce69a645a -r 15adeba2cc0f mercurial/copies.py
--- a/mercurial/copies.py Mon Oct 03 16:19:55 2016 +0200
+++ b/mercurial/copies.py Mon Oct 03 13:23:19 2016 +0200
@@ -340,13 +340,14 @@
# find interesting file sets from manifests
addedinm1 = m1.filesnotin(ma)
addedinm2 = m2.filesnotin(ma)
- u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
+ u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
+ u1u, u2u = u1r, u2r
bothnew = sorted(addedinm1 & addedinm2)
- for f in u1:
+ for f in u1u:
checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
- for f in u2:
+ for f in u2u:
checkcopies(c2, f, m2, m1, ca, limit, diverge, copy2, fullcopy2)
copy = dict(copy1.items() + copy2.items())
@@ -439,7 +440,7 @@
(d, dirmove[d]))
# check unaccounted nonoverlapping files against directory moves
- for f in u1 + u2:
+ for f in u1r + u2r:
if f not in fullcopy:
for d in dirmove:
if f.startswith(d):
More information about the Mercurial-devel
mailing list