321 copy1, copy2, = {}, {} |
321 copy1, copy2, = {}, {} |
322 movewithdir1, movewithdir2 = {}, {} |
322 movewithdir1, movewithdir2 = {}, {} |
323 fullcopy1, fullcopy2 = {}, {} |
323 fullcopy1, fullcopy2 = {}, {} |
324 diverge = {} |
324 diverge = {} |
325 |
325 |
|
326 # find interesting file sets from manifests |
326 addedinm1 = m1.filesnotin(ma) |
327 addedinm1 = m1.filesnotin(ma) |
327 addedinm2 = m2.filesnotin(ma) |
328 addedinm2 = m2.filesnotin(ma) |
328 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) |
329 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) |
|
330 bothnew = sorted(addedinm1 & addedinm2) |
329 |
331 |
330 for f in u1: |
332 for f in u1: |
331 checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1) |
333 checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1) |
332 |
334 |
333 for f in u2: |
335 for f in u2: |
349 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
351 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
350 renamedeleteset.update(fl) # reverse map for below |
352 renamedeleteset.update(fl) # reverse map for below |
351 else: |
353 else: |
352 divergeset.update(fl) # reverse map for below |
354 divergeset.update(fl) # reverse map for below |
353 |
355 |
354 bothnew = sorted(addedinm1 & addedinm2) |
|
355 if bothnew: |
356 if bothnew: |
356 repo.ui.debug(" unmatched files new in both:\n %s\n" |
357 repo.ui.debug(" unmatched files new in both:\n %s\n" |
357 % "\n ".join(bothnew)) |
358 % "\n ".join(bothnew)) |
358 bothdiverge, _copy, _fullcopy = {}, {}, {} |
359 bothdiverge, _copy, _fullcopy = {}, {}, {} |
359 for f in bothnew: |
360 for f in bothnew: |