Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: register web.static to the config table
authorYuya Nishihara <yuya@tcha.org>
Sun, 23 Sep 2018 16:15:48 +0900
changeset 39809 536f22d6c2c5
parent 39808 ff0060d2a099
child 39810 4f44f747f094
hgweb: register web.static to the config table Otherwise we would got a develwarn.
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/hgweb/hgwebdir_mod.py file | annotate | diff | comparison | revisions
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions 
--- 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):
hg-stable