Show More
@@ -575,7 +575,7 b' def path_or_parents_in_set(path, prefix_' | |||||
575 | # directory hierarchies are relatively shallow and hash lookup is cheap. |
|
575 | # directory hierarchies are relatively shallow and hash lookup is cheap. | |
576 | if l > 5: |
|
576 | if l > 5: | |
577 | return any( |
|
577 | return any( | |
578 |
|
|
578 | parentdir in prefix_set for parentdir in pathutil.finddirs(path) | |
579 | ) |
|
579 | ) | |
580 |
|
580 | |||
581 | # FIXME: Ideally we'd never get to this point if this is the case - we'd |
|
581 | # FIXME: Ideally we'd never get to this point if this is the case - we'd | |
@@ -640,10 +640,7 b' class patternmatcher(basematcher):' | |||||
640 | def visitdir(self, dir): |
|
640 | def visitdir(self, dir): | |
641 | if self._prefix and dir in self._fileset: |
|
641 | if self._prefix and dir in self._fileset: | |
642 | return b'all' |
|
642 | return b'all' | |
643 | return ( |
|
643 | return dir in self._dirs or path_or_parents_in_set(dir, self._fileset) | |
644 | dir in self._dirs |
|
|||
645 | or path_or_parents_in_set(dir, self._fileset) |
|
|||
646 | ) |
|
|||
647 |
|
644 | |||
648 | def visitchildrenset(self, dir): |
|
645 | def visitchildrenset(self, dir): | |
649 | ret = self.visitdir(dir) |
|
646 | ret = self.visitdir(dir) |
General Comments 0
You need to be logged in to leave comments.
Login now