260 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
260 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
261 renamedelete2.update(fl) # reverse map for below |
261 renamedelete2.update(fl) # reverse map for below |
262 else: |
262 else: |
263 diverge2.update(fl) # reverse map for below |
263 diverge2.update(fl) # reverse map for below |
264 |
264 |
|
265 bothnew = sorted([d for d in m1 if d in m2 and d not in ma]) |
|
266 if bothnew: |
|
267 repo.ui.debug(" unmatched files new in both:\n %s\n" |
|
268 % "\n ".join(bothnew)) |
|
269 bothdiverge, _copy, _fullcopy = {}, {}, {} |
|
270 for f in bothnew: |
|
271 checkcopies(ctx, f, m1, m2, ca, limit, bothdiverge, _copy, _fullcopy) |
|
272 checkcopies(ctx, f, m2, m1, ca, limit, bothdiverge, _copy, _fullcopy) |
|
273 for of, fl in bothdiverge.items(): |
|
274 if len(fl) == 2 and fl[0] == fl[1]: |
|
275 copy[fl[0]] = of # not actually divergent, just matching renames |
|
276 |
265 if fullcopy: |
277 if fullcopy: |
266 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
278 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
267 "% = renamed and deleted):\n") |
279 "% = renamed and deleted):\n") |
268 for f in sorted(fullcopy): |
280 for f in sorted(fullcopy): |
269 note = "" |
281 note = "" |