This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3295

wireproto: rename HTTPV2 so it less like HTTP/2
ClosedPublic

Authored by indygreg on Apr 12 2018, 3:59 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG77c9ee77687c: wireproto: rename HTTPV2 so it less like HTTP/2
Summary

Per review suggestion on D3230 from Augie.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 12 2018, 3:59 PM
durin42 accepted this revision.Apr 13 2018, 5:59 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:59 PM
Closed by commit rHG77c9ee77687c: wireproto: rename HTTPV2 so it less like HTTP/2 (authored by indygreg). · Explain WhyApr 13 2018, 6:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8180

mercurial/debugcommands.py

if opts['peer'] == 'raw': if opts['peer'] == 'raw':
openerargs[r'sendaccept'] = False openerargs[r'sendaccept'] = False
opener = urlmod.opener(ui, authinfo, **openerargs) opener = urlmod.opener(ui, authinfo, **openerargs)
if opts['peer'] == 'http2': if opts['peer'] == 'http2':
ui.write(_('creating http peer for wire protocol version 2\n')) ui.write(_('creating http peer for wire protocol version 2\n'))
peer = httppeer.httpv2peer( peer = httppeer.httpv2peer(
ui, path, 'api/%s' % wireprototypes.HTTPV2, ui, path, 'api/%s' % wireprototypes.HTTP_WIREPROTO_V2,
opener, httppeer.urlreq.request, {}) opener, httppeer.urlreq.request, {})
elif opts['peer'] == 'raw': elif opts['peer'] == 'raw':
ui.write(_('using raw connection to peer\n')) ui.write(_('using raw connection to peer\n'))
peer = None peer = None
elif opts['peer']: elif opts['peer']:
raise error.Abort(_('--peer %s not supported with HTTP peers') % raise error.Abort(_('--peer %s not supported with HTTP peers') %
opts['peer']) opts['peer'])
else: else:

mercurial/httppeer.py

# init # init
# Callable receiving (ui, repourl, servicepath, opener, requestbuilder, # Callable receiving (ui, repourl, servicepath, opener, requestbuilder,
# apidescriptor) to create a peer. # apidescriptor) to create a peer.
# #
# priority # priority
# Integer priority for the service. If we could choose from multiple # Integer priority for the service. If we could choose from multiple
# services, we choose the one with the highest priority. # services, we choose the one with the highest priority.
API_PEERS = { API_PEERS = {
wireprototypes.HTTPV2: { wireprototypes.HTTP_WIREPROTO_V2: {
'init': httpv2peer, 'init': httpv2peer,
'priority': 50, 'priority': 50,
}, },
} }
def performhandshake(ui, url, opener, requestbuilder): def performhandshake(ui, url, opener, requestbuilder):
# The handshake is a request to the capabilities command. # The handshake is a request to the capabilities command.

mercurial/wireprotoserver.py

# Config option that controls whether service is enabled. # Config option that controls whether service is enabled.
# handler # handler
# Callable receiving (rctx, req, res, checkperm, urlparts) that is called # Callable receiving (rctx, req, res, checkperm, urlparts) that is called
# when a request to this API is received. # when a request to this API is received.
# apidescriptor # apidescriptor
# Callable receiving (req, repo) that is called to obtain an API # Callable receiving (req, repo) that is called to obtain an API
# descriptor for this service. The response must be serializable to CBOR. # descriptor for this service. The response must be serializable to CBOR.
API_HANDLERS = { API_HANDLERS = {
wireprotov2server.HTTPV2: { wireprotov2server.HTTP_WIREPROTO_V2: {
'config': ('experimental', 'web.api.http-v2'), 'config': ('experimental', 'web.api.http-v2'),
'handler': wireprotov2server.handlehttpv2request, 'handler': wireprotov2server.handlehttpv2request,
'apidescriptor': wireprotov2server.httpv2apidescriptor, 'apidescriptor': wireprotov2server.httpv2apidescriptor,
}, },
} }
def _httpresponsetype(ui, proto, prefer_uncompressed): def _httpresponsetype(ui, proto, prefer_uncompressed):
"""Determine the appropriate response type and compression settings. """Determine the appropriate response type and compression settings.

mercurial/wireprototypes.py

interface as zi, interface as zi,
) )
# Names of the SSH protocol implementations. # Names of the SSH protocol implementations.
SSHV1 = 'ssh-v1' SSHV1 = 'ssh-v1'
# These are advertised over the wire. Increment the counters at the end # These are advertised over the wire. Increment the counters at the end
# to reflect BC breakages. # to reflect BC breakages.
SSHV2 = 'exp-ssh-v2-0001' SSHV2 = 'exp-ssh-v2-0001'
HTTPV2 = 'exp-http-v2-0001' HTTP_WIREPROTO_V2 = 'exp-http-v2-0001'
# All available wire protocol transports. # All available wire protocol transports.
TRANSPORTS = { TRANSPORTS = {
SSHV1: { SSHV1: {
'transport': 'ssh', 'transport': 'ssh',
'version': 1, 'version': 1,
}, },
SSHV2: { SSHV2: {
'transport': 'ssh', 'transport': 'ssh',
# TODO mark as version 2 once all commands are implemented. # TODO mark as version 2 once all commands are implemented.
'version': 1, 'version': 1,
}, },
'http-v1': { 'http-v1': {
'transport': 'http', 'transport': 'http',
'version': 1, 'version': 1,
}, },
HTTPV2: { HTTP_WIREPROTO_V2: {
'transport': 'http', 'transport': 'http',
'version': 2, 'version': 2,
} }
} }
class bytesresponse(object): class bytesresponse(object):
"""A wire protocol response consisting of raw bytes.""" """A wire protocol response consisting of raw bytes."""
def __init__(self, data): def __init__(self, data):

mercurial/wireprotov2server.py

util, util,
wireproto, wireproto,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
) )
FRAMINGTYPE = b'application/mercurial-exp-framing-0003' FRAMINGTYPE = b'application/mercurial-exp-framing-0003'
HTTPV2 = wireprototypes.HTTPV2 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
def handlehttpv2request(rctx, req, res, checkperm, urlparts): def handlehttpv2request(rctx, req, res, checkperm, urlparts):
from .hgweb import common as hgwebcommon from .hgweb import common as hgwebcommon
# URL space looks like: <permissions>/<command>, where <permission> can # URL space looks like: <permissions>/<command>, where <permission> can
# be ``ro`` or ``rw`` to signal read-only or read-write, respectively. # be ``ro`` or ``rw`` to signal read-only or read-write, respectively.
# Root URL does nothing meaningful... yet. # Root URL does nothing meaningful... yet.
class httpv2protocolhandler(object): class httpv2protocolhandler(object):
def __init__(self, req, ui, args=None): def __init__(self, req, ui, args=None):
self._req = req self._req = req
self._ui = ui self._ui = ui
self._args = args self._args = args
@property @property
def name(self): def name(self):
return HTTPV2 return HTTP_WIREPROTO_V2
def getargs(self, args): def getargs(self, args):
data = {} data = {}
for k, typ in args.items(): for k, typ in args.items():
if k == '*': if k == '*':
raise NotImplementedError('do not support * args') raise NotImplementedError('do not support * args')
elif k in self._args: elif k in self._args:
# TODO consider validating value types. # TODO consider validating value types.