Mercurial > hg-stable
changeset 39809:536f22d6c2c5
hgweb: register web.static to the config table
Otherwise we would got a develwarn.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 23 Sep 2018 16:15:48 +0900 |
| parents | ff0060d2a099 |
| children | 4f44f747f094 |
| files | mercurial/configitems.py mercurial/hgweb/hgwebdir_mod.py mercurial/hgweb/webcommands.py |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/configitems.py Sun Sep 23 17:01:26 2018 +0900 +++ b/mercurial/configitems.py Sun Sep 23 16:15:48 2018 +0900 @@ -1352,6 +1352,9 @@ coreconfigitem('web', 'server-header', default=None, ) +coreconfigitem('web', 'static', + default=None, +) coreconfigitem('web', 'staticurl', default=None, )
--- a/mercurial/hgweb/hgwebdir_mod.py Sun Sep 23 17:01:26 2018 +0900 +++ b/mercurial/hgweb/hgwebdir_mod.py Sun Sep 23 16:15:48 2018 +0900 @@ -383,8 +383,7 @@ fname = virtual[7:] else: fname = req.qsparams['static'] - static = self.ui.config("web", "static", None, - untrusted=False) + static = self.ui.config("web", "static", untrusted=False) if not static: tp = self.templatepath or templater.templatepaths() if isinstance(tp, str):
--- a/mercurial/hgweb/webcommands.py Sun Sep 23 17:01:26 2018 +0900 +++ b/mercurial/hgweb/webcommands.py Sun Sep 23 16:15:48 2018 +0900 @@ -1221,7 +1221,7 @@ fname = web.req.qsparams['file'] # a repo owner may set web.static in .hg/hgrc to get any file # readable by the user running the CGI script - static = web.config("web", "static", None, untrusted=False) + static = web.config("web", "static", untrusted=False) if not static: tp = web.templatepath or templater.templatepaths() if isinstance(tp, str):