mercurial-scm/hg: mercurial/wireprotov2server.py annotate

annotate mercurial/wireprotov2server.py @ 39878:3e896b51aa5d

storageutil: move metadata parsing and packing from revlog (API) Parsing and writing of revision text metadata is likely identical across storage backends. Let's move the code out of revlog so we don't need to import the revlog module in order to use it. Differential Revision: https://phab.mercurial-scm.org/D4754

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 24 Sep 2018 14:31:31 -0700
parents	7b752bf08435
children	582676acaf6d

rev	line source
5598 d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	2 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	3 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8109 diff changeset	4 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9713 diff changeset	5 # GNU General Public License version 2 or any later version.
5598 d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	6
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	7 from __future__ import absolute_import
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	8
36066 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	9 import contextlib
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	10
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	11 from .i18n import _
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	12 from .node import (
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	13 hex,
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	14 nullid,
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	15 )
35856 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	16 from . import (
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	17 discovery,
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	18 encoding,
34509 e21f274cccea hgweb: in protocol adapter, avoid control reaching end of non-void function Augie Fackler <augie@google.com> parents: 33821 diff changeset	19 error,
39811 ae20f52437e9 wireprotov2: advertise recognized path filter prefixes Gregory Szorc <gregory.szorc@gmail.com> parents: 39810 diff changeset	20 narrowspec,
34742 5a9cad0dfddb hgweb: when unpacking args from request form, convert to bytes Augie Fackler <augie@google.com> parents: 34740 diff changeset	21 pycompat,
37657 23c4ddda7bbe wireproto: expose repository formats via capabilities Gregory Szorc <gregory.szorc@gmail.com> parents: 37653 diff changeset	22 streamclone,
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	23 util,
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	24 wireprotoframing,
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	25 wireprototypes,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	26 )
37810 856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37784 diff changeset	27 from .utils import (
856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37784 diff changeset	28 interfaceutil,
39837 69b4a5b89dc5 py3: cast exception to bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 39828 diff changeset	29 stringutil,
37810 856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37784 diff changeset	30 )
35856 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	31
37725 3ea8323d6f95 wireprotov2: change command response protocol to include a leading map Gregory Szorc <gregory.szorc@gmail.com> parents: 37724 diff changeset	32 FRAMINGTYPE = b'application/mercurial-exp-framing-0005'
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	33
37644 77c9ee77687c wireproto: rename HTTPV2 so it less like HTTP/2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37557 diff changeset	34 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
35976 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35900 diff changeset	35
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	36 COMMANDS = wireprototypes.commanddict()
ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	37
37545 93397c4633f6 wireproto: extract HTTP version 2 code to own module Gregory Szorc <gregory.szorc@gmail.com> parents: 37535 diff changeset	38 def handlehttpv2request(rctx, req, res, checkperm, urlparts):
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	39 from .hgweb import common as hgwebcommon
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	40
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	41 # URL space looks like: <permissions>/<command>, where <permission> can
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	42 # be ``ro`` or ``rw`` to signal read-only or read-write, respectively.
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	43
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	44 # Root URL does nothing meaningful... yet.
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	45 if not urlparts:
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	46 res.status = b'200 OK'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	47 res.headers[b'Content-Type'] = b'text/plain'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	48 res.setbodybytes(_('HTTP version 2 API handler'))
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	49 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	50
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	51 if len(urlparts) == 1:
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	52 res.status = b'404 Not Found'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	53 res.headers[b'Content-Type'] = b'text/plain'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	54 res.setbodybytes(_('do not know how to process %s\n') %
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	55 req.dispatchpath)
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	56 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	57
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	58 permission, command = urlparts[0:2]
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	59
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	60 if permission not in (b'ro', b'rw'):
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	61 res.status = b'404 Not Found'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	62 res.headers[b'Content-Type'] = b'text/plain'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	63 res.setbodybytes(_('unknown permission: %s') % permission)
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	64 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	65
37048 fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	66 if req.method != 'POST':
fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	67 res.status = b'405 Method Not Allowed'
fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	68 res.headers[b'Allow'] = b'POST'
fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	69 res.setbodybytes(_('commands require POST requests'))
fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	70 return
fc5e261915b9 wireproto: require POST for all HTTPv2 requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37047 diff changeset	71
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	72 # At some point we'll want to use our own API instead of recycling the
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	73 # behavior of version 1 of the wire protocol...
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	74 # TODO return reasonable responses - not responses that overload the
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	75 # HTTP status line message for error reporting.
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	76 try:
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	77 checkperm(rctx, req, 'pull' if permission == b'ro' else 'push')
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	78 except hgwebcommon.ErrorResponse as e:
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	79 res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e))
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	80 for k, v in e.headers:
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	81 res.headers[k] = v
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	82 res.setbodybytes('permission denied')
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	83 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	84
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	85 # We have a special endpoint to reflect the request back at the client.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	86 if command == b'debugreflect':
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	87 _processhttpv2reflectrequest(rctx.repo.ui, rctx.repo, req, res)
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	88 return
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	89
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	90 # Extra commands that we handle that aren't really wire protocol
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	91 # commands. Think extra hard before making this hackery available to
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	92 # extension.
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	93 extracommands = {'multirequest'}
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	94
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	95 if command not in COMMANDS and command not in extracommands:
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	96 res.status = b'404 Not Found'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	97 res.headers[b'Content-Type'] = b'text/plain'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	98 res.setbodybytes(_('unknown wire protocol command: %s\n') % command)
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	99 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	100
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	101 repo = rctx.repo
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	102 ui = repo.ui
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	103
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	104 proto = httpv2protocolhandler(req, ui)
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	105
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	106 if (not COMMANDS.commandavailable(command, proto)
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	107 and command not in extracommands):
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	108 res.status = b'404 Not Found'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	109 res.headers[b'Content-Type'] = b'text/plain'
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	110 res.setbodybytes(_('invalid wire protocol command: %s') % command)
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	111 return
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	112
37129 aaabd709df72 wireproto: review fixups Gregory Szorc <gregory.szorc@gmail.com> parents: 37120 diff changeset	113 # TODO consider cases where proxies may add additional Accept headers.
37051 40206e227412 wireproto: define and implement protocol for issuing requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37050 diff changeset	114 if req.headers.get(b'Accept') != FRAMINGTYPE:
37050 37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	115 res.status = b'406 Not Acceptable'
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	116 res.headers[b'Content-Type'] = b'text/plain'
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	117 res.setbodybytes(_('client MUST specify Accept header with value: %s\n')
37051 40206e227412 wireproto: define and implement protocol for issuing requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37050 diff changeset	118 % FRAMINGTYPE)
37050 37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	119 return
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	120
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	121 if req.headers.get(b'Content-Type') != FRAMINGTYPE:
37050 37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	122 res.status = b'415 Unsupported Media Type'
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	123 # TODO we should send a response with appropriate media type,
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	124 # since client does Accept it.
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	125 res.headers[b'Content-Type'] = b'text/plain'
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	126 res.setbodybytes(_('client MUST send Content-Type header with '
37051 40206e227412 wireproto: define and implement protocol for issuing requests Gregory Szorc <gregory.szorc@gmail.com> parents: 37050 diff changeset	127 'value: %s\n') % FRAMINGTYPE)
37050 37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	128 return
37d7a1d18b97 wireproto: define content negotiation for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37048 diff changeset	129
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	130 _processhttpv2request(ui, repo, req, res, permission, command, proto)
37046 1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36877 diff changeset	131
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	132 def _processhttpv2reflectrequest(ui, repo, req, res):
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	133 """Reads unified frame protocol request and dumps out state to client.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	134
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	135 This special endpoint can be used to help debug the wire protocol.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	136
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	137 Instead of routing the request through the normal dispatch mechanism,
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	138 we instead read all frames, decode them, and feed them into our state
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	139 tracker. We then dump the log of all that activity back out to the
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	140 client.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	141 """
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	142 import json
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	143
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	144 # Reflection APIs have a history of being abused, accidentally disclosing
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	145 # sensitive data, etc. So we have a config knob.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	146 if not ui.configbool('experimental', 'web.api.debugreflect'):
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	147 res.status = b'404 Not Found'
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	148 res.headers[b'Content-Type'] = b'text/plain'
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	149 res.setbodybytes(_('debugreflect service not available'))
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	150 return
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	151
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	152 # We assume we have a unified framing protocol request body.
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	153
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	154 reactor = wireprotoframing.serverreactor()
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	155 states = []
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	156
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	157 while True:
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	158 frame = wireprotoframing.readframe(req.bodyfh)
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	159
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	160 if not frame:
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	161 states.append(b'received: <no frame>')
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	162 break
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	163
37061 884a0c1604ad wireproto: define attr-based classes for representing frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37059 diff changeset	164 states.append(b'received: %d %d %d %s' % (frame.typeid, frame.flags,
884a0c1604ad wireproto: define attr-based classes for representing frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37059 diff changeset	165 frame.requestid,
884a0c1604ad wireproto: define attr-based classes for representing frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37059 diff changeset	166 frame.payload))
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	167
37061 884a0c1604ad wireproto: define attr-based classes for representing frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37059 diff changeset	168 action, meta = reactor.onframerecv(frame)
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	169 states.append(json.dumps((action, meta), sort_keys=True,
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	170 separators=(', ', ': ')))
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	171
37056 861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	172 action, meta = reactor.oninputeof()
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	173 meta['action'] = action
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	174 states.append(json.dumps(meta, sort_keys=True, separators=(', ',': ')))
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	175
37052 8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	176 res.status = b'200 OK'
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	177 res.headers[b'Content-Type'] = b'text/plain'
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	178 res.setbodybytes(b'\n'.join(states))
8c3c47362934 wireproto: implement basic frame reading and processing Gregory Szorc <gregory.szorc@gmail.com> parents: 37051 diff changeset	179
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	180 def _processhttpv2request(ui, repo, req, res, authedperm, reqcommand, proto):
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	181 """Post-validation handler for HTTPv2 requests.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	182
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	183 Called when the HTTP request contains unified frame-based protocol
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	184 frames for evaluation.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	185 """
37056 861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	186 # TODO Some HTTP clients are full duplex and can receive data before
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	187 # the entire request is transmitted. Figure out a way to indicate support
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	188 # for that so we can opt into full duplex mode.
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	189 reactor = wireprotoframing.serverreactor(deferoutput=True)
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	190 seencommand = False
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	191
37289 5fadc63ac99f wireproto: explicit API to create outgoing streams Gregory Szorc <gregory.szorc@gmail.com> parents: 37288 diff changeset	192 outstream = reactor.makeoutputstream()
5fadc63ac99f wireproto: explicit API to create outgoing streams Gregory Szorc <gregory.szorc@gmail.com> parents: 37288 diff changeset	193
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	194 while True:
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	195 frame = wireprotoframing.readframe(req.bodyfh)
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	196 if not frame:
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	197 break
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	198
37061 884a0c1604ad wireproto: define attr-based classes for representing frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37059 diff changeset	199 action, meta = reactor.onframerecv(frame)
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	200
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	201 if action == 'wantframe':
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	202 # Need more data before we can do anything.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	203 continue
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	204 elif action == 'runcommand':
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	205 sentoutput = _httpv2runcommand(ui, repo, req, res, authedperm,
37289 5fadc63ac99f wireproto: explicit API to create outgoing streams Gregory Szorc <gregory.szorc@gmail.com> parents: 37288 diff changeset	206 reqcommand, reactor, outstream,
5fadc63ac99f wireproto: explicit API to create outgoing streams Gregory Szorc <gregory.szorc@gmail.com> parents: 37288 diff changeset	207 meta, issubsequent=seencommand)
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	208
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	209 if sentoutput:
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	210 return
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	211
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	212 seencommand = True
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	213
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	214 elif action == 'error':
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	215 # TODO define proper error mechanism.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	216 res.status = b'200 OK'
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	217 res.headers[b'Content-Type'] = b'text/plain'
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	218 res.setbodybytes(meta['message'] + b'\n')
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	219 return
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	220 else:
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	221 raise error.ProgrammingError(
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	222 'unhandled action from frame processor: %s' % action)
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	223
37056 861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	224 action, meta = reactor.oninputeof()
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	225 if action == 'sendframes':
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	226 # We assume we haven't started sending the response yet. If we're
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	227 # wrong, the response type will raise an exception.
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	228 res.status = b'200 OK'
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	229 res.headers[b'Content-Type'] = FRAMINGTYPE
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	230 res.setbodygen(meta['framegen'])
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	231 elif action == 'noop':
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	232 pass
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	233 else:
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	234 raise error.ProgrammingError('unhandled action from frame processor: %s'
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	235 % action)
861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	236
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	237 def _httpv2runcommand(ui, repo, req, res, authedperm, reqcommand, reactor,
37289 5fadc63ac99f wireproto: explicit API to create outgoing streams Gregory Szorc <gregory.szorc@gmail.com> parents: 37288 diff changeset	238 outstream, command, issubsequent):
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	239 """Dispatch a wire protocol command made from HTTPv2 requests.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	240
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	241 The authenticated permission (``authedperm``) along with the original
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	242 command from the URL (``reqcommand``) are passed in.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	243 """
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	244 # We already validated that the session has permissions to perform the
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	245 # actions in ``authedperm``. In the unified frame protocol, the canonical
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	246 # command to run is expressed in a frame. However, the URL also requested
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	247 # to run a specific command. We need to be careful that the command we
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	248 # run doesn't have permissions requirements greater than what was granted
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	249 # by ``authedperm``.
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	250 #
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	251 # Our rule for this is we only allow one command per HTTP request and
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	252 # that command must match the command in the URL. However, we make
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	253 # an exception for the ``multirequest`` URL. This URL is allowed to
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	254 # execute multiple commands. We double check permissions of each command
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	255 # as it is invoked to ensure there is no privilege escalation.
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	256 # TODO consider allowing multiple commands to regular command URLs
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	257 # iff each command is the same.
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	258
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	259 proto = httpv2protocolhandler(req, ui, args=command['args'])
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	260
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	261 if reqcommand == b'multirequest':
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	262 if not COMMANDS.commandavailable(command['command'], proto):
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	263 # TODO proper error mechanism
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	264 res.status = b'200 OK'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	265 res.headers[b'Content-Type'] = b'text/plain'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	266 res.setbodybytes(_('wire protocol command not available: %s') %
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	267 command['command'])
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	268 return True
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	269
37129 aaabd709df72 wireproto: review fixups Gregory Szorc <gregory.szorc@gmail.com> parents: 37120 diff changeset	270 # TODO don't use assert here, since it may be elided by -O.
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	271 assert authedperm in (b'ro', b'rw')
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	272 wirecommand = COMMANDS[command['command']]
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	273 assert wirecommand.permission in ('push', 'pull')
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	274
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	275 if authedperm == b'ro' and wirecommand.permission != 'pull':
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	276 # TODO proper error mechanism
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	277 res.status = b'403 Forbidden'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	278 res.headers[b'Content-Type'] = b'text/plain'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	279 res.setbodybytes(_('insufficient permissions to execute '
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	280 'command: %s') % command['command'])
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	281 return True
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	282
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	283 # TODO should we also call checkperm() here? Maybe not if we're going
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	284 # to overhaul that API. The granted scope from the URL check should
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	285 # be good enough.
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	286
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	287 else:
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	288 # Don't allow multiple commands outside of ``multirequest`` URL.
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	289 if issubsequent:
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	290 # TODO proper error mechanism
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	291 res.status = b'200 OK'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	292 res.headers[b'Content-Type'] = b'text/plain'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	293 res.setbodybytes(_('multiple commands cannot be issued to this '
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	294 'URL'))
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	295 return True
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	296
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	297 if reqcommand != command['command']:
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	298 # TODO define proper error mechanism
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	299 res.status = b'200 OK'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	300 res.headers[b'Content-Type'] = b'text/plain'
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	301 res.setbodybytes(_('command in frame must match command in URL'))
bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	302 return True
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	303
e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	304 res.status = b'200 OK'
37055 61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	305 res.headers[b'Content-Type'] = FRAMINGTYPE
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	306
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	307 try:
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	308 objs = dispatch(repo, proto, command['command'])
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	309
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	310 action, meta = reactor.oncommandresponsereadyobjects(
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	311 outstream, command['requestid'], objs)
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	312
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	313 except error.WireprotoCommandError as e:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	314 action, meta = reactor.oncommanderror(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	315 outstream, command['requestid'], e.message, e.messageargs)
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	316
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	317 except Exception as e:
37726 0c184ca594bb wireprotov2: change behavior of error frame Gregory Szorc <gregory.szorc@gmail.com> parents: 37725 diff changeset	318 action, meta = reactor.onservererror(
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	319 outstream, command['requestid'],
39837 69b4a5b89dc5 py3: cast exception to bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 39828 diff changeset	320 _('exception when invoking command: %s') %
69b4a5b89dc5 py3: cast exception to bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 39828 diff changeset	321 stringutil.forcebytestr(e))
37055 61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	322
61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	323 if action == 'sendframes':
61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	324 res.setbodygen(meta['framegen'])
37059 bbea991635d0 wireproto: service multiple command requests per HTTP request Gregory Szorc <gregory.szorc@gmail.com> parents: 37057 diff changeset	325 return True
37056 861e9d37e56e wireproto: buffer output frames when in half duplex mode Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	326 elif action == 'noop':
37129 aaabd709df72 wireproto: review fixups Gregory Szorc <gregory.szorc@gmail.com> parents: 37120 diff changeset	327 return False
37055 61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	328 else:
61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	329 raise error.ProgrammingError('unhandled event from reactor: %s' %
61393f888dfe wireproto: define and implement responses in framing protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37054 diff changeset	330 action)
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	331
37782 99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	332 def getdispatchrepo(repo, proto, command):
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	333 return repo.filtered('served')
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	334
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	335 def dispatch(repo, proto, command):
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	336 repo = getdispatchrepo(repo, proto, command)
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	337
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	338 func, spec = COMMANDS[command]
37782 99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	339 args = proto.getargs(spec)
99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	340
39828 3ed53b071041 py3: use pycompat.strkwargs() Gregory Szorc <gregory.szorc@gmail.com> parents: 39815 diff changeset	341 return func(repo, proto, **pycompat.strkwargs(args))
37782 99accae4cc59 wireproto: reimplement dispatch() for version 2 server Gregory Szorc <gregory.szorc@gmail.com> parents: 37781 diff changeset	342
37810 856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37784 diff changeset	343 @interfaceutil.implementer(wireprototypes.baseprotocolhandler)
37296 78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	344 class httpv2protocolhandler(object):
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	345 def __init__(self, req, ui, args=None):
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	346 self._req = req
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	347 self._ui = ui
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	348 self._args = args
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	349
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	350 @property
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	351 def name(self):
37644 77c9ee77687c wireproto: rename HTTPV2 so it less like HTTP/2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37557 diff changeset	352 return HTTP_WIREPROTO_V2
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	353
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	354 def getargs(self, args):
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	355 # First look for args that were passed but aren't registered on this
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	356 # command.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	357 extra = set(self._args) - set(args)
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	358 if extra:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	359 raise error.WireprotoCommandError(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	360 'unsupported argument to command: %s' %
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	361 ', '.join(sorted(extra)))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	362
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	363 # And look for required arguments that are missing.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	364 missing = {a for a in args if args[a]['required']} - set(self._args)
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	365
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	366 if missing:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	367 raise error.WireprotoCommandError(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	368 'missing required arguments: %s' % ', '.join(sorted(missing)))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	369
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	370 # Now derive the arguments to pass to the command, taking into
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	371 # account the arguments specified by the client.
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	372 data = {}
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	373 for k, meta in sorted(args.items()):
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	374 # This argument wasn't passed by the client.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	375 if k not in self._args:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	376 data[k] = meta['default']()
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	377 continue
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	378
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	379 v = self._args[k]
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	380
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	381 # Sets may be expressed as lists. Silently normalize.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	382 if meta['type'] == 'set' and isinstance(v, list):
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	383 v = set(v)
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	384
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	385 # TODO consider more/stronger type validation.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	386
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	387 data[k] = v
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	388
37485 0b7475ea38cf wireproto: port heads command to wire protocol v2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37414 diff changeset	389 return data
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	390
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	391 def getprotocaps(self):
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	392 # Protocol capabilities are currently not implemented for HTTP V2.
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	393 return set()
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	394
37414 2d965bfeb8f6 wireproto: allow direct stream processing for unbundle Joerg Sonnenberger <joerg@bec.de> parents: 37393 diff changeset	395 def getpayload(self):
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	396 raise NotImplementedError
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	397
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	398 @contextlib.contextmanager
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	399 def mayberedirectstdio(self):
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	400 raise NotImplementedError
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	401
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	402 def client(self):
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	403 raise NotImplementedError
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	404
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	405 def addcapabilities(self, repo, caps):
37054 e7a012b60d6e wireproto: implement basic command dispatching for HTTPv2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37053 diff changeset	406 return caps
37047 fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	407
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	408 def checkperm(self, perm):
fddcb51b5084 wireproto: define permissions-based routing of HTTPv2 wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37046 diff changeset	409 raise NotImplementedError
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	410
37557 734515aca84d wireproto: define and implement HTTP handshake to upgrade protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37546 diff changeset	411 def httpv2apidescriptor(req, repo):
734515aca84d wireproto: define and implement HTTP handshake to upgrade protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37546 diff changeset	412 proto = httpv2protocolhandler(req, repo.ui)
734515aca84d wireproto: define and implement HTTP handshake to upgrade protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37546 diff changeset	413
734515aca84d wireproto: define and implement HTTP handshake to upgrade protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37546 diff changeset	414 return _capabilitiesv2(repo, proto)
734515aca84d wireproto: define and implement HTTP handshake to upgrade protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 37546 diff changeset	415
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	416 def _capabilitiesv2(repo, proto):
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	417 """Obtain the set of capabilities for version 2 transports.
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	418
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	419 These capabilities are distinct from the capabilities for version 1
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	420 transports.
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	421 """
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	422 compression = []
37783 9d818539abfa wireproto: move supportedcompengines out of wireproto Gregory Szorc <gregory.szorc@gmail.com> parents: 37782 diff changeset	423 for engine in wireprototypes.supportedcompengines(repo.ui, util.SERVERROLE):
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	424 compression.append({
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	425 b'name': engine.wireprotosupport().name,
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	426 })
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	427
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	428 caps = {
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	429 'commands': {},
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	430 'compression': compression,
37653 b2fa1591fb44 wireproto: add media type to version 2 capabilities response Gregory Szorc <gregory.szorc@gmail.com> parents: 37644 diff changeset	431 'framingmediatypes': [FRAMINGTYPE],
39811 ae20f52437e9 wireprotov2: advertise recognized path filter prefixes Gregory Szorc <gregory.szorc@gmail.com> parents: 39810 diff changeset	432 'pathfilterprefixes': set(narrowspec.VALID_PREFIXES),
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	433 }
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	434
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	435 for command, entry in COMMANDS.items():
39812 8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	436 args = {}
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	437
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	438 for arg, meta in entry.args.items():
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	439 args[arg] = {
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	440 # TODO should this be a normalized type using CBOR's
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	441 # terminology?
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	442 b'type': meta['type'],
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	443 b'required': meta['required'],
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	444 }
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	445
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	446 if not meta['required']:
8e7e822e85ec wireprotov2: expose rich arguments metadata Gregory Szorc <gregory.szorc@gmail.com> parents: 39811 diff changeset	447 args[arg][b'default'] = meta['default']()
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	448
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	449 if meta['validvalues']:
c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	450 args[arg][b'validvalues'] = meta['validvalues']
c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	451
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	452 caps['commands'][command] = {
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	453 'args': args,
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	454 'permissions': [entry.permission],
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	455 }
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	456
37657 23c4ddda7bbe wireproto: expose repository formats via capabilities Gregory Szorc <gregory.szorc@gmail.com> parents: 37653 diff changeset	457 if streamclone.allowservergeneration(repo):
23c4ddda7bbe wireproto: expose repository formats via capabilities Gregory Szorc <gregory.szorc@gmail.com> parents: 37653 diff changeset	458 caps['rawrepoformats'] = sorted(repo.requirements &
23c4ddda7bbe wireproto: expose repository formats via capabilities Gregory Szorc <gregory.szorc@gmail.com> parents: 37653 diff changeset	459 repo.supportedformats)
23c4ddda7bbe wireproto: expose repository formats via capabilities Gregory Szorc <gregory.szorc@gmail.com> parents: 37653 diff changeset	460
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	461 return proto.addcapabilities(repo, caps)
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	462
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	463 def wireprotocommand(name, args=None, permission='push'):
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	464 """Decorator to declare a wire protocol command.
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	465
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	466 ``name`` is the name of the wire protocol command being provided.
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	467
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	468 ``args`` is a dict defining arguments accepted by the command. Keys are
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	469 the argument name. Values are dicts with the following keys:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	470
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	471 ``type``
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	472 The argument data type. Must be one of the following string
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	473 literals: ``bytes``, ``int``, ``list``, ``dict``, ``set``,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	474 or ``bool``.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	475
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	476 ``default``
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	477 A callable returning the default value for this argument. If not
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	478 specified, ``None`` will be the default value.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	479
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	480 ``required``
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	481 Bool indicating whether the argument is required.
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	482
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	483 ``example``
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	484 An example value for this argument.
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	485
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	486 ``validvalues``
c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	487 Set of recognized values for this argument.
c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	488
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	489 ``permission`` defines the permission type needed to run this command.
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	490 Can be ``push`` or ``pull``. These roughly map to read-write and read-only,
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	491 respectively. Default is to assume command requires ``push`` permissions
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	492 because otherwise commands not declaring their permissions could modify
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	493 a repository that is supposed to be read-only.
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	494
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	495 Wire protocol commands are generators of objects to be serialized and
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	496 sent to the client.
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	497
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	498 If a command raises an uncaught exception, this will be translated into
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	499 a command error.
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	500 """
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	501 transports = {k for k, v in wireprototypes.TRANSPORTS.items()
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	502 if v['version'] == 2}
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	503
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	504 if permission not in ('push', 'pull'):
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	505 raise error.ProgrammingError('invalid wire protocol permission; '
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	506 'got %s; expected "push" or "pull"' %
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	507 permission)
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	508
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	509 if args is None:
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	510 args = {}
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	511
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	512 if not isinstance(args, dict):
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	513 raise error.ProgrammingError('arguments for version 2 commands '
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	514 'must be declared as dicts')
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	515
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	516 for arg, meta in args.items():
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	517 if arg == '*':
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	518 raise error.ProgrammingError('* argument name not allowed on '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	519 'version 2 commands')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	520
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	521 if not isinstance(meta, dict):
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	522 raise error.ProgrammingError('arguments for version 2 commands '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	523 'must declare metadata as a dict')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	524
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	525 if 'type' not in meta:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	526 raise error.ProgrammingError('%s argument for command %s does not '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	527 'declare type field' % (arg, name))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	528
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	529 if meta['type'] not in ('bytes', 'int', 'list', 'dict', 'set', 'bool'):
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	530 raise error.ProgrammingError('%s argument for command %s has '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	531 'illegal type: %s' % (arg, name,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	532 meta['type']))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	533
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	534 if 'example' not in meta:
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	535 raise error.ProgrammingError('%s argument for command %s does not '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	536 'declare example field' % (arg, name))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	537
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	538 if 'default' in meta and meta.get('required'):
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	539 raise error.ProgrammingError('%s argument for command %s is marked '
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	540 'as required but has a default value' %
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	541 (arg, name))
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	542
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	543 meta.setdefault('default', lambda: None)
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	544 meta.setdefault('required', False)
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	545 meta.setdefault('validvalues', None)
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	546
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	547 def register(func):
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	548 if name in COMMANDS:
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	549 raise error.ProgrammingError('%s command already registered '
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	550 'for version 2' % name)
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	551
37784 ee0d5e9d77b2 wireproto: move version 2 commands dict to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37783 diff changeset	552 COMMANDS[name] = wireprototypes.commandentry(
37780 8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	553 func, args=args, transports=transports, permission=permission)
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	554
8acd3a9ac4fd wireproto: make version 2 @wireprotocommand an independent function Gregory Szorc <gregory.szorc@gmail.com> parents: 37728 diff changeset	555 return func
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	556
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	557 return register
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	558
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	559 @wireprotocommand('branchmap', permission='pull')
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	560 def branchmapv2(repo, proto):
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	561 yield {encoding.fromlocal(k): v
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	562 for k, v in repo.branchmap().iteritems()}
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	563
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	564 @wireprotocommand('capabilities', permission='pull')
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	565 def capabilitiesv2(repo, proto):
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	566 yield _capabilitiesv2(repo, proto)
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	567
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	568 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	569 'changesetdata',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	570 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	571 'noderange': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	572 'type': 'list',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	573 'example': [[b'0123456...'], [b'abcdef...']],
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	574 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	575 'nodes': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	576 'type': 'list',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	577 'example': [b'0123456...'],
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	578 },
39815 d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	579 'nodesdepth': {
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	580 'type': 'int',
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	581 'example': 10,
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	582 },
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	583 'fields': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	584 'type': 'set',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	585 'default': set,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	586 'example': {b'parents', b'revision'},
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	587 'validvalues': {b'bookmarks', b'parents', b'phase', b'revision'},
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	588 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	589 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	590 permission='pull')
39815 d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	591 def changesetdata(repo, proto, noderange, nodes, nodesdepth, fields):
39636 399ddd3227a4 wireprotov2: add TODOs around extending changesetdata fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39634 diff changeset	592 # TODO look for unknown fields and abort when they can't be serviced.
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	593 # This could probably be validated by dispatcher using validvalues.
39636 399ddd3227a4 wireprotov2: add TODOs around extending changesetdata fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39634 diff changeset	594
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	595 if noderange is None and nodes is None:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	596 raise error.WireprotoCommandError(
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	597 'noderange or nodes must be defined')
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	598
39815 d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	599 if nodesdepth is not None and nodes is None:
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	600 raise error.WireprotoCommandError(
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	601 'nodesdepth requires the nodes argument')
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	602
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	603 if noderange is not None:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	604 if len(noderange) != 2:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	605 raise error.WireprotoCommandError(
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	606 'noderange must consist of 2 elements')
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	607
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	608 if not noderange[1]:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	609 raise error.WireprotoCommandError(
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	610 'heads in noderange request cannot be empty')
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	611
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	612 cl = repo.changelog
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	613 hasnode = cl.hasnode
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	614
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	615 seen = set()
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	616 outgoing = []
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	617
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	618 if nodes is not None:
39815 d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	619 outgoing = [n for n in nodes if hasnode(n)]
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	620
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	621 if nodesdepth:
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	622 outgoing = [cl.node(r) for r in
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	623 repo.revs(b'ancestors(%ln, %d)', outgoing,
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	624 nodesdepth - 1)]
d3d333ab167a wireprotov2: teach changesetdata to fetch ancestors until depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39814 diff changeset	625
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	626 seen \|= set(outgoing)
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	627
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	628 if noderange is not None:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	629 if noderange[0]:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	630 common = [n for n in noderange[0] if hasnode(n)]
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	631 else:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	632 common = [nullid]
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	633
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	634 for n in discovery.outgoing(repo, common, noderange[1]).missing:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	635 if n not in seen:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	636 outgoing.append(n)
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	637 # Don't need to add to seen here because this is the final
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	638 # source of nodes and there should be no duplicates in this
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	639 # list.
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	640
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	641 seen.clear()
39632 c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	642 publishing = repo.publishing()
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	643
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	644 if outgoing:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	645 repo.hook('preoutgoing', throw=True, source='serve')
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	646
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	647 yield {
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	648 b'totalitems': len(outgoing),
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	649 }
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	650
39632 c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	651 # The phases of nodes already transferred to the client may have changed
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	652 # since the client last requested data. We send phase-only records
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	653 # for these revisions, if requested.
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	654 if b'phase' in fields and noderange is not None:
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	655 # TODO skip nodes whose phase will be reflected by a node in the
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	656 # outgoing set. This is purely an optimization to reduce data
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	657 # size.
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	658 for node in noderange[0]:
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	659 yield {
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	660 b'node': node,
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	661 b'phase': b'public' if publishing else repo[node].phasestr()
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	662 }
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	663
39634 9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	664 nodebookmarks = {}
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	665 for mark, node in repo._bookmarks.items():
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	666 nodebookmarks.setdefault(node, set()).add(mark)
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	667
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	668 # It is already topologically sorted by revision number.
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	669 for node in outgoing:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	670 d = {
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	671 b'node': node,
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	672 }
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	673
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	674 if b'parents' in fields:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	675 d[b'parents'] = cl.parents(node)
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	676
39632 c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	677 if b'phase' in fields:
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	678 if publishing:
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	679 d[b'phase'] = b'public'
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	680 else:
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	681 ctx = repo[node]
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	682 d[b'phase'] = ctx.phasestr()
c1aacb0d76ff wireprotov2: add phases to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39630 diff changeset	683
39634 9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	684 if b'bookmarks' in fields and node in nodebookmarks:
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	685 d[b'bookmarks'] = sorted(nodebookmarks[node])
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	686 del nodebookmarks[node]
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	687
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	688 followingmeta = []
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	689 followingdata = []
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	690
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	691 if b'revision' in fields:
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	692 revisiondata = cl.revision(node, raw=True)
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	693 followingmeta.append((b'revision', len(revisiondata)))
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	694 followingdata.append(revisiondata)
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	695
39636 399ddd3227a4 wireprotov2: add TODOs around extending changesetdata fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39634 diff changeset	696 # TODO make it possible for extensions to wrap a function or register
399ddd3227a4 wireprotov2: add TODOs around extending changesetdata fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39634 diff changeset	697 # a handler to service custom fields.
399ddd3227a4 wireprotov2: add TODOs around extending changesetdata fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39634 diff changeset	698
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	699 if followingmeta:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	700 d[b'fieldsfollowing'] = followingmeta
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	701
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	702 yield d
9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	703
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	704 for extra in followingdata:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	705 yield extra
39630 9c2c77c73f23 wireprotov2: define and implement "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39559 diff changeset	706
39634 9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	707 # If requested, send bookmarks from nodes that didn't have revision
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	708 # data sent so receiver is aware of any bookmark updates.
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	709 if b'bookmarks' in fields:
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	710 for node, marks in sorted(nodebookmarks.iteritems()):
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	711 yield {
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	712 b'node': node,
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	713 b'bookmarks': sorted(marks),
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	714 }
9dffa99f9158 wireprotov2: add bookmarks to "changesetdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39632 diff changeset	715
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	716 class FileAccessError(Exception):
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	717 """Represents an error accessing a specific file."""
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	718
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	719 def __init__(self, path, msg, args):
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	720 self.path = path
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	721 self.msg = msg
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	722 self.args = args
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	723
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	724 def getfilestore(repo, proto, path):
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	725 """Obtain a file storage object for use with wire protocol.
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	726
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	727 Exists as a standalone function so extensions can monkeypatch to add
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	728 access control.
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	729 """
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	730 # This seems to work even if the file doesn't exist. So catch
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	731 # "empty" files and return an error.
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	732 fl = repo.file(path)
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	733
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	734 if not len(fl):
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	735 raise FileAccessError(path, 'unknown file: %s', (path,))
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	736
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	737 return fl
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	738
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	739 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	740 'filedata',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	741 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	742 'haveparents': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	743 'type': 'bool',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	744 'default': lambda: False,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	745 'example': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	746 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	747 'nodes': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	748 'type': 'list',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	749 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	750 'example': [b'0123456...'],
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	751 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	752 'fields': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	753 'type': 'set',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	754 'default': set,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	755 'example': {b'parents', b'revision'},
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	756 'validvalues': {b'parents', b'revision'},
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	757 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	758 'path': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	759 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	760 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	761 'example': b'foo.txt',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	762 }
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	763 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	764 permission='pull')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	765 def filedata(repo, proto, haveparents, nodes, fields, path):
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	766 try:
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	767 # Extensions may wish to access the protocol handler.
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	768 store = getfilestore(repo, proto, path)
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	769 except FileAccessError as e:
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	770 raise error.WireprotoCommandError(e.msg, e.args)
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	771
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	772 # Validate requested nodes.
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	773 for node in nodes:
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	774 try:
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	775 store.rev(node)
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	776 except error.LookupError:
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	777 raise error.WireprotoCommandError('unknown file node: %s',
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	778 (hex(node),))
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	779
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	780 revisions = store.emitrevisions(nodes,
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	781 revisiondata=b'revision' in fields,
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	782 assumehaveparentrevisions=haveparents)
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	783
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	784 yield {
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	785 b'totalitems': len(nodes),
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	786 }
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	787
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	788 for revision in revisions:
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	789 d = {
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	790 b'node': revision.node,
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	791 }
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	792
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	793 if b'parents' in fields:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	794 d[b'parents'] = [revision.p1node, revision.p2node]
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	795
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	796 followingmeta = []
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	797 followingdata = []
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	798
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	799 if b'revision' in fields:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	800 if revision.revision is not None:
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	801 followingmeta.append((b'revision', len(revision.revision)))
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	802 followingdata.append(revision.revision)
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	803 else:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	804 d[b'deltabasenode'] = revision.basenode
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	805 followingmeta.append((b'delta', len(revision.delta)))
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	806 followingdata.append(revision.delta)
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	807
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	808 if followingmeta:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	809 d[b'fieldsfollowing'] = followingmeta
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	810
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	811 yield d
0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	812
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	813 for extra in followingdata:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	814 yield extra
39639 0e03e6a44dee wireprotov2: define and implement "filedata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39637 diff changeset	815
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	816 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	817 'heads',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	818 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	819 'publiconly': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	820 'type': 'bool',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	821 'default': lambda: False,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	822 'example': False,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	823 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	824 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	825 permission='pull')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	826 def headsv2(repo, proto, publiconly):
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	827 if publiconly:
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	828 repo = repo.filtered('immutable')
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	829
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	830 yield repo.heads()
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	831
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	832 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	833 'known',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	834 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	835 'nodes': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	836 'type': 'list',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	837 'default': list,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	838 'example': [b'deadbeef'],
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	839 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	840 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	841 permission='pull')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	842 def knownv2(repo, proto, nodes):
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	843 result = b''.join(b'1' if n else b'0' for n in repo.known(nodes))
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	844 yield result
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	845
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	846 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	847 'listkeys',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	848 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	849 'namespace': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	850 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	851 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	852 'example': b'ns',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	853 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	854 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	855 permission='pull')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	856 def listkeysv2(repo, proto, namespace):
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	857 keys = repo.listkeys(encoding.tolocal(namespace))
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	858 keys = {encoding.fromlocal(k): encoding.fromlocal(v)
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	859 for k, v in keys.iteritems()}
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	860
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	861 yield keys
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	862
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	863 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	864 'lookup',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	865 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	866 'key': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	867 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	868 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	869 'example': b'foo',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	870 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	871 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	872 permission='pull')
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	873 def lookupv2(repo, proto, key):
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	874 key = encoding.tolocal(key)
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	875
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	876 # TODO handle exception.
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	877 node = repo.lookup(key)
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	878
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	879 yield node
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	880
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	881 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	882 'manifestdata',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	883 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	884 'nodes': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	885 'type': 'list',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	886 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	887 'example': [b'0123456...'],
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	888 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	889 'haveparents': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	890 'type': 'bool',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	891 'default': lambda: False,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	892 'example': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	893 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	894 'fields': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	895 'type': 'set',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	896 'default': set,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	897 'example': {b'parents', b'revision'},
39813 c30faea8d02d wireprotov2: advertise set of valid values for requestable fields Gregory Szorc <gregory.szorc@gmail.com> parents: 39812 diff changeset	898 'validvalues': {b'parents', b'revision'},
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	899 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	900 'tree': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	901 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	902 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	903 'example': b'',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	904 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	905 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	906 permission='pull')
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	907 def manifestdata(repo, proto, haveparents, nodes, fields, tree):
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	908 store = repo.manifestlog.getstorage(tree)
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	909
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	910 # Validate the node is known and abort on unknown revisions.
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	911 for node in nodes:
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	912 try:
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	913 store.rev(node)
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	914 except error.LookupError:
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	915 raise error.WireprotoCommandError(
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	916 'unknown node: %s', (node,))
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	917
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	918 revisions = store.emitrevisions(nodes,
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	919 revisiondata=b'revision' in fields,
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	920 assumehaveparentrevisions=haveparents)
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	921
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	922 yield {
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	923 b'totalitems': len(nodes),
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	924 }
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	925
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	926 for revision in revisions:
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	927 d = {
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	928 b'node': revision.node,
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	929 }
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	930
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	931 if b'parents' in fields:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	932 d[b'parents'] = [revision.p1node, revision.p2node]
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	933
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	934 followingmeta = []
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	935 followingdata = []
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	936
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	937 if b'revision' in fields:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	938 if revision.revision is not None:
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	939 followingmeta.append((b'revision', len(revision.revision)))
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	940 followingdata.append(revision.revision)
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	941 else:
39864 7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	942 d[b'deltabasenode'] = revision.basenode
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	943 followingmeta.append((b'delta', len(revision.delta)))
7b752bf08435 wireprotov2server: port to emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 39837 diff changeset	944 followingdata.append(revision.delta)
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	945
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	946 if followingmeta:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	947 d[b'fieldsfollowing'] = followingmeta
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	948
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	949 yield d
c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	950
39814 d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	951 for extra in followingdata:
d059cb669632 wireprotov2: allow multiple fields to follow revision maps Gregory Szorc <gregory.szorc@gmail.com> parents: 39813 diff changeset	952 yield extra
39637 c7a7c7e844e5 wireprotov2: define and implement "manifestdata" command Gregory Szorc <gregory.szorc@gmail.com> parents: 39636 diff changeset	953
39810 0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	954 @wireprotocommand(
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	955 'pushkey',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	956 args={
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	957 'namespace': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	958 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	959 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	960 'example': b'ns',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	961 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	962 'key': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	963 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	964 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	965 'example': b'key',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	966 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	967 'old': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	968 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	969 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	970 'example': b'old',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	971 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	972 'new': {
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	973 'type': 'bytes',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	974 'required': True,
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	975 'example': 'new',
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	976 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	977 },
0b61d21f05cc wireprotov2: declare command arguments richly Gregory Szorc <gregory.szorc@gmail.com> parents: 39641 diff changeset	978 permission='push')
37546 3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	979 def pushkeyv2(repo, proto, namespace, key, old, new):
3a2367e6c6f2 wireproto: move version 2 command handlers to wireprotov2server Gregory Szorc <gregory.szorc@gmail.com> parents: 37545 diff changeset	980 # TODO handle ui output redirection
39559 07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	981 yield repo.pushkey(encoding.tolocal(namespace),
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	982 encoding.tolocal(key),
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	983 encoding.tolocal(old),
07b58266bce3 wireprotov2: implement commands as a generator of objects Gregory Szorc <gregory.szorc@gmail.com> parents: 39448 diff changeset	984 encoding.tolocal(new))

Mercurial > public > mercurial-scm > hg

annotate mercurial/wireprotov2server.py @ 39878:3e896b51aa5d