[PATCH STABLE RESEND] fileset: suppress EACCES while reading arbitrary paths via filectx API

Yuya Nishihara yuya at tcha.org
Tue Jul 31 12:22:30 UTC 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1532849151 -32400
#      Sun Jul 29 16:25:51 2018 +0900
# Branch stable
# Node ID a4c9d951bfa7c55ed23f481e066a21fd51f63946
# Parent  545a3e6650cd8f7e19c0f0256082837a33bea029
fileset: suppress EACCES while reading arbitrary paths via filectx API

On Windows, EACCES is raised in place of EISDIR. This patch simply adds
EACCES to the list of errors to be ignored since I think it's okay for
filesets to treat inaccessible working-copy files as not existing.

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -592,7 +592,9 @@ class matchctx(object):
                 try:
                     return predfn(fctx)
                 except (IOError, OSError) as e:
-                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EISDIR):
+                    # open()-ing a directory fails with EACCES on Windows
+                    if e.errno in (errno.ENOENT, errno.EACCES, errno.ENOTDIR,
+                                   errno.EISDIR):
                         return False
                     raise
         else:


More information about the Mercurial-devel mailing list