Skip to content
Snippets Groups Projects
Commit a48f6f18 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

copies: remove most early returns from pathcopies() and _forwardcopies()

I want to split up _chainandfilter() more so the call to _filter()
consistently happens at the end of pathcopies(). This prepares for
that change.

Differential Revision: https://phab.mercurial-scm.org/D6601
parent bcb4b5c5
Branches
Tags
No related merge requests found
......@@ -326,8 +326,10 @@
if b.rev() is None:
cm = _committedforwardcopies(a, b.p1(), match)
# combine copies from dirstate if necessary
return _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match))
return _committedforwardcopies(a, b, match)
copies = _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match))
else:
copies = _committedforwardcopies(a, b, match)
return copies
def _backwardrenames(a, b, match):
if a._repo.ui.config('experimental', 'copytrace') == 'off':
......@@ -366,7 +368,7 @@
if y.rev() is None and x == y.p1():
# short-circuit to avoid issues with merge states
return _dirstatecopies(repo, match)
return _forwardcopies(x, y, match=match)
if a == y:
copies = _forwardcopies(x, y, match=match)
elif a == y:
if debug:
repo.ui.debug('debug.copies: search mode: backward\n')
......@@ -371,10 +373,12 @@
if debug:
repo.ui.debug('debug.copies: search mode: backward\n')
return _backwardrenames(x, y, match=match)
if debug:
repo.ui.debug('debug.copies: search mode: combined\n')
return _chainandfilter(x, y, _backwardrenames(x, a, match=match),
_forwardcopies(a, y, match=match))
copies = _backwardrenames(x, y, match=match)
else:
if debug:
repo.ui.debug('debug.copies: search mode: combined\n')
copies = _chainandfilter(x, y, _backwardrenames(x, a, match=match),
_forwardcopies(a, y, match=match))
return copies
def mergecopies(repo, c1, c2, base):
"""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment