pathutil: mark parent directories as audited as we go
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 24 Jan 2020 17:25:40 -0800
changeset 44195 51c86c6167c1
parent 44194 d4c1501225c4
child 44196 6ca9f45b32b0
pathutil: mark parent directories as audited as we go 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. Differential Revision: https://phab.mercurial-scm.org/D8002
mercurial/pathutil.py
--- a/mercurial/pathutil.py	Mon Jan 27 09:14:19 2020 -0800
+++ b/mercurial/pathutil.py	Fri Jan 24 17:25:40 2020 -0800
@@ -99,7 +99,6 @@
 
         parts.pop()
         normparts.pop()
-        prefixes = []
         # 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
         # filesystem (which is potentially expensive to access).
@@ -110,13 +109,11 @@
                 continue
             if self._realfs:
                 self._checkfs(prefix, path)
-            prefixes.append(normprefix)
+            if self._cached:
+                self.auditeddir.add(normprefix)
 
         if self._cached:
             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):
         """raise exception if a file system backed check fails"""