Mercurial > public > mercurial-scm > hg-stable
diff mercurial/copies.py @ 39967:707c3804e607
narrow: move copies overrides to core
The copies overrides seems to have been a little complicated just by
not being in core. When moved to core, it becomes trivial (at least I
think these overrides have the same effect).
Differential Revision: https://phab.mercurial-scm.org/D4825
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 28 Sep 2018 12:56:57 -0700 |
| parents | 85c8ff26d698 |
| children | 25b2868206e2 |
line wrap: on
line diff
--- a/mercurial/copies.py Sun Sep 30 18:45:16 2018 +0300 +++ b/mercurial/copies.py Fri Sep 28 12:56:57 2018 -0700 @@ -258,10 +258,6 @@ if u2: repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) - narrowmatch = repo.narrowmatch() - if not narrowmatch.always(): - u1 = [f for f in u1 if narrowmatch(f)] - u2 = [f for f in u2 if narrowmatch(f)] return u1, u2 def _makegetfctx(ctx): @@ -467,8 +463,8 @@ } # find interesting file sets from manifests - addedinm1 = m1.filesnotin(mb) - addedinm2 = m2.filesnotin(mb) + addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) + addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) bothnew = sorted(addedinm1 & addedinm2) if tca == base: # unmatched file from base