Show More
@@ -403,13 +403,15 b' def pathcopies(x, y, match=None):' | |||||
403 | ) |
|
403 | ) | |
404 | if x == y or not x or not y: |
|
404 | if x == y or not x or not y: | |
405 | return {} |
|
405 | return {} | |
|
406 | if y.rev() is None and x == y.p1(): | |||
|
407 | if debug: | |||
|
408 | repo.ui.debug(b'debug.copies: search mode: dirstate\n') | |||
|
409 | # short-circuit to avoid issues with merge states | |||
|
410 | return _dirstatecopies(repo, match) | |||
406 | a = y.ancestor(x) |
|
411 | a = y.ancestor(x) | |
407 | if a == x: |
|
412 | if a == x: | |
408 | if debug: |
|
413 | if debug: | |
409 | repo.ui.debug(b'debug.copies: search mode: forward\n') |
|
414 | repo.ui.debug(b'debug.copies: search mode: forward\n') | |
410 | if y.rev() is None and x == y.p1(): |
|
|||
411 | # short-circuit to avoid issues with merge states |
|
|||
412 | return _dirstatecopies(repo, match) |
|
|||
413 | copies = _forwardcopies(x, y, match=match) |
|
415 | copies = _forwardcopies(x, y, match=match) | |
414 | elif a == y: |
|
416 | elif a == y: | |
415 | if debug: |
|
417 | if debug: |
General Comments 0
You need to be logged in to leave comments.
Login now