| durin42 |
| hg-reviewers |
The protocol handler doesn't raise ErrorResponse. So it doesn't
need to be in this try..except ErrorResponse block.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| 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]] | ||||