Mercurial > hg
diff mercurial/wireproto.py @ 37485:0b7475ea38cf
wireproto: port heads command to wire protocol v2
After much thought and consideration, wire protocol version 2's
commands will be defined in different functions from the existing
commands. This will make it easier to implement these commands
because it won't require shoehorning things like response formatting
and argument declaration into the same APIs.
For example, wire protocol version 1 requires that commands declare
a fixed and ordered list of argument names. It isn't really possible
to insert new arguments or have optional arguments without
breaking backwards compatibility. Wire protocol version 2, however,
uses CBOR maps for passing arguments. So arguments a) can be
optional b) can be added without BC c) can be strongly typed.
This commit starts our trek towards reimplementing the wire protocol
for version 2 with the heads command. It is pretty similar to the
existing heads command. One added feature is it can be told to
operate on only public phase changesets. This is useful for
making discovery faster when a repo has tens of thousands of
draft phase heads (such as Mozilla's "try" repository).
The HTTPv2 server-side protocol has had its `getargs()` implementation
updated to reflect that arguments are a map and not a list.
Differential Revision: https://phab.mercurial-scm.org/D3179
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Wed, 28 Mar 2018 14:55:13 -0700 |
parents | 2d965bfeb8f6 |
children | 6847542bb8d7 |
line wrap: on
line diff
--- a/mercurial/wireproto.py Wed Mar 28 10:52:40 2018 -0700 +++ b/mercurial/wireproto.py Wed Mar 28 14:55:13 2018 -0700 @@ -518,7 +518,15 @@ func, spec = commandtable[command] args = proto.getargs(spec) - return func(repo, proto, *args) + + # Version 1 protocols define arguments as a list. Version 2 uses a dict. + if isinstance(args, list): + return func(repo, proto, *args) + elif isinstance(args, dict): + return func(repo, proto, **args) + else: + raise error.ProgrammingError('unexpected type returned from ' + 'proto.getargs(): %s' % type(args)) def options(cmd, keys, others): opts = {} @@ -996,7 +1004,7 @@ return wireprototypes.streamres( gen=chunks, prefer_uncompressed=not prefercompressed) -@wireprotocommand('heads', permission='pull') +@wireprotocommand('heads', permission='pull', transportpolicy=POLICY_V1_ONLY) def heads(repo, proto): h = repo.heads() return wireprototypes.bytesresponse(encodelist(h) + '\n') @@ -1197,3 +1205,13 @@ bundler.newpart('error:pushraced', [('message', stringutil.forcebytestr(exc))]) return wireprototypes.streamreslegacy(gen=bundler.getchunks()) + +# Wire protocol version 2 commands only past this point. + +@wireprotocommand('heads', args='publiconly', permission='pull', + transportpolicy=POLICY_V2_ONLY) +def headsv2(repo, proto, publiconly=False): + if publiconly: + repo = repo.filtered('immutable') + + return wireprototypes.cborresponse(repo.heads())