This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8002

pathutil: mark parent directories as audited as we go
ClosedPublic

Authored by martinvonz on Jan 24 2020, 8:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG51c86c6167c1: pathutil: mark parent directories as audited as we go
Summary

Before 0b7ce0b16d8a (pathauditor: change parts verification order to
be root first, 2016-02-11), we used to validate child directories
before parents. It was then important to only mark the child audited
only after we had audited its parent (ancestors). I'm pretty sure we
don't need to do that any more, now that we audit parents before
children.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 24 2020, 8:40 PM
martinvonz added a commit: rHG51c86c6167c1: pathutil: mark parent directories as audited as we go.Jan 29 2020, 6:18 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG51c86c6167c1: pathutil: mark parent directories as audited as we go (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pathutil.py (7 lines)

Diff 19681

mercurial/pathutil.py

% (path, pycompat.bytestr(base)) % (path, pycompat.bytestr(base))
) )
normparts = util.splitpath(normpath) normparts = util.splitpath(normpath)
assert len(parts) == len(normparts) assert len(parts) == len(normparts)
parts.pop() parts.pop()
normparts.pop() normparts.pop()
prefixes = []
# It's important that we check the path parts starting from the root. # It's important that we check the path parts starting from the root.
# This means we won't accidentally traverse a symlink into some other # This means we won't accidentally traverse a symlink into some other
# filesystem (which is potentially expensive to access). # filesystem (which is potentially expensive to access).
for i in range(len(parts)): for i in range(len(parts)):
prefix = pycompat.ossep.join(parts[: i + 1]) prefix = pycompat.ossep.join(parts[: i + 1])
normprefix = pycompat.ossep.join(normparts[: i + 1]) normprefix = pycompat.ossep.join(normparts[: i + 1])
if normprefix in self.auditeddir: if normprefix in self.auditeddir:
continue continue
if self._realfs: if self._realfs:
self._checkfs(prefix, path) self._checkfs(prefix, path)
prefixes.append(normprefix) if self._cached:
self.auditeddir.add(normprefix)
if self._cached: if self._cached:
self.audited.add(normpath) self.audited.add(normpath)
# only add prefixes to the cache after checking everything: we don't
# want to add "foo/bar/baz" before checking if there's a "foo/.hg"
self.auditeddir.update(prefixes)
def _checkfs(self, prefix, path): def _checkfs(self, prefix, path):
"""raise exception if a file system backed check fails""" """raise exception if a file system backed check fails"""
curpath = os.path.join(self.root, prefix) curpath = os.path.join(self.root, prefix)
try: try:
st = os.lstat(curpath) st = os.lstat(curpath)
except OSError as err: except OSError as err:
# EINVAL can be raised as invalid path syntax under win32. # EINVAL can be raised as invalid path syntax under win32.