Patchwork D6465: narrowspec: use vfs.tryread() instead of reimplementing

login
register
mail settings
Submitter phabricator
Date May 31, 2019, 4:57 p.m.
Message ID <differential-rev-PHID-DREV-qdey6j4hyxwvp4h4lfc6-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/40287/
State Superseded
Headers show

Comments

phabricator - May 31, 2019, 4:57 p.m.
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




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

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):