Mercurial > hg
comparison mercurial/copies.py @ 26319:4b9bb1616195
copies: move debug statement to appropriate place
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 19 Aug 2015 15:11:17 -0500 |
| parents | 07ac78ba2e37 |
| children | f3c6540f2cd1 |
comparison
equal
deleted
inserted
replaced
| 26318:d3bd6cefd742 | 26319:4b9bb1616195 |
|---|---|
| 275 | 275 |
| 276 limit = _findlimit(repo, c1.rev(), c2.rev()) | 276 limit = _findlimit(repo, c1.rev(), c2.rev()) |
| 277 if limit is None: | 277 if limit is None: |
| 278 # no common ancestor, no copies | 278 # no common ancestor, no copies |
| 279 return {}, {}, {}, {} | 279 return {}, {}, {}, {} |
| 280 repo.ui.debug(" searching for copies back to rev %d\n" % limit) | |
| 281 | |
| 280 m1 = c1.manifest() | 282 m1 = c1.manifest() |
| 281 m2 = c2.manifest() | 283 m2 = c2.manifest() |
| 282 ma = ca.manifest() | 284 ma = ca.manifest() |
| 283 | 285 |
| 284 | 286 |
| 319 copy1, copy2, = {}, {} | 321 copy1, copy2, = {}, {} |
| 320 movewithdir1, movewithdir2 = {}, {} | 322 movewithdir1, movewithdir2 = {}, {} |
| 321 fullcopy1, fullcopy2 = {}, {} | 323 fullcopy1, fullcopy2 = {}, {} |
| 322 diverge = {} | 324 diverge = {} |
| 323 | 325 |
| 324 repo.ui.debug(" searching for copies back to rev %d\n" % limit) | |
| 325 | |
| 326 addedinm1 = m1.filesnotin(ma) | 326 addedinm1 = m1.filesnotin(ma) |
| 327 addedinm2 = m2.filesnotin(ma) | 327 addedinm2 = m2.filesnotin(ma) |
| 328 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) | 328 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) |
| 329 | 329 |
| 330 for f in u1: | 330 for f in u1: |