[PATCH] hgweb: allow web.templates to be a list
Yuya Nishihara
yuya at tcha.org
Sun Jul 17 06:28:30 EDT 2016
On Wed, 13 Jul 2016 13:10:02 -0700, Ross Light wrote:
> # HG changeset patch
> # User Ross Light <light at google.com>
> # Date 1468018129 25200
> # Fri Jul 08 15:48:49 2016 -0700
> # Node ID f93fdaa22399c1dcaa82034a73c04cafcf45bb4e
> # Parent 1b38cfde9530331d8d5767aa09a0de7d90931845
> 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,8 @@
> # 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) or None
Dropped this from patchwork per the discussion in the previous thread.
s/config/configlist/ is backward incompatible.
More information about the Mercurial-devel
mailing list