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

hgext/narrow/__init__.py

@@ -23,7 +23,6 b' from mercurial import ('
 from . import (
     narrowbundle2,
     narrowcommands,
-    narrowcopies,
     narrowrepo,
     narrowtemplates,
     narrowwirepeer,
@@ -65,7 +64,6 b' def reposetup(ui, repo):'
 
     if repository.NARROW_REQUIREMENT in repo.requirements:
         narrowrepo.wraprepo(repo)
-        narrowcopies.setup(repo)
         narrowwirepeer.reposetup(repo)
 
 templatekeyword = narrowtemplates.templatekeyword

mercurial/copies.py

@@ -258,10 +258,6 b' def _computenonoverlap(repo, c1, c2, add'
     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 b' def _fullcopytracing(repo, c1, c2, base)'
             }
 
     # 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