match: fix bug in match.visitdir()
authorDrew Gottlieb <drgott@google.com>
Fri, 22 May 2015 14:39:34 -0700
changeset 25250 f9a29dc964a3
parent 25249 4311e78a4609
child 25251 235f6490550c
match: fix bug in match.visitdir() There was a bug in my recent change to visitdir (8545bd381504) due to the stored generator being iterated over twice. Making the generator into a list at the start fixes this.
mercurial/match.py
--- a/mercurial/match.py	Thu May 21 16:20:34 2015 -0400
+++ b/mercurial/match.py	Fri May 22 14:39:34 2015 -0700
@@ -197,7 +197,7 @@
         parentdirs = None
         if (self._includeroots and dir not in self._includeroots and
                 dir not in self._includedirs):
-            parentdirs = util.finddirs(dir)
+            parentdirs = list(util.finddirs(dir))
             if not any(parent in self._includeroots for parent in parentdirs):
                 return False
         return (not self._fileroots or '.' in self._fileroots or