Patchwork D8900: hgweb: rely on open_template()'s fallback to using templatedir()

login
register
mail settings
Submitter phabricator
Date Aug. 5, 2020, 10:05 p.m.
Message ID <differential-rev-PHID-DREV-4jjhprznflgw6c47odfe-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46998/
State Superseded
Headers show

Comments

phabricator - Aug. 5, 2020, 10:05 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/hgweb/hgweb_mod.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -65,26 +65,22 @@ 
     3. templatepath/map
     """
 
-    if path is None:
-        path = templater.templatedir()
+    for style in styles:
+        # only plain name is allowed to honor template paths
+        if (
+            not style
+            or style in (pycompat.oscurdir, pycompat.ospardir)
+            or pycompat.ossep in style
+            or pycompat.osaltsep
+            and pycompat.osaltsep in style
+        ):
+            continue
+        locations = (os.path.join(style, b'map'), b'map-' + style, b'map')
 
-    if path is not None:
-        for style in styles:
-            # only plain name is allowed to honor template paths
-            if (
-                not style
-                or style in (pycompat.oscurdir, pycompat.ospardir)
-                or pycompat.ossep in style
-                or pycompat.osaltsep
-                and pycompat.osaltsep in style
-            ):
-                continue
-            locations = (os.path.join(style, b'map'), b'map-' + style, b'map')
-
-            for location in locations:
-                mapfile, fp = templater.open_template(location, path)
-                if mapfile:
-                    return style, mapfile
+        for location in locations:
+            mapfile, fp = templater.open_template(location, path)
+            if mapfile:
+                return style, mapfile
 
     raise RuntimeError(b"No hgweb templates found in %r" % path)