##// END OF EJS Templates
wireproto: properly call clonebundles command...
Gregory Szorc -
r37667:a1687996 default
parent child Browse files
Show More
@@ -2170,7 +2170,8 b' def _maybeapplyclonebundle(pullop):'
2170 if not remote.capable('clonebundles'):
2170 if not remote.capable('clonebundles'):
2171 return
2171 return
2172
2172
2173 res = remote._call('clonebundles')
2173 with remote.commandexecutor() as e:
2174 res = e.callcommand('clonebundles', {}).result()
2174
2175
2175 # If we call the wire protocol command, that's good enough to record the
2176 # If we call the wire protocol command, that's good enough to record the
2176 # attempt.
2177 # attempt.
@@ -235,6 +235,9 b' class localpeer(repository.peer):'
235 def capabilities(self):
235 def capabilities(self):
236 return self._caps
236 return self._caps
237
237
238 def clonebundles(self):
239 return self._repo.tryread('clonebundles.manifest')
240
238 def debugwireargs(self, one, two, three=None, four=None, five=None):
241 def debugwireargs(self, one, two, three=None, four=None, five=None):
239 """Used to test argument passing over the wire"""
242 """Used to test argument passing over the wire"""
240 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
243 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
@@ -101,6 +101,12 b' class ipeercommands(zi.Interface):'
101 Returns a set of string capabilities.
101 Returns a set of string capabilities.
102 """
102 """
103
103
104 def clonebundles():
105 """Obtains the clone bundles manifest for the repo.
106
107 Returns the manifest as unparsed bytes.
108 """
109
104 def debugwireargs(one, two, three=None, four=None, five=None):
110 def debugwireargs(one, two, three=None, four=None, five=None):
105 """Used to facilitate debugging of arguments passed over the wire."""
111 """Used to facilitate debugging of arguments passed over the wire."""
106
112
@@ -322,6 +322,10 b' class wirepeer(repository.peer):'
322
322
323 # Begin of ipeercommands interface.
323 # Begin of ipeercommands interface.
324
324
325 def clonebundles(self):
326 self.requirecap('clonebundles', _('clone bundles'))
327 return self._call('clonebundles')
328
325 @batchable
329 @batchable
326 def lookup(self, key):
330 def lookup(self, key):
327 self.requirecap('lookup', _('look up remote revision'))
331 self.requirecap('lookup', _('look up remote revision'))
General Comments 0
You need to be logged in to leave comments. Login now