narrowspec: use vfs.tryread() instead of reimplementing
Note that parseconfig() works well with empty strings.
Differential Revision: https://phab.mercurial-scm.org/D6465
--- a/mercurial/narrowspec.py Fri May 31 13:25:28 2019 -0700
+++ b/mercurial/narrowspec.py Fri May 31 09:25:51 2019 -0700
@@ -7,8 +7,6 @@
from __future__ import absolute_import
-import errno
-
from .i18n import _
from . import (
error,
@@ -145,15 +143,9 @@
return includepats, excludepats
def load(repo):
- try:
- spec = repo.svfs.read(FILENAME)
- except IOError as e:
- # Treat "narrowspec does not exist" the same as "narrowspec file exists
- # and is empty".
- if e.errno == errno.ENOENT:
- return set(), set()
- raise
-
+ # Treat "narrowspec does not exist" the same as "narrowspec file exists
+ # and is empty".
+ spec = repo.svfs.tryread(FILENAME)
return parseconfig(repo.ui, spec)
def save(repo, includepats, excludepats):