This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3904

remotefilelog: adapt for new peer._sendrequest()
ClosedPublic

Authored by martinvonz on Jul 10 2018, 5:06 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXa8f9fd6d1144: remotefilelog: adapt for new peer._sendrequest()
Summary

Since upstream commit a34d5ef53c2e (sshpeer: move logic for sending a
request into a new function, 2018-02-21), peer._call() and
peer._callcompressible() no longer call into
peer._callstream(). Instead, all three call into a new
peer._sendrequest(). We therefore need to override that new method.

The _sendrequest() method will gain another argument ("framed") in a
later commit, so this patch also allows extra arguments to be passed
to it.

Diff Detail

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

Event Timeline

martinvonz created this revision.Jul 10 2018, 5:06 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 10 2018, 5:06 PM
quark accepted this revision.Jul 10 2018, 5:53 PM
This revision is now accepted and ready to land.Jul 10 2018, 5:53 PM
Closed by commit rFBHGXa8f9fd6d1144: remotefilelog: adapt for new peer._sendrequest() (authored by martinvonz). · Explain WhyJul 10 2018, 6:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/fileserverclient.py (9 lines)

Diff 9519

remotefilelog/fileserverclient.py

includecap = "includepattern=" + patterns includecap = "includepattern=" + patterns
bundlecaps.append(includecap) bundlecaps.append(includecap)
if self._localrepo.excludepattern: if self._localrepo.excludepattern:
patterns = '\0'.join(self._localrepo.excludepattern) patterns = '\0'.join(self._localrepo.excludepattern)
excludecap = "excludepattern=" + patterns excludecap = "excludepattern=" + patterns
bundlecaps.append(excludecap) bundlecaps.append(excludecap)
opts['bundlecaps'] = ','.join(bundlecaps) opts['bundlecaps'] = ','.join(bundlecaps)
def _sendrequest(self, command, args, **opts):
self._updatecallstreamopts(command, args)
return super(remotefilepeer, self)._sendrequest(command, args,
**opts)
def _callstream(self, command, **opts): def _callstream(self, command, **opts):
supertype = super(remotefilepeer, self)
if not util.safehasattr(supertype, '_sendrequest'):
self._updatecallstreamopts(command, opts) self._updatecallstreamopts(command, opts)
return super(remotefilepeer, self)._callstream(command, **opts) return super(remotefilepeer, self)._callstream(command, **opts)
peer.__class__ = remotefilepeer peer.__class__ = remotefilepeer
class cacheconnection(object): class cacheconnection(object):
"""The connection for communicating with the remote cache. Performs """The connection for communicating with the remote cache. Performs
gets and sets by communicating with an external process that has the gets and sets by communicating with an external process that has the
cache-specific implementation. cache-specific implementation.