This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8936

hgweb: minimize scope of a try-block in staticfile()
ClosedPublic

Authored by martinvonz on Aug 19 2020, 12:42 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf0735f2ce542: hgweb: minimize scope of a try-block in staticfile()
Summary

I think the exceptions are only relevant for the os.stat() and
open() calls, and maybe to the fh.read() call.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Aug 19 2020, 12:42 AM
indygreg accepted this revision.Aug 22 2020, 6:39 PM
This revision is now accepted and ready to land.Aug 22 2020, 6:39 PM
martinvonz added a commit: rHGf0735f2ce542: hgweb: minimize scope of a try-block in staticfile().Aug 22 2020, 7:32 PM
Closed by commit rHGf0735f2ce542: hgweb: minimize scope of a try-block in staticfile() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/common.py (14 lines)

Diff 22415

mercurial/hgweb/common.py

return return
if not directory: if not directory:
tp = templatepath or templater.templatedir() tp = templatepath or templater.templatedir()
if tp is not None: if tp is not None:
directory = os.path.join(tp, b'static') 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)
try:
os.stat(path)
ct = pycompat.sysbytes( ct = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(fpath))[0] or r"text/plain" mimetypes.guess_type(pycompat.fsdecode(fpath))[0] or r"text/plain"
) )
path = os.path.join(directory, fpath)
try:
os.stat(path)
with open(path, b'rb') as fh: with open(path, b'rb') as fh:
data = fh.read() data = fh.read()
res.headers[b'Content-Type'] = ct
res.setbodybytes(data)
return res
except TypeError: except TypeError:
raise ErrorResponse(HTTP_SERVER_ERROR, b'illegal filename') raise ErrorResponse(HTTP_SERVER_ERROR, b'illegal filename')
except OSError as err: except OSError as err:
if err.errno == errno.ENOENT: if err.errno == errno.ENOENT:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
else: else:
raise ErrorResponse( raise ErrorResponse(
HTTP_SERVER_ERROR, encoding.strtolocal(err.strerror) HTTP_SERVER_ERROR, encoding.strtolocal(err.strerror)
) )
res.headers[b'Content-Type'] = ct
res.setbodybytes(data)
return res
def paritygen(stripecount, offset=0): def paritygen(stripecount, offset=0):
"""count parity of horizontal stripes for easier reading""" """count parity of horizontal stripes for easier reading"""
if stripecount and offset: if stripecount and offset:
# account for offset, e.g. due to building the list in reverse # account for offset, e.g. due to building the list in reverse
count = (stripecount + offset) % stripecount count = (stripecount + offset) % stripecount
parity = (stripecount + offset) // stripecount & 1 parity = (stripecount + offset) // stripecount & 1
else: else: