This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3256

httppeer: basic implementation of capabilities interface
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGae8730877371: httppeer: basic implementation of capabilities interface
Summary

This is a bit crude. The capabilities mechanism for version 2 of
the wire protocol is a bit different from version 1. And code
in core is relying on strings passed to capable() matching strings
advertised by the "capabilities" wire protocol command. I may
refactor the internal checking mechanism to be a bit more
abstract or based on interfaces. Time will tell...

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 rHGae8730877371: httppeer: basic implementation of capabilities interface (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 (29 lines)
Mtests/test-check-interfaces.py (2 lines)

Diff 8097

mercurial/httppeer.py

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) @zi.implementer(repository.ipeerconnection, repository.ipeercapabilities)
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]
# TODO change once implemented. # TODO change once implemented.
return False return False
def close(self): def close(self):
pass pass
# End of ipeerconnection. # End of ipeerconnection.
# Start of ipeercapabilities.
def capable(self, name):
# The capabilities used internally historically map to capabilities
# advertised from the "capabilities" wire protocol command. However,
# version 2 of that command works differently.
# Maps to commands that are available.
if name in ('branchmap', 'getbundle', 'known', 'lookup', 'pushkey'):
return True
# Other concepts.
if name in ('bundle2',):
return True
return False
def requirecap(self, name, purpose):
if self.capable(name):
return
raise error.CapabilityError(
_('cannot %s; client or remote repository does not support the %r '
'capability') % (purpose, name))
# End of ipeercapabilities.
# 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.

tests/test-check-interfaces.py

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, ziverify.verifyClass(repository.ipeerconnection,
httppeer.httpv2peer) httppeer.httpv2peer)
ziverify.verifyClass(repository.ipeercapabilities,
httppeer.httpv2peer)
checkzobject(httppeer.httpv2peer(None, '', None, None, None, None)) 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)