mercurial-scm/hg-stable: mercurial/debugcommands.py comparison

comparison mercurial/debugcommands.py @ 37483:61e405fb6372

wireproto: crude support for version 2 HTTP peer As part of implementing the server-side bits of the wire protocol command handlers for version 2, we want a way to easily test those commands. Currently, we use the "httprequest" action of `hg debugwireproto`. But this requires explicitly specifying the HTTP request headers, low-level frame details, and the data structure to encode with CBOR. That's a lot of boilerplate and a lot of it can change as the wire protocol evolves. `hg debugwireproto` has a mechanism to issue commands via the peer interface. That is *much* easier to use and we prefer to test with that going forward. This commit implements enough parts of the peer API to send basic requests via the HTTP version 2 transport. The peer code is super hacky. Again, the goal is to facilitate server testing, not robustly implement a client. The client code will receive love at a later time. Differential Revision: https://phab.mercurial-scm.org/D3177

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Wed, 28 Mar 2018 15:09:34 -0700
parents	9966f44ecab4
children	835ccc2a5ef1

comparison

equal deleted inserted replaced

-:fa9faf58959d
+:61e405fb6372
 and connect to that. By default, the connection will perform a handshake
 and establish an appropriate peer instance.
 ``--peer`` can be used to bypass the handshake protocol and construct a
 peer instance using the specified class type. Valid values are ``raw``,
-``ssh1``, and ``ssh2``. ``raw`` instances only allow sending raw data
+``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending
-payloads and don't support higher-level command actions.
+raw data payloads and don't support higher-level command actions.
 ``--noreadstderr`` can be used to disable automatic reading from stderr
 of the peer (for SSH connections only). Disabling automatic reading of
 stderr is useful for making output more deterministic.
 each line is ``<key> <value>``. e.g.::
 command listkeys
 namespace bookmarks
-Values are interpreted as Python b'' literals. This allows encoding
+If the value begins with ``eval:``, it will be interpreted as a Python
-special byte sequences via backslash escaping.
+literal expression. Otherwise values are interpreted as Python b'' literals.
+This allows sending complex types and encoding special byte sequences via
+backslash escaping.
 The following arguments have special meaning:
 ``PUSHFILE``
 When defined, the *push* mechanism of the peer will be used instead
 opts = pycompat.byteskwargs(opts)
 if opts['localssh'] and not repo:
 raise error.Abort(_('--localssh requires a repository'))
-if opts['peer'] and opts['peer'] not in ('raw', 'ssh1', 'ssh2'):
+if opts['peer'] and opts['peer'] not in ('raw', 'http2', 'ssh1', 'ssh2'):
 raise error.Abort(_('invalid value for --peer'),
 hint=_('valid values are "raw", "ssh1", and "ssh2"'))
 if path and opts['localssh']:
 raise error.Abort(_('cannot specify --localssh with an explicit '
 u = util.url(path)
 if u.scheme != 'http':
 raise error.Abort(_('only http:// paths are currently supported'))
 url, authinfo = u.authinfo()
-openerargs = {}
+openerargs = {
+r'useragent': b'Mercurial debugwireproto',
+}
 # Turn pipes/sockets into observers so we can log I/O.
 if ui.verbose:
-openerargs = {
+openerargs.update({
 r'loggingfh': ui,
 r'loggingname': b's',
 r'loggingopts': {
 r'logdata': True,
 r'logdataapis': False,
 },
-}
+})
 if ui.debugflag:
 openerargs[r'loggingopts'][r'logdataapis'] = True
 # Don't send default headers when in raw mode. This allows us to
 if opts['peer'] == 'raw':
 openerargs[r'sendaccept'] = False
 opener = urlmod.opener(ui, authinfo, **openerargs)
-if opts['peer'] == 'raw':
+if opts['peer'] == 'http2':
+ui.write(_('creating http peer for wire protocol version 2\n'))
+peer = httppeer.httpv2peer(ui, path, opener)
+elif opts['peer'] == 'raw':
 ui.write(_('using raw connection to peer\n'))
 peer = None
 elif opts['peer']:
 raise error.Abort(_('--peer %s not supported with HTTP peers') %
 opts['peer'])
 key = fields[0]
 value = ''
 else:
 key, value = fields
-args[key] = stringutil.unescapestr(value)
+if value.startswith('eval:'):
+value = stringutil.evalpythonliteral(value[5:])
+else:
+value = stringutil.unescapestr(value)
+args[key] = value
 if batchedcommands is not None:
 batchedcommands.append((command, args))
 continue

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/debugcommands.py @ 37483:61e405fb6372