diff mercurial/dispatch.py @ 44244:ef11dfc56674 stable

config: also respect HGRCSKIPREPO in `dispatch._getlocal` For some reason, we are also reading the local config in that function. Differential Revision: https://phab.mercurial-scm.org/D8073
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Feb 2020 20:41:11 +0100
parents 6b90f5c89cb4
children a0ec05d93c8e
line wrap: on
line diff
--- a/mercurial/dispatch.py	Tue Feb 04 12:31:19 2020 +0100
+++ b/mercurial/dispatch.py	Mon Feb 03 20:41:11 2020 +0100
@@ -37,6 +37,7 @@
     hook,
     profiling,
     pycompat,
+    rcutil,
     registrar,
     scmutil,
     ui as uimod,
@@ -902,17 +903,20 @@
                 _(b"error getting current working directory: %s")
                 % encoding.strtolocal(e.strerror)
             )
+
     path = cmdutil.findrepo(wd) or b""
     if not path:
         lui = ui
     else:
         lui = ui.copy()
-        lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
+        if rcutil.use_repo_hgrc():
+            lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
 
     if rpath:
         path = lui.expandpath(rpath)
         lui = ui.copy()
-        lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
+        if rcutil.use_repo_hgrc():
+            lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
 
     return path, lui