Skip to content
Snippets Groups Projects
Commit d13a7c8bf0a5 authored by Gábor Stefanik's avatar Gábor Stefanik
Browse files

copies: split u1/u2 to u1u/u2u and u1r/u2r

These will be made different in case of grafts by another patch in this series.
parent cfdbada917cd
No related branches found
No related tags found
No related merge requests found
......@@ -340,6 +340,7 @@
# 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)
......@@ -344,5 +345,5 @@
bothnew = sorted(addedinm1 & addedinm2)
for f in u1:
for f in u1u:
checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
......@@ -347,6 +348,6 @@
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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment