[PATCH] hgweb: allow web.templates to be a list

Ross Light light at google.com
Fri Jul 8 19:07:11 EDT 2016


# HG changeset patch
# User Ross Light <light at google.com>
# Date 1468018129 25200
#      Fri Jul 08 15:48:49 2016 -0700
# Node ID 0611009f75ac6e0c661207927ed9606b83b56d28
# Parent  b4d117cee636be8a566f56e84d4b351a736a1299
hgweb: allow web.templates to be a list

templater already supports searching multiple directories, but the config value
was read in as one string. This allows the web.templates setting to use this
functionality.

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -2093,8 +2093,8 @@
     Example: ``monoblue``.

 ``templates``
-    Where to find the HTML templates. The default path to the HTML templates
-    can be obtained from ``hg debuginstall``.
+    List of directories to search for the HTML templates. The default path
+    to the HTML templates can be obtained from ``hg debuginstall``.

 ``websub``
 ----------
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
@@ -99,7 +99,7 @@
         # we use untrusted=False to prevent a repo owner from using
         # web.templates in .hg/hgrc to get access to any file readable
         # by the user running the CGI script
-        self.templatepath = self.config('web', 'templates', untrusted=False)
+        self.templatepath = self.configlist('web', 'templates',
untrusted=False)

         # This object is more expensive to build than simple config values.
         # It is shared across requests. The app will replace the object


More information about the Mercurial-devel mailing list