This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3317

wireproto: properly call clonebundles command
ClosedPublic

Authored by indygreg on Apr 13 2018, 3:14 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa168799687e5: wireproto: properly call clonebundles command
Summary

We should not be using _call() to make wire protocol calls because
it isn't part of the peer API.

But clonebundles wasn't part of the supported commands in the
peer API!

So this commit defines that command in the commands interface,
implements it, and teaches the one caller in core to call it using
the command executor interface.

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 13 2018, 3:14 PM
durin42 accepted this revision.Apr 13 2018, 5:59 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:59 PM
Closed by commit rHGa168799687e5: wireproto: properly call clonebundles command (authored by indygreg). · Explain WhyApr 13 2018, 6:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8185

mercurial/exchange.py

return return
if pullop.heads: if pullop.heads:
return return
if not remote.capable('clonebundles'): if not remote.capable('clonebundles'):
return return
res = remote._call('clonebundles') with remote.commandexecutor() as e:
res = e.callcommand('clonebundles', {}).result()
# If we call the wire protocol command, that's good enough to record the # If we call the wire protocol command, that's good enough to record the
# attempt. # attempt.
pullop.clonebundleattempted = True pullop.clonebundleattempted = True
entries = parseclonebundlesmanifest(repo, res) entries = parseclonebundlesmanifest(repo, res)
if not entries: if not entries:
repo.ui.note(_('no clone bundles available on remote; ' repo.ui.note(_('no clone bundles available on remote; '

mercurial/localrepo.py

# Begin of _basewirecommands interface. # Begin of _basewirecommands interface.
def branchmap(self): def branchmap(self):
return self._repo.branchmap() return self._repo.branchmap()
def capabilities(self): def capabilities(self):
return self._caps return self._caps
def clonebundles(self):
return self._repo.tryread('clonebundles.manifest')
def debugwireargs(self, one, two, three=None, four=None, five=None): def debugwireargs(self, one, two, three=None, four=None, five=None):
"""Used to test argument passing over the wire""" """Used to test argument passing over the wire"""
return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three), return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
pycompat.bytestr(four), pycompat.bytestr(four),
pycompat.bytestr(five)) pycompat.bytestr(five))
def getbundle(self, source, heads=None, common=None, bundlecaps=None, def getbundle(self, source, heads=None, common=None, bundlecaps=None,
**kwargs): **kwargs):

mercurial/repository.py

""" """
def capabilities(): def capabilities():
"""Obtain capabilities of the peer. """Obtain capabilities of the peer.
Returns a set of string capabilities. Returns a set of string capabilities.
""" """
def clonebundles():
"""Obtains the clone bundles manifest for the repo.
Returns the manifest as unparsed bytes.
"""
def debugwireargs(one, two, three=None, four=None, five=None): def debugwireargs(one, two, three=None, four=None, five=None):
"""Used to facilitate debugging of arguments passed over the wire.""" """Used to facilitate debugging of arguments passed over the wire."""
def getbundle(source, **kwargs): def getbundle(source, **kwargs):
"""Obtain remote repository data as a bundle. """Obtain remote repository data as a bundle.
This command is how the bulk of repository data is transferred from This command is how the bulk of repository data is transferred from
the peer to the local repository the peer to the local repository

mercurial/wireprotov1peer.py

See also httppeer.py and sshpeer.py for protocol-specific See also httppeer.py and sshpeer.py for protocol-specific
implementations of this interface. implementations of this interface.
""" """
def commandexecutor(self): def commandexecutor(self):
return peerexecutor(self) return peerexecutor(self)
# Begin of ipeercommands interface. # Begin of ipeercommands interface.
def clonebundles(self):
self.requirecap('clonebundles', _('clone bundles'))
return self._call('clonebundles')
@batchable @batchable
def lookup(self, key): def lookup(self, key):
self.requirecap('lookup', _('look up remote revision')) self.requirecap('lookup', _('look up remote revision'))
f = future() f = future()
yield {'key': encoding.fromlocal(key)}, f yield {'key': encoding.fromlocal(key)}, f
d = f.value d = f.value
success, data = d[:-1].split(" ", 1) success, data = d[:-1].split(" ", 1)
if int(success): if int(success):