| durin42 |
| hg-reviewers |
The code is minimal. I'm trying to create a cleaner break between
version 1 and version 2 server code.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/wireproto.py (14 lines) | |||
| M | mercurial/wireprotov2server.py (13 lines) |
| extensions that need commands to operate on different repo views under | extensions that need commands to operate on different repo views under | ||||
| specialized circumstances. | specialized circumstances. | ||||
| """ | """ | ||||
| return repo.filtered('served') | return repo.filtered('served') | ||||
| def dispatch(repo, proto, command): | def dispatch(repo, proto, command): | ||||
| repo = getdispatchrepo(repo, proto, command) | repo = getdispatchrepo(repo, proto, command) | ||||
| transportversion = wireprototypes.TRANSPORTS[proto.name]['version'] | func, spec = commands[command] | ||||
| commandtable = commandsv2 if transportversion == 2 else commands | |||||
| func, spec = commandtable[command] | |||||
| args = proto.getargs(spec) | args = proto.getargs(spec) | ||||
| # Version 1 protocols define arguments as a list. Version 2 uses a dict. | |||||
| if isinstance(args, list): | |||||
| return func(repo, proto, *args) | return func(repo, proto, *args) | ||||
| elif isinstance(args, dict): | |||||
| return func(repo, proto, **args) | |||||
| else: | |||||
| raise error.ProgrammingError('unexpected type returned from ' | |||||
| 'proto.getargs(): %s' % type(args)) | |||||
| def options(cmd, keys, others): | def options(cmd, keys, others): | ||||
| opts = {} | opts = {} | ||||
| for k in keys: | for k in keys: | ||||
| if k in others: | if k in others: | ||||
| opts[k] = others[k] | opts[k] = others[k] | ||||
| del others[k] | del others[k] | ||||
| if others: | if others: | ||||
| if reqcommand != command['command']: | if reqcommand != command['command']: | ||||
| # TODO define proper error mechanism | # TODO define 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(_('command in frame must match command in URL')) | res.setbodybytes(_('command in frame must match command in URL')) | ||||
| return True | return True | ||||
| rsp = wireproto.dispatch(repo, proto, command['command']) | rsp = dispatch(repo, proto, command['command']) | ||||
| res.status = b'200 OK' | res.status = b'200 OK' | ||||
| res.headers[b'Content-Type'] = FRAMINGTYPE | res.headers[b'Content-Type'] = FRAMINGTYPE | ||||
| if isinstance(rsp, wireprototypes.cborresponse): | if isinstance(rsp, wireprototypes.cborresponse): | ||||
| encoded = cbor.dumps(rsp.value, canonical=True) | encoded = cbor.dumps(rsp.value, canonical=True) | ||||
| action, meta = reactor.oncommandresponseready(outstream, | action, meta = reactor.oncommandresponseready(outstream, | ||||
| command['requestid'], | command['requestid'], | ||||
| res.setbodygen(meta['framegen']) | res.setbodygen(meta['framegen']) | ||||
| return True | return True | ||||
| elif action == 'noop': | elif action == 'noop': | ||||
| return False | return False | ||||
| else: | else: | ||||
| raise error.ProgrammingError('unhandled event from reactor: %s' % | raise error.ProgrammingError('unhandled event from reactor: %s' % | ||||
| action) | action) | ||||
| def getdispatchrepo(repo, proto, command): | |||||
| return repo.filtered('served') | |||||
| def dispatch(repo, proto, command): | |||||
| repo = getdispatchrepo(repo, proto, command) | |||||
| func, spec = wireproto.commandsv2[command] | |||||
| args = proto.getargs(spec) | |||||
| return func(repo, proto, **args) | |||||
| @zi.implementer(wireprototypes.baseprotocolhandler) | @zi.implementer(wireprototypes.baseprotocolhandler) | ||||
| class httpv2protocolhandler(object): | class httpv2protocolhandler(object): | ||||
| def __init__(self, req, ui, args=None): | def __init__(self, req, ui, args=None): | ||||
| self._req = req | self._req = req | ||||
| self._ui = ui | self._ui = ui | ||||
| self._args = args | self._args = args | ||||
| @property | @property | ||||