D6465: narrowspec: use vfs.tryread() instead of reimplementing
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri May 31 16:57:56 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Note that parseconfig() works well with empty strings.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6465
AFFECTED FILES
mercurial/narrowspec.py
CHANGE DETAILS
diff --git a/mercurial/narrowspec.py b/mercurial/narrowspec.py
--- a/mercurial/narrowspec.py
+++ b/mercurial/narrowspec.py
@@ -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):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list