This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2020

hgweb: move call to protocol handler outside of try..except
ClosedPublic

Authored by indygreg on Feb 2 2018, 8:50 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGe69e65b2b4a9: hgweb: move call to protocol handler outside of try..except
Summary

The protocol handler doesn't raise ErrorResponse. So it doesn't
need to be in this try..except ErrorResponse block.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 2 2018, 8:50 PM
durin42 accepted this revision.Feb 7 2018, 5:18 PM
This revision is now accepted and ready to land.Feb 7 2018, 5:18 PM
Closed by commit rHGe69e65b2b4a9: hgweb: move call to protocol handler outside of try..except (authored by indygreg). · Explain WhyFeb 7 2018, 5:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgweb_mod.py (3 lines)

Diff 5174

mercurial/hgweb/hgweb_mod.py

if protohandler: if protohandler:
cmd = protohandler['cmd'] cmd = protohandler['cmd']
try: try:
if query: if query:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
if cmd in perms: if cmd in perms:
self.check_perm(rctx, req, perms[cmd]) self.check_perm(rctx, req, perms[cmd])
return protohandler['dispatch']()
except ErrorResponse as inst: except ErrorResponse as inst:
# A client that sends unbundle without 100-continue will # A client that sends unbundle without 100-continue will
# break if we respond early. # break if we respond early.
if (cmd == 'unbundle' and if (cmd == 'unbundle' and
(req.env.get('HTTP_EXPECT', (req.env.get('HTTP_EXPECT',
'').lower() != '100-continue') or '').lower() != '100-continue') or
req.env.get('X-HgHttp2', '')): req.env.get('X-HgHttp2', '')):
req.drain() req.drain()
else: else:
req.headers.append((r'Connection', r'Close')) req.headers.append((r'Connection', r'Close'))
req.respond(inst, wireprotoserver.HGTYPE, req.respond(inst, wireprotoserver.HGTYPE,
body='0\n%s\n' % inst) body='0\n%s\n' % inst)
return '' return ''
return protohandler['dispatch']()
# translate user-visible url structure to internal structure # translate user-visible url structure to internal structure
args = query.split('/', 2) args = query.split('/', 2)
if r'cmd' not in req.form and args and args[0]: if r'cmd' not in req.form and args and args[0]:
cmd = args.pop(0) cmd = args.pop(0)
style = cmd.rfind('-') style = cmd.rfind('-')
if style != -1: if style != -1:
req.form['style'] = [cmd[:style]] req.form['style'] = [cmd[:style]]