( )⚙ D3254 httppeer: implement ipeerconnection

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3254

httppeer: implement ipeerconnection
ClosedPublic

Authored by indygreg on Apr 11 2018, 7:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG01bfe5ad0c53: httppeer: implement ipeerconnection
Summary

This is low hanging fruit. We might as well start somewhere.

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 11 2018, 7:42 PM
durin42 accepted this revision.Apr 12 2018, 6:21 PM
This revision is now accepted and ready to land.Apr 12 2018, 6:21 PM
Closed by commit rHG01bfe5ad0c53: httppeer: implement ipeerconnection (authored by indygreg). · Explain WhyApr 12 2018, 6:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (26 lines)
Mtests/test-check-interfaces.py (4 lines)

Diff 8095

mercurial/httppeer.py

import socket import socket
import struct import struct
import tempfile import tempfile
from .i18n import _ from .i18n import _
from .thirdparty import ( from .thirdparty import (
cbor, cbor,
) )
from .thirdparty.zope import (
interface as zi,
)
from . import ( from . import (
bundle2, bundle2,
error, error,
httpconnection, httpconnection,
pycompat, pycompat,
repository,
statichttprepo, statichttprepo,
url as urlmod, url as urlmod,
util, util,
wireproto, wireproto,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
wireprotov2server, wireprotov2server,
) )
def _callcompressable(self, cmd, **args): def _callcompressable(self, cmd, **args):
return self._callstream(cmd, _compressible=True, **args) return self._callstream(cmd, _compressible=True, **args)
def _abort(self, exception): def _abort(self, exception):
raise exception raise exception
# TODO implement interface for version 2 peers # TODO implement interface for version 2 peers
@zi.implementer(repository.ipeerconnection)
class httpv2peer(object): class httpv2peer(object):
def __init__(self, ui, repourl, apipath, opener, requestbuilder, def __init__(self, ui, repourl, apipath, opener, requestbuilder,
apidescriptor): apidescriptor):
self.ui = ui self.ui = ui
if repourl.endswith('/'): if repourl.endswith('/'):
repourl = repourl[:-1] repourl = repourl[:-1]
self.url = repourl self._url = repourl
self._apipath = apipath self._apipath = apipath
self._opener = opener self._opener = opener
self._requestbuilder = requestbuilder self._requestbuilder = requestbuilder
self._descriptor = apidescriptor self._descriptor = apidescriptor
# Start of ipeerconnection.
def url(self):
return self._url
def local(self):
return None
def peer(self):
return self
def canpush(self):
# TODO change once implemented.
return False
def close(self): def close(self):
pass pass
# End of ipeerconnection.
# TODO require to be part of a batched primitive, use futures. # TODO require to be part of a batched primitive, use futures.
def _call(self, name, **args): def _call(self, name, **args):
"""Call a wire protocol command with arguments.""" """Call a wire protocol command with arguments."""
# Having this early has a side-effect of importing wireprotov2server, # Having this early has a side-effect of importing wireprotov2server,
# which has the side-effect of ensuring commands are registered. # which has the side-effect of ensuring commands are registered.
# TODO modify user-agent to reflect v2. # TODO modify user-agent to reflect v2.
headers = { headers = {
r'Accept': wireprotov2server.FRAMINGTYPE, r'Accept': wireprotov2server.FRAMINGTYPE,
r'Content-Type': wireprotov2server.FRAMINGTYPE, r'Content-Type': wireprotov2server.FRAMINGTYPE,
} }
# TODO permissions should come from capabilities results. # TODO permissions should come from capabilities results.
permission = wireproto.commandsv2[name].permission permission = wireproto.commandsv2[name].permission
if permission not in ('push', 'pull'): if permission not in ('push', 'pull'):
raise error.ProgrammingError('unknown permission type: %s' % raise error.ProgrammingError('unknown permission type: %s' %
permission) permission)
permission = { permission = {
'push': 'rw', 'push': 'rw',
'pull': 'ro', 'pull': 'ro',
}[permission] }[permission]
url = '%s/%s/%s/%s' % (self.url, self._apipath, permission, name) url = '%s/%s/%s/%s' % (self._url, self._apipath, permission, name)
# TODO this should be part of a generic peer for the frame-based # TODO this should be part of a generic peer for the frame-based
# protocol. # protocol.
reactor = wireprotoframing.clientreactor(hasmultiplesend=False, reactor = wireprotoframing.clientreactor(hasmultiplesend=False,
buffersends=True) buffersends=True)
request, action, meta = reactor.callcommand(name, args) request, action, meta = reactor.callcommand(name, args)
assert action == 'noop' assert action == 'noop'

tests/test-check-interfaces.py

ui.setconfig('experimental', 'evolution.createmarkers', True) ui.setconfig('experimental', 'evolution.createmarkers', True)
checkzobject(badpeer()) checkzobject(badpeer())
ziverify.verifyClass(repository.ipeerbaselegacycommands, ziverify.verifyClass(repository.ipeerbaselegacycommands,
httppeer.httppeer) httppeer.httppeer)
checkzobject(httppeer.httppeer(None, None, None, dummyopener(), None, None)) checkzobject(httppeer.httppeer(None, None, None, dummyopener(), None, None))
ziverify.verifyClass(repository.ipeerconnection,
httppeer.httpv2peer)
checkzobject(httppeer.httpv2peer(None, '', None, None, None, None))
ziverify.verifyClass(repository.ipeerbase, ziverify.verifyClass(repository.ipeerbase,
localrepo.localpeer) localrepo.localpeer)
checkzobject(localrepo.localpeer(dummyrepo())) checkzobject(localrepo.localpeer(dummyrepo()))
ziverify.verifyClass(repository.ipeerbaselegacycommands, ziverify.verifyClass(repository.ipeerbaselegacycommands,
sshpeer.sshv1peer) sshpeer.sshv1peer)
checkzobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, dummypipe(), checkzobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, dummypipe(),
dummypipe(), None, None)) dummypipe(), None, None))