manifestdict.walk: remove now-redundant check for match.files()
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 07 Apr 2015 22:40:25 -0700
changeset 24684 ff7badaf3158
parent 24683 4eaea0ed8dc1
child 24685 b3d78d82d84c
manifestdict.walk: remove now-redundant check for match.files() When checking whether we can take the fast path of iterating over matcher files instead of manifest files, we check whether match.files() is non-empty. However, now that return early for match.always(), it can only be empty when there are only include/exclude patterns, but in that case anypats() will be True, so it's already covered. This makes manifestdict.walk() more similar to manifestdict.matches().
mercurial/manifest.py
--- a/mercurial/manifest.py	Tue Apr 07 21:08:23 2015 -0700
+++ b/mercurial/manifest.py	Tue Apr 07 22:40:25 2015 -0700
@@ -230,7 +230,7 @@
         fset = set(match.files())
 
         # avoid the entire walk if we're only looking for specific files
-        if fset and not match.anypats() and util.all(fn in self for fn in fset):
+        if not match.anypats() and util.all(fn in self for fn in fset):
             for fn in sorted(fset):
                 yield fn
             return