hgwebdir: honor web.templates and web.static for static files (
issue3734)
--- a/mercurial/hgweb/hgwebdir_mod.py Fri Dec 28 14:10:35 2012 +0100
+++ b/mercurial/hgweb/hgwebdir_mod.py Sat Dec 22 18:11:51 2012 -0600
@@ -184,7 +184,13 @@
fname = virtual[7:]
else:
fname = req.form['static'][0]
- static = templater.templatepath('static')
+ static = self.ui.config("web", "static", None,
+ untrusted=False)
+ if not static:
+ tp = self.templatepath or templater.templatepath()
+ if isinstance(tp, str):
+ tp = [tp]
+ static = [os.path.join(p, 'static') for p in tp]
return (staticfile(static, fname, req),)
# top-level index