Mercurial > hg
changeset 41936:a791623458ef
copies: remove dependency on scmutil by directly using match.exact()
I want to add a dependency from scmutil.copies(), so I need to remove
this dependency first.
Differential Revision: https://phab.mercurial-scm.org/D6118
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 11 Mar 2019 09:20:26 -0700 |
| parents | bf72e4c39f0b |
| children | 232d4b9d391a |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Mar 11 09:35:36 2019 -0700 +++ b/mercurial/copies.py Mon Mar 11 09:20:26 2019 -0700 @@ -17,7 +17,6 @@ match as matchmod, node, pathutil, - scmutil, util, ) from .utils import ( @@ -193,7 +192,7 @@ # this comparison. forwardmissingmatch = match if b.p1() == a and b.p2().node() == node.nullid: - filesmatcher = scmutil.matchfiles(a._repo, b.files()) + filesmatcher = matchmod.exact(b.files()) forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) missing = _computeforwardmissing(a, b, match=forwardmissingmatch)