changeset 49912:bc83ebe07bf0

pathauditor: make _checkfs_exists a static method

This fixes the bug detected by pytype where the auditor
used in vfs.py may be a no-op auditor (vfs.py, line 398),
which doesn't have the _checkfs_exists method.

--- a/mercurial/pathutil.py	Thu Jan 12 13:14:00 2023 +0000
+++ b/mercurial/pathutil.py	Thu Jan 12 16:15:51 2023 +0000
@@ -116,7 +116,9 @@
                 if prefix in self.auditeddir:
                     res = self.auditeddir[prefix]
                 else:
-                    res = self._checkfs_exists(prefix, path)
+                    res = pathauditor._checkfs_exists(
+                        self.root, prefix, path, self.callback
+                    )
                     if self._cached:
                         self.auditeddir[prefix] = res
                 if not res:
@@ -125,11 +127,17 @@
         if self._cached:
             self.audited.add(path)
 
-    def _checkfs_exists(self, prefix: bytes, path: bytes) -> bool:
+    @staticmethod
+    def _checkfs_exists(
+        root,
+        prefix: bytes,
+        path: bytes,
+        callback: Optional[Callable[[bytes], bool]] = None,
+    ):
         """raise exception if a file system backed check fails.
 
         Return a bool that indicates that the directory (or file) exists."""
-        curpath = os.path.join(self.root, prefix)
+        curpath = os.path.join(root, prefix)
         try:
             st = os.lstat(curpath)
         except OSError as err:
@@ -149,7 +157,7 @@
             elif stat.S_ISDIR(st.st_mode) and os.path.isdir(
                 os.path.join(curpath, b'.hg')
             ):
-                if not self.callback or not self.callback(curpath):
+                if not callback or not callback(curpath):
                     msg = _(b"path '%s' is inside nested repo %r")
                     raise error.Abort(msg % (path, pycompat.bytestr(prefix)))
         return True

--- a/mercurial/vfs.py	Thu Jan 12 13:14:00 2023 +0000
+++ b/mercurial/vfs.py	Thu Jan 12 16:15:51 2023 +0000
@@ -427,13 +427,19 @@
     ) -> bool:
         """return True if the path is a regular file or a symlink and
         the directories along the path are "normal", that is
-        not symlinks or nested hg repositories."""
+        not symlinks or nested hg repositories.
+
+        Ignores the `_audit` setting, and checks the directories regardless.
+        `dircache` is used to cache the directory checks.
+        """
         try:
             for prefix in pathutil.finddirs_rev_noroot(util.localpath(path)):
                 if prefix in dircache:
                     res = dircache[prefix]
                 else:
-                    res = self.audit._checkfs_exists(prefix, path)
+                    res = pathutil.pathauditor._checkfs_exists(
+                        self.base, prefix, path
+                    )
                     dircache[prefix] = res
                 if not res:
                     return False