##// END OF EJS Templates
copies: avoid filtering by short-circuit dirstate-only copies earlier...
Martin von Zweigbergk -
r44749:30862e22 default
parent child Browse files
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:
@@ -68,7 +68,6 b' Getting status of working copy'
68 ! b
68 ! b
69
69
70 $ hg status --copies
70 $ hg status --copies
71 debug.filters: computing revision filter for "visible"
72 M c
71 M c
73 A d
72 A d
74 R a
73 R a
General Comments 0
You need to be logged in to leave comments. Login now