This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3401

wireproto: define HTTP version 2 protocol name in server module
AbandonedPublic

Authored by indygreg on Apr 17 2018, 1:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

And subtly rename the canonical transport to "http-v2." I believe the
key in the TRANSPORTS dict is only used internally. So the exact name
should not matter.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 17 2018, 1:30 AM
indygreg abandoned this revision.Apr 17 2018, 1:34 AM

This one breaks tests.

Revision Contents
Changeset List

Diff 8372

mercurial/httppeer.py

error, error,
httpconnection, httpconnection,
pycompat, pycompat,
repository, repository,
statichttprepo, statichttprepo,
url as urlmod, url as urlmod,
util, util,
wireprotoframing, wireprotoframing,
wireprototypes,
wireprotov1peer, wireprotov1peer,
wireprotov2peer, wireprotov2peer,
wireprotov2server, wireprotov2server,
) )
httplib = util.httplib httplib = util.httplib
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
# 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.HTTP_WIREPROTO_V2: { wireprotov2server.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/wireprototypes.py

util, util,
) )
# 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'
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,
}, },
HTTP_WIREPROTO_V2: { 'http-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

streamclone, streamclone,
util, util,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
) )
FRAMINGTYPE = b'application/mercurial-exp-framing-0005' FRAMINGTYPE = b'application/mercurial-exp-framing-0005'
HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2 HTTP_WIREPROTO_V2 = b'exp-http-v2-0001'
COMMANDS = wireprototypes.commanddict() COMMANDS = wireprototypes.commanddict()
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.