Mercurial > public > mercurial-scm > hg
diff mercurial/match.py @ 43633:0b7733719d21
utils: move finddirs() to pathutil
This is a follow-up to c21aca51b392 (utils: move the `dirs` definition
in pathutil (API), 2019-11-06). finddirs() is closely related to dirs
and used by it.
Differential Revision: https://phab.mercurial-scm.org/D7388
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 14 Nov 2019 08:03:26 -0800 |
| parents | ecd11c4d3834 |
| children | 5e1b0470cee7 |
line wrap: on
line diff
--- a/mercurial/match.py Wed Nov 13 21:52:25 2019 -0500 +++ b/mercurial/match.py Thu Nov 14 08:03:26 2019 -0800 @@ -18,7 +18,6 @@ encoding, error, pathutil, - pathutil, policy, pycompat, util, @@ -598,7 +597,8 @@ dir in self._fileset or dir in self._dirs or any( - parentdir in self._fileset for parentdir in util.finddirs(dir) + parentdir in self._fileset + for parentdir in pathutil.finddirs(dir) ) ) @@ -643,7 +643,7 @@ @staticmethod def _findsplitdirs(path): # yields (dirname, basename) tuples, walking back to the root. This is - # very similar to util.finddirs, except: + # very similar to pathutil.finddirs, except: # - produces a (dirname, basename) tuple, not just 'dirname' # Unlike manifest._splittopdir, this does not suffix `dirname` with a # slash. @@ -681,7 +681,9 @@ dir in self._roots or dir in self._dirs or dir in self._parents - or any(parentdir in self._roots for parentdir in util.finddirs(dir)) + or any( + parentdir in self._roots for parentdir in pathutil.finddirs(dir) + ) ) @propertycache @@ -706,7 +708,9 @@ b'' in self._roots or dir in self._roots or dir in self._dirs - or any(parentdir in self._roots for parentdir in util.finddirs(dir)) + or any( + parentdir in self._roots for parentdir in pathutil.finddirs(dir) + ) ): return b'this' @@ -1073,7 +1077,7 @@ @propertycache def _pathdirs(self): - return set(util.finddirs(self._path)) + return set(pathutil.finddirs(self._path)) def visitdir(self, dir): if dir == self._path: