This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8788

hgweb: simplify now that we always have a single path
ClosedPublic

Authored by martinvonz on Jul 22 2020, 1:24 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG86f9b25d750b: hgweb: simplify now that we always have a single path
Summary

Both templatedir() and web.templatepath are now always a single
path (or None).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 22 2020, 1:24 AM
pulkit accepted this revision.Jul 22 2020, 7:32 AM
This revision is now accepted and ready to land.Jul 22 2020, 7:32 AM
martinvonz added a commit: rHG86f9b25d750b: hgweb: simplify now that we always have a single path.Jul 22 2020, 8:16 AM
Closed by commit rHG86f9b25d750b: hgweb: simplify now that we always have a single path (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22040

mercurial/hgweb/hgwebdir_mod.py

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)

mercurial/hgweb/webcommands.py

@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):
""" """