diff mercurial/changegroup.py @ 40082:4fd0fac48922

localrepo: allow narrowmatch() to accept matcher to intersect with

It's pretty common that we need to intersect a matcher we already have
(usually from the user) with the narrow matcher. Let's make
repo.narrowmatch() take an optional matcher to intersect with.

Differential Revision: https://phab.mercurial-scm.org/D4896

--- a/mercurial/changegroup.py	Fri Oct 05 01:55:51 2018 +0300
+++ b/mercurial/changegroup.py	Fri Sep 28 12:29:21 2018 -0700
@@ -1271,8 +1271,7 @@
 
     # Requested files could include files not in the local store. So
     # filter those out.
-    filematcher = matchmod.intersectmatchers(repo.narrowmatch(),
-                                             filematcher)
+    filematcher = repo.narrowmatch(filematcher)
 
     fn = _packermap[version][0]
     return fn(repo, filematcher, bundlecaps, ellipses=ellipses,