| indygreg |
| hg-reviewers |
This reduces duplication between the two callers.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/common.py (8 lines) | |||
| M | mercurial/hgweb/hgwebdir_mod.py (7 lines) | |||
| M | mercurial/hgweb/webcommands.py (8 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| from ..pycompat import ( | from ..pycompat import ( | ||||
| getattr, | getattr, | ||||
| open, | open, | ||||
| ) | ) | ||||
| from .. import ( | from .. import ( | ||||
| encoding, | encoding, | ||||
| pycompat, | pycompat, | ||||
| templater, | |||||
| util, | util, | ||||
| ) | ) | ||||
| httpserver = util.httpserver | httpserver = util.httpserver | ||||
| HTTP_OK = 200 | HTTP_OK = 200 | ||||
| HTTP_CREATED = 201 | HTTP_CREATED = 201 | ||||
| HTTP_NOT_MODIFIED = 304 | HTTP_NOT_MODIFIED = 304 | ||||
| or pycompat.osaltsep is not None | or pycompat.osaltsep is not None | ||||
| and pycompat.osaltsep in part | and pycompat.osaltsep in part | ||||
| ): | ): | ||||
| return False | return False | ||||
| return True | return True | ||||
| def staticfile(directory, fname, res): | def staticfile(templatepath, directory, fname, res): | ||||
| """return a file inside directory with guessed Content-Type header | """return a file inside directory with guessed Content-Type header | ||||
| fname always uses '/' as directory separator and isn't allowed to | fname always uses '/' as directory separator and isn't allowed to | ||||
| contain unusual path components. | contain unusual path components. | ||||
| Content-Type is guessed using the mimetypes module. | Content-Type is guessed using the mimetypes module. | ||||
| Return an empty string if fname is illegal or file not found. | Return an empty string if fname is illegal or file not found. | ||||
| """ | """ | ||||
| if not ispathsafe(fname): | if not ispathsafe(fname): | ||||
| return | return | ||||
| if not directory: | |||||
| tp = templatepath or templater.templatedir() | |||||
| if tp is not None: | |||||
| directory = os.path.join(tp, b'static') | |||||
| fpath = os.path.join(*fname.split(b'/')) | fpath = os.path.join(*fname.split(b'/')) | ||||
| path = os.path.join(directory, fpath) | path = os.path.join(directory, fpath) | ||||
| try: | try: | ||||
| os.stat(path) | os.stat(path) | ||||
| ct = pycompat.sysbytes( | ct = pycompat.sysbytes( | ||||
| mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain" | mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain" | ||||
| ) | ) | ||||
| with open(path, b'rb') as fh: | with open(path, b'rb') as fh: | ||||
| # a static file | # a static file | ||||
| 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: | staticfile(self.templatepath, static, fname, res) | ||||
| tp = self.templatepath or templater.templatedir() | |||||
| if tp is not None: | |||||
| static = os.path.join(tp, b'static') | |||||
| staticfile(static, fname, res) | |||||
| return res.sendresponse() | return res.sendresponse() | ||||
| # top-level index | # top-level index | ||||
| repos = dict(self.repos) | repos = dict(self.repos) | ||||
| if (not virtual or virtual == b'index') and virtual not in repos: | if (not virtual or virtual == b'index') and virtual not in repos: | ||||
| return self.makeindex(req, res, tmpl) | return self.makeindex(req, res, tmpl) | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| graphmod, | graphmod, | ||||
| pycompat, | pycompat, | ||||
| revset, | revset, | ||||
| revsetlang, | revsetlang, | ||||
| scmutil, | scmutil, | ||||
| smartset, | smartset, | ||||
| templater, | |||||
| templateutil, | templateutil, | ||||
| ) | ) | ||||
| from ..utils import stringutil | from ..utils import stringutil | ||||
| from . import webutil | from . import webutil | ||||
| __all__ = [] | __all__ = [] | ||||
| @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: | staticfile(web.templatepath, static, fname, web.res) | ||||
| tp = web.templatepath or templater.templatedir() | |||||
| if tp is not None: | |||||
| static = os.path.join(tp, b'static') | |||||
| 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): | ||||
| """ | """ | ||||
| /graph[/{revision}] | /graph[/{revision}] | ||||
| ------------------- | ------------------- | ||||