This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10119

copies: inline _backwardrenames() in pathcopies()
ClosedPublic

Authored by martinvonz on Mar 5 2021, 7:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG324ded1aa2ab: copies: inline _backwardrenames() in pathcopies()
Summary

I'll add another filtering step in patchcopies() next. I need access
to the forward copies for that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 5 2021, 7:41 PM
martinvonz added a commit: rHG324ded1aa2ab: copies: inline _backwardrenames() in pathcopies().Mar 8 2021, 3:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG324ded1aa2ab: copies: inline _backwardrenames() in pathcopies() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (7 lines)

Diff 26138

mercurial/copies.py

repo.ui.debug(b'debug.copies: search mode: backward\n') repo.ui.debug(b'debug.copies: search mode: backward\n')
copies = _backwardrenames(x, y, match=match) copies = _backwardrenames(x, y, match=match)
else: else:
if debug: if debug:
repo.ui.debug(b'debug.copies: search mode: combined\n') repo.ui.debug(b'debug.copies: search mode: combined\n')
base = None base = None
if a.rev() != nullrev: if a.rev() != nullrev:
base = x base = x
x_copies = _forwardcopies(a, x)
y_copies = _forwardcopies(a, y, base, match=match)
x_backward_renames = _reverse_renames(x_copies, x, match)
copies = _chain( copies = _chain(
_backwardrenames(x, a, match=match), x_backward_renames,
_forwardcopies(a, y, base, match=match), y_copies,
) )
_filter(x, y, copies) _filter(x, y, copies)
return copies return copies
def mergecopies(repo, c1, c2, base): def mergecopies(repo, c1, c2, base):
""" """
Finds moves and copies between context c1 and c2 that are relevant for Finds moves and copies between context c1 and c2 that are relevant for