narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)

This also make narrow files use 'include' and 'exclude' instead of plural forms
which are 'includes' and 'excludes'.

This is BC because existing narrowspecs have to replace excludes, includes words
with exclude and include i.e. their singular versions.

Differential Revision: https://phab.mercurial-scm.org/D4057

mercurial/narrowspec.py

@@ -13,6 +13,7 b' from .i18n import _'
 from . import (
     error,
     match as matchmod,
+    sparse,
     util,
 )
 
@@ -107,10 +108,10 b' def parsepatterns(pats):'
     return set(normalizepattern(p) for p in pats)
 
 def format(includes, excludes):
-    output = '[includes]\n'
+    output = '[include]\n'
     for i in sorted(includes - excludes):
         output += i + '\n'
-    output += '[excludes]\n'
+    output += '[exclude]\n'
     for e in sorted(excludes):
         output += e + '\n'
     return output
@@ -139,7 +140,13 b' def load(repo):'
             repo.invalidate(clearfilecache=True)
             return set(), set()
         raise
-    return _parsestoredpatterns(spec)
+    # maybe we should care about the profiles returned too
+    includepats, excludepats, profiles = sparse.parseconfig(repo.ui, spec,
+                                                            'narrow')
+    if profiles:
+        raise error.Abort(_("including other spec files using '%include' is not"
+                            " suported in narrowspec"))
+    return includepats, excludepats
 
 def save(repo, includepats, excludepats):
     spec = format(includepats, excludepats)

tests/test-narrow-debugcommands.t

@@ -2,9 +2,9 b''
   $ hg init repo
   $ cd repo
   $ cat << EOF > .hg/narrowspec
-  > [includes]
+  > [include]
   > path:foo
-  > [excludes]
+  > [exclude]
   > EOF
   $ echo treemanifest >> .hg/requires
   $ echo narrowhg-experimental >> .hg/requires