# HG changeset patch # User Martin von Zweigbergk # Date 1614983216 28800 # Node ID 324ded1aa2ab683cfe794419b6f5d64b67443b03 # Parent eca88f5fbcb26488397c2df60f173c6d624d6394 copies: inline _backwardrenames() in pathcopies() I'll add another filtering step in `patchcopies()` next. I need access to the forward copies for that. Differential Revision: https://phab.mercurial-scm.org/D10119 diff -r eca88f5fbcb2 -r 324ded1aa2ab mercurial/copies.py --- a/mercurial/copies.py Fri Mar 05 14:26:52 2021 -0800 +++ b/mercurial/copies.py Fri Mar 05 14:26:56 2021 -0800 @@ -761,9 +761,12 @@ base = None if a.rev() != nullrev: 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( - _backwardrenames(x, a, match=match), - _forwardcopies(a, y, base, match=match), + x_backward_renames, + y_copies, ) _filter(x, y, copies) return copies