--- 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