repo-config: move rc component of repository inside `rcutil`

This gather logic about where to find config file in the same location.

This also reduce the amount of logic we do in dispatch.py which is a win in
itself.

mercurial/configuration/rcutil.py

@@ -19,8 +19,11 from typing import (
 
 from .. import (
     encoding,
+    localrepo,
     pycompat,
+    requirements as requirementsmod,
     util,
+    vfs,
 )
 
 from ..utils import resourceutil
@@ -127,6 +130,37 def rccomponents() -> List[ComponentT]:
     return _rccomponents
 
 
+def _shared_source_component(path: bytes) -> List[FileRCT]:
+    """if the current repository is shared one, this tries to read
+    .hg/hgrc of shared source if we are in share-safe mode
+
+    This should be called before reading .hg/hgrc or the main repo
+    as that overrides config set in shared source"""
+    try:
+        with open(os.path.join(path, b".hg", b"requires"), "rb") as fp:
+            requirements = set(fp.read().splitlines())
+            if not (
+                requirementsmod.SHARESAFE_REQUIREMENT in requirements
+                and requirementsmod.SHARED_REQUIREMENT in requirements
+            ):
+                return []
+            hgvfs = vfs.vfs(os.path.join(path, b".hg"))
+            sharedvfs = localrepo._getsharedvfs(hgvfs, requirements)
+            return [sharedvfs.join(b"hgrc")]
+    except IOError:
+        pass
+    return []
+
+
+def repo_components(repo_path: bytes) -> List[FileRCT]:
+    """return the list of config file to read for a repository"""
+    components = []
+    components.extend(_shared_source_component(repo_path))
+    components.append(os.path.join(repo_path, b".hg", b"hgrc"))
+    components.append(os.path.join(repo_path, b".hg", b"hgrc-not-shared"))
+    return components
+
+
 def defaultpagerenv() -> Dict[bytes, bytes]:
     """return a dict of default environment variables and their values,
     intended to be set before starting a pager.

mercurial/dispatch.py

@@ -34,15 +34,12 from . import (
     help,
     hg,
     hook,
-    localrepo,
     profiling,
     pycompat,
     registrar,
-    requirements as requirementsmod,
     scmutil,
     ui as uimod,
     util,
-    vfs,
 )
 
 from .configuration import rcutil
@@ -929,29 +926,6 def runcommand(lui, repo, cmd, fullargs,
     return ret
 
 
-def _readsharedsourceconfig(ui, path):
-    """if the current repository is shared one, this tries to read
-    .hg/hgrc of shared source if we are in share-safe mode
-
-    Config read is loaded into the ui object passed
-
-    This should be called before reading .hg/hgrc or the main repo
-    as that overrides config set in shared source"""
-    try:
-        with open(os.path.join(path, b".hg", b"requires"), "rb") as fp:
-            requirements = set(fp.read().splitlines())
-            if not (
-                requirementsmod.SHARESAFE_REQUIREMENT in requirements
-                and requirementsmod.SHARED_REQUIREMENT in requirements
-            ):
-                return
-            hgvfs = vfs.vfs(os.path.join(path, b".hg"))
-            sharedvfs = localrepo._getsharedvfs(hgvfs, requirements)
-            ui.readconfig(sharedvfs.join(b"hgrc"), root=path)
-    except IOError:
-        pass
-
-
 def _getlocal(ui, rpath, wd=None):
     """Return (path, local ui object) for the given target path.
 
@@ -980,9 +954,8 def _getlocal(ui, rpath, wd=None):
     else:
         lui = ui.copy()
         if rcutil.use_repo_hgrc():
-            _readsharedsourceconfig(lui, path)
-            lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
-            lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
+            for rc_path in rcutil.repo_components(path):
+                lui.readconfig(rc_path, root=path)
 
     if rpath:
         # the specified path, might be defined in the [paths] section of the
@@ -992,9 +965,8 def _getlocal(ui, rpath, wd=None):
         path = path_obj.rawloc
         lui = ui.copy()
         if rcutil.use_repo_hgrc():
-            _readsharedsourceconfig(lui, path)
-            lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
-            lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
+            for rc_path in rcutil.repo_components(path):
+                lui.readconfig(rc_path, root=path)
 
     if oldcwd:
         os.chdir(oldcwd)