[Updated] D8806: templater: don't normalize path separators to '/' when interacting with OS

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG28840ef52f71: templater: don't normalize path separators to '/' when interacting with OS (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/D8806?vs=22145&id=22183

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

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

AFFECTED FILES
  mercurial/templater.py

CHANGE DETAILS

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -848,17 +848,17 @@
     val = conf.get(b'templates', b'__base__')
     if val and val[0] not in b"'\"":
         # treat as a pointer to a base class for this style
-        path = util.normpath(os.path.join(base, val))
+        path = os.path.normpath(os.path.join(base, val))
 
         # fallback check in template paths
         if not os.path.exists(path):
             dir = templatedir()
             if dir is not None:
-                p2 = util.normpath(os.path.join(dir, val))
+                p2 = os.path.normpath(os.path.join(dir, val))
                 if os.path.isfile(p2):
                     path = p2
                 else:
-                    p3 = util.normpath(os.path.join(p2, b"map"))
+                    p3 = os.path.normpath(os.path.join(p2, b"map"))
                     if os.path.isfile(p3):
                         path = p3
 



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/7e840b4a/attachment-0002.html>