| hg-reviewers |
The API descriptor in wireprotov2 is much more expressive than
space-delimited tokens and it will be difficult to define methods
to query it in all of the ways we'll want to query it. So let's
just declare defeat and expose the API descriptor on the peer
instance.
As part of this, we define a new interface for version 2 peers,
fulfilling a TODO in the process.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/httppeer.py (11 lines) | |||
| M | mercurial/repository.py (6 lines) | |||
| M | tests/test-check-interfaces.py (5 lines) |
| self._futures = None | self._futures = None | ||||
| def _handleresponse(self, handler, resp): | def _handleresponse(self, handler, resp): | ||||
| # Called in a thread to read the response. | # Called in a thread to read the response. | ||||
| while handler.readdata(resp): | while handler.readdata(resp): | ||||
| pass | pass | ||||
| # TODO implement interface for version 2 peers | @interfaceutil.implementer(repository.ipeerv2) | ||||
| @interfaceutil.implementer(repository.ipeerconnection, | |||||
| repository.ipeercapabilities, | |||||
| repository.ipeerrequests) | |||||
| 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 | ||||
| self.apidescriptor = apidescriptor | |||||
| 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._apiurl = '%s/%s' % (repourl, apipath) | self._apiurl = '%s/%s' % (repourl, apipath) | ||||
| self._opener = opener | self._opener = opener | ||||
| self._requestbuilder = requestbuilder | self._requestbuilder = requestbuilder | ||||
| self._descriptor = apidescriptor | |||||
| self._redirect = wireprotov2peer.supportedredirects(ui, apidescriptor) | self._redirect = wireprotov2peer.supportedredirects(ui, apidescriptor) | ||||
| # Start of ipeerconnection. | # Start of ipeerconnection. | ||||
| def url(self): | def url(self): | ||||
| return self._url | return self._url | ||||
| return True | return True | ||||
| # Other concepts. | # Other concepts. | ||||
| if name in ('bundle2'): | if name in ('bundle2'): | ||||
| return True | return True | ||||
| # Alias command-* to presence of command of that name. | # Alias command-* to presence of command of that name. | ||||
| if name.startswith('command-'): | if name.startswith('command-'): | ||||
| return name[len('command-'):] in self._descriptor['commands'] | return name[len('command-'):] in self.apidescriptor['commands'] | ||||
| return False | return False | ||||
| def requirecap(self, name, purpose): | def requirecap(self, name, purpose): | ||||
| if self.capable(name): | if self.capable(name): | ||||
| return | return | ||||
| raise error.CapabilityError( | raise error.CapabilityError( | ||||
| _('cannot %s; client or remote repository does not support the %r ' | _('cannot %s; client or remote repository does not support the %r ' | ||||
| 'capability') % (purpose, name)) | 'capability') % (purpose, name)) | ||||
| # End of ipeercapabilities. | # End of ipeercapabilities. | ||||
| def _call(self, name, **args): | def _call(self, name, **args): | ||||
| with self.commandexecutor() as e: | with self.commandexecutor() as e: | ||||
| return e.callcommand(name, args).result() | return e.callcommand(name, args).result() | ||||
| def commandexecutor(self): | def commandexecutor(self): | ||||
| return httpv2executor(self.ui, self._opener, self._requestbuilder, | return httpv2executor(self.ui, self._opener, self._requestbuilder, | ||||
| self._apiurl, self._descriptor, self._redirect) | self._apiurl, self.apidescriptor, self._redirect) | ||||
| # Registry of API service names to metadata about peers that handle it. | # Registry of API service names to metadata about peers that handle it. | ||||
| # | # | ||||
| # The following keys are meaningful: | # The following keys are meaningful: | ||||
| # | # | ||||
| # 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. | ||||
| """ | """ | ||||
| class ipeerbase(ipeerconnection, ipeercapabilities, ipeerrequests): | class ipeerbase(ipeerconnection, ipeercapabilities, ipeerrequests): | ||||
| """Unified interface for peer repositories. | """Unified interface for peer repositories. | ||||
| All peer instances must conform to this interface. | All peer instances must conform to this interface. | ||||
| """ | """ | ||||
| class ipeerv2(ipeerconnection, ipeercapabilities, ipeerrequests): | |||||
| """Unified peer interface for wire protocol version 2 peers.""" | |||||
| apidescriptor = interfaceutil.Attribute( | |||||
| """Data structure holding description of server API.""") | |||||
| @interfaceutil.implementer(ipeerbase) | @interfaceutil.implementer(ipeerbase) | ||||
| class peer(object): | class peer(object): | ||||
| """Base class for peer repositories.""" | """Base class for peer repositories.""" | ||||
| def capable(self, name): | def capable(self, name): | ||||
| caps = self.capabilities() | caps = self.capabilities() | ||||
| if name in caps: | if name in caps: | ||||
| return True | return True | ||||
| # Needed so we can open a local repo with obsstore without a warning. | # Needed so we can open a local repo with obsstore without a warning. | ||||
| ui.setconfig(b'experimental', b'evolution.createmarkers', True) | ui.setconfig(b'experimental', b'evolution.createmarkers', True) | ||||
| checkzobject(badpeer()) | checkzobject(badpeer()) | ||||
| ziverify.verifyClass(repository.ipeerbase, httppeer.httppeer) | ziverify.verifyClass(repository.ipeerbase, 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.ipeerv2, httppeer.httpv2peer) | ||||
| httppeer.httpv2peer) | |||||
| ziverify.verifyClass(repository.ipeercapabilities, | |||||
| httppeer.httpv2peer) | |||||
| checkzobject(httppeer.httpv2peer(None, b'', b'', None, None, None)) | checkzobject(httppeer.httpv2peer(None, b'', b'', 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.ipeercommandexecutor, | ziverify.verifyClass(repository.ipeercommandexecutor, | ||||
| localrepo.localcommandexecutor) | localrepo.localcommandexecutor) | ||||