equal
deleted
inserted
replaced
226 copy = {} |
226 copy = {} |
227 movewithdir = {} |
227 movewithdir = {} |
228 fullcopy = {} |
228 fullcopy = {} |
229 diverge = {} |
229 diverge = {} |
230 |
230 |
231 def _checkcopies(f, m1, m2): |
|
232 checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy) |
|
233 |
|
234 repo.ui.debug(" searching for copies back to rev %d\n" % limit) |
231 repo.ui.debug(" searching for copies back to rev %d\n" % limit) |
235 |
232 |
236 u1 = _nonoverlap(m1, m2, ma) |
233 u1 = _nonoverlap(m1, m2, ma) |
237 u2 = _nonoverlap(m2, m1, ma) |
234 u2 = _nonoverlap(m2, m1, ma) |
238 |
235 |
242 if u2: |
239 if u2: |
243 repo.ui.debug(" unmatched files in other:\n %s\n" |
240 repo.ui.debug(" unmatched files in other:\n %s\n" |
244 % "\n ".join(u2)) |
241 % "\n ".join(u2)) |
245 |
242 |
246 for f in u1: |
243 for f in u1: |
247 _checkcopies(f, m1, m2) |
244 checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy) |
|
245 |
248 for f in u2: |
246 for f in u2: |
249 _checkcopies(f, m2, m1) |
247 checkcopies(ctx, f, m2, m1, ca, limit, diverge, copy, fullcopy) |
250 |
248 |
251 renamedelete = {} |
249 renamedelete = {} |
252 renamedelete2 = set() |
250 renamedelete2 = set() |
253 diverge2 = set() |
251 diverge2 = set() |
254 for of, fl in diverge.items(): |
252 for of, fl in diverge.items(): |