From patchwork Sun Jul 29 08:01:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE] fileset: suppress EACCES while reading arbitrary paths via filectx API From: Yuya Nishihara X-Patchwork-Id: 32964 Message-Id: <7d91a50276dfe66c6e85.1532851268@mimosa> To: mercurial-devel@mercurial-scm.org Date: Sun, 29 Jul 2018 17:01:08 +0900 # HG changeset patch # User Yuya Nishihara # Date 1532849151 -32400 # Sun Jul 29 16:25:51 2018 +0900 # Branch stable # Node ID 7d91a50276dfe66c6e85892934403b6e803e548f # Parent 39885c84a7c1fa65637d281188c51de06d9c0997 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: