Mercurial > public > mercurial-scm > hg
diff mercurial/manifest.py @ 42341:27d6956d386b
match: use '' instead of '.' for root directory (API)
I think '' is generally a better value for the root directory than '.'
is. For example, os.path.join('', 'foo') => 'foo', while
os.path.join('.', 'foo') => './foo'.
This patch mostly makes it so we use '' internally in
match.py. However, it also affects the API in visitdir(),
visitchildrenset() and files(). The two former now also accept '' as
input. I've updated the callers of these methods. I've also added a
deprecation warning for passing '.' (for external callers). The only
caller I could find that was affected by files() returning '' instead
of '.' was in dirstate.walk(). I've updated that.
The next few patches show some workarounds we can remove by using ''
instead of '.'.
Differential Revision: https://phab.mercurial-scm.org/D6401
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 15 May 2017 00:12:19 -0700 |
| parents | e4ac7e63c213 |
| children | 6310180662f5 |
line wrap: on
line diff
--- a/mercurial/manifest.py Wed Apr 24 09:32:29 2019 -0700 +++ b/mercurial/manifest.py Mon May 15 00:12:19 2017 -0700 @@ -466,9 +466,9 @@ if match(fn): yield fn - # for dirstate.walk, files=['.'] means "walk the whole tree". + # for dirstate.walk, files=[''] means "walk the whole tree". # follow that here, too - fset.discard('.') + fset.discard('') for fn in sorted(fset): if not self.hasdir(fn): @@ -1038,9 +1038,9 @@ fset.remove(fn) yield fn - # for dirstate.walk, files=['.'] means "walk the whole tree". + # for dirstate.walk, files=[''] means "walk the whole tree". # follow that here, too - fset.discard('.') + fset.discard('') for fn in sorted(fset): if not self.hasdir(fn): @@ -1048,7 +1048,7 @@ def _walk(self, match): '''Recursively generates matching file names for walk().''' - visit = match.visitchildrenset(self._dir[:-1] or '.') + visit = match.visitchildrenset(self._dir[:-1]) if not visit: return @@ -1076,7 +1076,7 @@ '''recursively generate a new manifest filtered by the match argument. ''' - visit = match.visitchildrenset(self._dir[:-1] or '.') + visit = match.visitchildrenset(self._dir[:-1]) if visit == 'all': return self.copy() ret = treemanifest(self._dir) @@ -1235,7 +1235,7 @@ return m._dirs.get(d, emptytree)._node # let's skip investigating things that `match` says we do not need. - visit = match.visitchildrenset(self._dir[:-1] or '.') + visit = match.visitchildrenset(self._dir[:-1]) visit = self._loadchildrensetlazy(visit) if visit == 'this' or visit == 'all': visit = None @@ -1254,7 +1254,7 @@ If `matcher` is provided, it only returns subtrees that match. """ - if matcher and not matcher.visitdir(self._dir[:-1] or '.'): + if matcher and not matcher.visitdir(self._dir[:-1]): return if not matcher or matcher(self._dir[:-1]): yield self @@ -1685,7 +1685,7 @@ return self._dirmancache[tree][node] if not self._narrowmatch.always(): - if not self._narrowmatch.visitdir(tree[:-1] or '.'): + if not self._narrowmatch.visitdir(tree[:-1]): return excludeddirmanifestctx(tree, node) if tree: if self._rootstore._treeondisk: @@ -1878,7 +1878,7 @@ def _storage(self): narrowmatch = self._manifestlog._narrowmatch if not narrowmatch.always(): - if not narrowmatch.visitdir(self._dir[:-1] or '.'): + if not narrowmatch.visitdir(self._dir[:-1]): return excludedmanifestrevlog(self._dir) return self._manifestlog.getstorage(self._dir)