Mercurial > hg
changeset 46649:324ded1aa2ab
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 05 Mar 2021 14:26:56 -0800 |
| parents | eca88f5fbcb2 |
| children | 2803f94b7431 |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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