comparison mercurial/wireprotov1peer.py @ 37635:cc8c06835097

wireproto: convert legacy commands to command executor Calls to the legacy commands "changegroup" and "changegroupsubset" have been ported to the new command executor interface. Because we always pass arguments by name and not position, some inconsistent names throughout the code base have been unified. As part of this change, we no longer had any remaining callers of the legacy command methods {between, branches, changegroup, changegroupsubset}. So, these interfaces/methods have been dropped from peer interfaces. We still have an interface declaring these methods. But that interface is implemented on the concrete peer types and isn't part of the generic peer interface. (The implementations of the command executor continue to call these methods.) The ultimate goal is to remove the per-command methods from the generic peer interface: the only interface-conforming way to call a command will be with the new executor API. At some point, we may want to move the methods outside of the peer classes and change the executor implementations to not call methods directly on a peer instance. Differential Revision: https://phab.mercurial-scm.org/D3273
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 13 Apr 2018 11:12:19 -0700
parents 33a6eee08db2
children 72e26319f3b8
comparison
equal deleted inserted replaced
37634:0ed11f9368fd 37635:cc8c06835097
306 except Exception: 306 except Exception:
307 f.set_exception_info(*sys.exc_info()[1:]) 307 f.set_exception_info(*sys.exc_info()[1:])
308 else: 308 else:
309 f.set_result(result) 309 f.set_result(result)
310 310
311 class wirepeer(repository.legacypeer): 311 @zi.implementer(repository.ipeerlegacycommands)
312 class wirepeer(repository.peer):
312 """Client-side interface for communicating with a peer repository. 313 """Client-side interface for communicating with a peer repository.
313 314
314 Methods commonly call wire protocol commands of the same name. 315 Methods commonly call wire protocol commands of the same name.
315 316
316 See also httppeer.py and sshpeer.py for protocol-specific 317 See also httppeer.py and sshpeer.py for protocol-specific
500 for l in d.splitlines()) 501 for l in d.splitlines())
501 except ValueError: 502 except ValueError:
502 self._abort(error.ResponseError(_("unexpected response:"), d)) 503 self._abort(error.ResponseError(_("unexpected response:"), d))
503 return r 504 return r
504 505
505 def changegroup(self, nodes, kind): 506 def changegroup(self, nodes, source):
506 n = wireprototypes.encodelist(nodes) 507 n = wireprototypes.encodelist(nodes)
507 f = self._callcompressable("changegroup", roots=n) 508 f = self._callcompressable("changegroup", roots=n)
508 return changegroupmod.cg1unpacker(f, 'UN') 509 return changegroupmod.cg1unpacker(f, 'UN')
509 510
510 def changegroupsubset(self, bases, heads, kind): 511 def changegroupsubset(self, bases, heads, source):
511 self.requirecap('changegroupsubset', _('look up remote changes')) 512 self.requirecap('changegroupsubset', _('look up remote changes'))
512 bases = wireprototypes.encodelist(bases) 513 bases = wireprototypes.encodelist(bases)
513 heads = wireprototypes.encodelist(heads) 514 heads = wireprototypes.encodelist(heads)
514 f = self._callcompressable("changegroupsubset", 515 f = self._callcompressable("changegroupsubset",
515 bases=bases, heads=heads) 516 bases=bases, heads=heads)