| pulkit |
| hg-reviewers |
Capture various TODOs and return an explicit value. This
represents feedback from Yuya and Augie on various commits.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/help/internals/wireprotocol.txt (2 lines) | |||
| M | mercurial/wireprotoserver.py (4 lines) |
| *labels* data. | *labels* data. | ||||
| * An array of 16-bit unsigned integers denoting the lengths of | * An array of 16-bit unsigned integers denoting the lengths of | ||||
| formatting strings. | formatting strings. | ||||
| * The formatting string, encoded as UTF-8. | * The formatting string, encoded as UTF-8. | ||||
| * 0 or more ASCII strings defining labels to apply to this atom. | * 0 or more ASCII strings defining labels to apply to this atom. | ||||
| * 0 or more UTF-8 strings that will be used as arguments to the | * 0 or more UTF-8 strings that will be used as arguments to the | ||||
| formatting string. | formatting string. | ||||
| TODO use ASCII for formatting string. | |||||
| All data to be printed MUST be encoded into a single frame: this frame | All data to be printed MUST be encoded into a single frame: this frame | ||||
| does not support spanning data across multiple frames. | does not support spanning data across multiple frames. | ||||
| All textual data encoded in these frames is assumed to be line delimited. | All textual data encoded in these frames is assumed to be line delimited. | ||||
| The last atom in the frame SHOULD end with a newline (``\n``). If it | The last atom in the frame SHOULD end with a newline (``\n``). If it | ||||
| doesn't, clients MAY add a newline to facilitate immediate printing. | doesn't, clients MAY add a newline to facilitate immediate printing. | ||||
| Issuing Commands | Issuing Commands | ||||
| if (not wireproto.commands.commandavailable(command, proto) | if (not wireproto.commands.commandavailable(command, proto) | ||||
| and command not in extracommands): | and command not in extracommands): | ||||
| res.status = b'404 Not Found' | res.status = b'404 Not Found' | ||||
| res.headers[b'Content-Type'] = b'text/plain' | res.headers[b'Content-Type'] = b'text/plain' | ||||
| res.setbodybytes(_('invalid wire protocol command: %s') % command) | res.setbodybytes(_('invalid wire protocol command: %s') % command) | ||||
| return | return | ||||
| # TODO consider cases where proxies may add additional Accept headers. | |||||
| if req.headers.get(b'Accept') != FRAMINGTYPE: | if req.headers.get(b'Accept') != FRAMINGTYPE: | ||||
| res.status = b'406 Not Acceptable' | res.status = b'406 Not Acceptable' | ||||
| res.headers[b'Content-Type'] = b'text/plain' | res.headers[b'Content-Type'] = b'text/plain' | ||||
| res.setbodybytes(_('client MUST specify Accept header with value: %s\n') | res.setbodybytes(_('client MUST specify Accept header with value: %s\n') | ||||
| % FRAMINGTYPE) | % FRAMINGTYPE) | ||||
| return | return | ||||
| if req.headers.get(b'Content-Type') != FRAMINGTYPE: | if req.headers.get(b'Content-Type') != FRAMINGTYPE: | ||||
| if not wireproto.commands.commandavailable(command['command'], proto): | if not wireproto.commands.commandavailable(command['command'], proto): | ||||
| # TODO proper error mechanism | # TODO proper error mechanism | ||||
| res.status = b'200 OK' | res.status = b'200 OK' | ||||
| res.headers[b'Content-Type'] = b'text/plain' | res.headers[b'Content-Type'] = b'text/plain' | ||||
| res.setbodybytes(_('wire protocol command not available: %s') % | res.setbodybytes(_('wire protocol command not available: %s') % | ||||
| command['command']) | command['command']) | ||||
| return True | return True | ||||
| # TODO don't use assert here, since it may be elided by -O. | |||||
| assert authedperm in (b'ro', b'rw') | assert authedperm in (b'ro', b'rw') | ||||
| wirecommand = wireproto.commands[command['command']] | wirecommand = wireproto.commands[command['command']] | ||||
| assert wirecommand.permission in ('push', 'pull') | assert wirecommand.permission in ('push', 'pull') | ||||
| if authedperm == b'ro' and wirecommand.permission != 'pull': | if authedperm == b'ro' and wirecommand.permission != 'pull': | ||||
| # TODO proper error mechanism | # TODO proper error mechanism | ||||
| res.status = b'403 Forbidden' | res.status = b'403 Forbidden' | ||||
| res.headers[b'Content-Type'] = b'text/plain' | res.headers[b'Content-Type'] = b'text/plain' | ||||
| else: | else: | ||||
| action, meta = reactor.onapplicationerror( | action, meta = reactor.onapplicationerror( | ||||
| _('unhandled response type from wire proto command')) | _('unhandled response type from wire proto command')) | ||||
| if action == 'sendframes': | if action == 'sendframes': | ||||
| res.setbodygen(meta['framegen']) | res.setbodygen(meta['framegen']) | ||||
| return True | return True | ||||
| elif action == 'noop': | elif action == 'noop': | ||||
| pass | return False | ||||
| else: | else: | ||||
| raise error.ProgrammingError('unhandled event from reactor: %s' % | raise error.ProgrammingError('unhandled event from reactor: %s' % | ||||
| action) | action) | ||||
| # Maps API name to metadata so custom API can be registered. | # Maps API name to metadata so custom API can be registered. | ||||
| API_HANDLERS = { | API_HANDLERS = { | ||||
| HTTPV2: { | HTTPV2: { | ||||
| 'config': ('experimental', 'web.api.http-v2'), | 'config': ('experimental', 'web.api.http-v2'), | ||||