config: return component from `repo_components`
We used to returns just paths. However using the same return types as
`rccomponents` will be quite useful later in this series.
--- a/mercurial/configuration/rcutil.py Tue Oct 22 23:42:15 2024 +0200
+++ b/mercurial/configuration/rcutil.py Wed Oct 23 01:12:52 2024 +0200
@@ -152,13 +152,13 @@
return []
-def repo_components(repo_path: bytes) -> List[FileRCT]:
+def repo_components(repo_path: bytes) -> List[ComponentT]:
"""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
+ return [(b'path', c) for c in components]
def defaultpagerenv() -> Dict[bytes, bytes]:
--- a/mercurial/dispatch.py Tue Oct 22 23:42:15 2024 +0200
+++ b/mercurial/dispatch.py Wed Oct 23 01:12:52 2024 +0200
@@ -954,7 +954,8 @@
else:
lui = ui.copy()
if rcutil.use_repo_hgrc():
- for rc_path in rcutil.repo_components(path):
+ for c_type, rc_path in rcutil.repo_components(path):
+ assert c_type == b'path'
lui.readconfig(rc_path, root=path)
if rpath:
@@ -965,7 +966,8 @@
path = path_obj.rawloc
lui = ui.copy()
if rcutil.use_repo_hgrc():
- for rc_path in rcutil.repo_components(path):
+ for c_type, rc_path in rcutil.repo_components(path):
+ assert c_type == b'path'
lui.readconfig(rc_path, root=path)
if oldcwd: