diff -r 2cf18f46a1ce -r aa41f1b01f31 mercurial/context.py
--- a/mercurial/context.py	Fri Sep 28 17:09:15 2018 -0700
+++ b/mercurial/context.py	Fri Sep 28 22:35:05 2018 -0700
@@ -1173,6 +1173,7 @@
                                                unknown=True, ignored=False))
 
     def matches(self, match):
+        match = self._repo.narrowmatch(match)
         ds = self._repo.dirstate
         return sorted(f for f in ds.matches(match) if ds[f] != 'r')