diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -225,10 +225,11 @@ def generatev1(repo): # partially encode name over the wire for backwards compat yield '%s\0%d\n' % (store.encodedir(name), size) if size <= 65536: - with svfs(name, 'rb') as fp: + with svfs(name, 'rb', auditpath=False) as fp: yield fp.read(size) else: - for chunk in util.filechunkiter(svfs(name), limit=size): + data = svfs(name, auditpath=False) + for chunk in util.filechunkiter(data, limit=size): yield chunk finally: svfs.mustaudit = oldaudit diff --git a/mercurial/vfs.py b/mercurial/vfs.py --- a/mercurial/vfs.py +++ b/mercurial/vfs.py @@ -320,7 +320,8 @@ class vfs(abstractvfs): os.chmod(name, self.createmode & 0o666) def __call__(self, path, mode="r", text=False, atomictemp=False, - notindexed=False, backgroundclose=False, checkambig=False): + notindexed=False, backgroundclose=False, checkambig=False, + auditpath=True): '''Open ``path`` file, which is relative to vfs root. Newly created directories are marked as "not to be indexed by @@ -344,11 +345,12 @@ class vfs(abstractvfs): only for writing), and is useful only if target file is guarded by any lock (e.g. repo.lock or repo.wlock). ''' - if self._audit: - r = util.checkosfilename(path) - if r: - raise error.Abort("%s: %r" % (r, path)) - self.audit(path) + if auditpath: + if self._audit: + r = util.checkosfilename(path) + if r: + raise error.Abort("%s: %r" % (r, path)) + self.audit(path) f = self.join(path) if not text and "b" not in mode: