[Updated] D8795: config: re-calculate absolute %include path in `include` callback

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG83ca8d6f3206: config: re-calculate absolute %include path in `include` callback (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8795?vs=22058&id=22178

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8795/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8795

AFFECTED FILES
  mercurial/config.py

CHANGE DETAILS

diff --git a/mercurial/config.py b/mercurial/config.py
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -213,7 +213,10 @@
             % (fp, fp.mode,)
         )
 
+        dir = os.path.dirname(path)
+
         def include(rel, abs, remap, sections):
+            abs = os.path.normpath(os.path.join(dir, rel))
             self.read(abs, remap=remap, sections=sections)
 
         self.parse(



To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/7df1af78/attachment-0002.html>