| pulkit |
| hg-reviewers |
Both templatedir() and web.templatepath are now always a single
path (or None).
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgwebdir_mod.py (4 lines) | |||
| M | mercurial/hgweb/webcommands.py (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| e083a1f5e5c3 | 0d853732a7bd | Martin von Zweigbergk | Jul 21 2020, 4:36 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if virtual.startswith(b'static/') or b'static' in req.qsparams: | if virtual.startswith(b'static/') or b'static' in req.qsparams: | ||||
| if virtual.startswith(b'static/'): | if virtual.startswith(b'static/'): | ||||
| fname = virtual[7:] | fname = virtual[7:] | ||||
| else: | else: | ||||
| fname = req.qsparams[b'static'] | fname = req.qsparams[b'static'] | ||||
| static = self.ui.config(b"web", b"static", untrusted=False) | static = self.ui.config(b"web", b"static", untrusted=False) | ||||
| if not static: | if not static: | ||||
| tp = self.templatepath or templater.templatedir() | tp = self.templatepath or templater.templatedir() | ||||
| if isinstance(tp, bytes): | static = [os.path.join(tp, b'static')] | ||||
| tp = [tp] | |||||
| static = [os.path.join(p, b'static') for p in tp] | |||||
| staticfile(static, fname, res) | staticfile(static, fname, res) | ||||
| return res.sendresponse() | return res.sendresponse() | ||||
| # top-level index | # top-level index | ||||
| repos = dict(self.repos) | repos = dict(self.repos) | ||||
| @webcommand(b'static') | @webcommand(b'static') | ||||
| def static(web): | def static(web): | ||||
| fname = web.req.qsparams[b'file'] | fname = web.req.qsparams[b'file'] | ||||
| # a repo owner may set web.static in .hg/hgrc to get any file | # a repo owner may set web.static in .hg/hgrc to get any file | ||||
| # readable by the user running the CGI script | # readable by the user running the CGI script | ||||
| static = web.config(b"web", b"static", untrusted=False) | static = web.config(b"web", b"static", untrusted=False) | ||||
| if not static: | if not static: | ||||
| tp = web.templatepath or templater.templatedir() | tp = web.templatepath or templater.templatedir() | ||||
| if isinstance(tp, bytes): | static = [os.path.join(tp, b'static')] | ||||
| tp = [tp] | |||||
| static = [os.path.join(p, b'static') for p in tp] | |||||
| staticfile(static, fname, web.res) | staticfile(static, fname, web.res) | ||||
| return web.res.sendresponse() | return web.res.sendresponse() | ||||
| @webcommand(b'graph') | @webcommand(b'graph') | ||||
| def graph(web): | def graph(web): | ||||
| """ | """ | ||||