Mercurial > hg-stable
changeset 30047:d13a7c8bf0a5
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.
| author | Gábor Stefanik <gabor.stefanik@nng.com> |
|---|---|
| date | Mon, 03 Oct 2016 13:23:19 +0200 |
| parents | cfdbada917cd |
| children | 91a3c58ecf93 |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Oct 03 13:18:31 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):