mercurial-scm/hg: mercurial/wireproto.py comparison

comparison mercurial/wireproto.py @ 33806:dedab036215d

wireproto: use new peer interface The wirepeer class provides concrete implementations of peer interface methods for calling wire protocol commands. It makes sense for this class to inherit from the peer abstract base class. So we change that. Since httppeer and sshpeer have already been converted to the new interface, peerrepository is no longer adding any value. So it has been removed. httppeer and sshpeer have been updated to reflect the loss of peerrepository and the inheritance of the abstract base class in wirepeer. The code changes in wirepeer are reordering of methods to group by interface. Some Python code in tests was updated to reflect changed APIs. .. api:: peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository. Differential Revision: https://phab.mercurial-scm.org/D338

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 10 Aug 2017 20:58:28 -0700
parents	b47fe9733d76
children	6c6169f71b8d

comparison

equal deleted inserted replaced

-:f913e90f15a0
+:dedab036215d
 error,
 exchange,
 peer,
 pushkey as pushkeymod,
 pycompat,
+repository,
 streamclone,
 util,
 )
 urlerr = util.urlerr
 'cg': 'boolean',
 'cbattempted': 'boolean'}
 # client side
-class wirepeer(peer.peerrepository):
+class wirepeer(repository.legacypeer):
 """Client-side interface for communicating with a peer repository.
 Methods commonly call wire protocol commands of the same name.
 See also httppeer.py and sshpeer.py for protocol-specific
 implementations of this interface.
 """
-def _submitbatch(self, req):
+# Begin of basewirepeer interface.
-"""run batch request <req> on the server
-Returns an iterator of the raw responses from the server.
-"""
-rsp = self._callstream("batch", cmds=encodebatchcmds(req))
-chunk = rsp.read(1024)
-work = [chunk]
-while chunk:
-while ';' not in chunk and chunk:
-chunk = rsp.read(1024)
-work.append(chunk)
-merged = ''.join(work)
-while ';' in merged:
-one, merged = merged.split(';', 1)
-yield unescapearg(one)
-chunk = rsp.read(1024)
-work = [merged, chunk]
-yield unescapearg(''.join(work))
-def _submitone(self, op, args):
-return self._call(op, **args)
 def iterbatch(self):
 return remoteiterbatcher(self)
 @batchable
 branchmap[branchname] = branchheads
 yield branchmap
 except TypeError:
 self._abort(error.ResponseError(_("unexpected response:"), d))
-def branches(self, nodes):
+@batchable
-n = encodelist(nodes)
+def listkeys(self, namespace):
-d = self._call("branches", nodes=n)
+if not self.capable('pushkey'):
-try:
+yield {}, None
-br = [tuple(decodelist(b)) for b in d.splitlines()]
+f = future()
-return br
+self.ui.debug('preparing listkeys for "%s"\n' % namespace)
-except ValueError:
+yield {'namespace': encoding.fromlocal(namespace)}, f
-self._abort(error.ResponseError(_("unexpected response:"), d))
+d = f.value
+self.ui.debug('received listkey for "%s": %i bytes\n'
-def between(self, pairs):
+% (namespace, len(d)))
-batch = 8 # avoid giant requests
+yield pushkeymod.decodekeys(d)
-r = []
-for i in xrange(0, len(pairs), batch):
-n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
-d = self._call("between", pairs=n)
-try:
-r.extend(l and decodelist(l) or [] for l in d.splitlines())
-except ValueError:
-self._abort(error.ResponseError(_("unexpected response:"), d))
-return r
 @batchable
 def pushkey(self, namespace, key, old, new):
 if not self.capable('pushkey'):
 yield False, None
 _('push failed (unexpected response):'), d)
 for l in output.splitlines(True):
 self.ui.status(_('remote: '), l)
 yield d
-@batchable
-def listkeys(self, namespace):
-if not self.capable('pushkey'):
-yield {}, None
-f = future()
-self.ui.debug('preparing listkeys for "%s"\n' % namespace)
-yield {'namespace': encoding.fromlocal(namespace)}, f
-d = f.value
-self.ui.debug('received listkey for "%s": %i bytes\n'
-% (namespace, len(d)))
-yield pushkeymod.decodekeys(d)
 def stream_out(self):
 return self._callstream('stream_out')
-def changegroup(self, nodes, kind):
-n = encodelist(nodes)
-f = self._callcompressable("changegroup", roots=n)
-return changegroupmod.cg1unpacker(f, 'UN')
-def changegroupsubset(self, bases, heads, kind):
-self.requirecap('changegroupsubset', _('look up remote changes'))
-bases = encodelist(bases)
-heads = encodelist(heads)
-f = self._callcompressable("changegroupsubset",
-bases=bases, heads=heads)
-return changegroupmod.cg1unpacker(f, 'UN')
 def getbundle(self, source, **kwargs):
 self.requirecap('getbundle', _('look up remote changes'))
 opts = {}
 bundlecaps = kwargs.get('bundlecaps')
 else:
 # bundle2 push. Send a stream, fetch a stream.
 stream = self._calltwowaystream('unbundle', cg, heads=heads)
 ret = bundle2.getunbundler(self.ui, stream)
 return ret
+# End of basewirepeer interface.
+# Begin of baselegacywirepeer interface.
+def branches(self, nodes):
+n = encodelist(nodes)
+d = self._call("branches", nodes=n)
+try:
+br = [tuple(decodelist(b)) for b in d.splitlines()]
+return br
+except ValueError:
+self._abort(error.ResponseError(_("unexpected response:"), d))
+def between(self, pairs):
+batch = 8 # avoid giant requests
+r = []
+for i in xrange(0, len(pairs), batch):
+n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
+d = self._call("between", pairs=n)
+try:
+r.extend(l and decodelist(l) or [] for l in d.splitlines())
+except ValueError:
+self._abort(error.ResponseError(_("unexpected response:"), d))
+return r
+def changegroup(self, nodes, kind):
+n = encodelist(nodes)
+f = self._callcompressable("changegroup", roots=n)
+return changegroupmod.cg1unpacker(f, 'UN')
+def changegroupsubset(self, bases, heads, kind):
+self.requirecap('changegroupsubset', _('look up remote changes'))
+bases = encodelist(bases)
+heads = encodelist(heads)
+f = self._callcompressable("changegroupsubset",
+bases=bases, heads=heads)
+return changegroupmod.cg1unpacker(f, 'UN')
+# End of baselegacywirepeer interface.
+def _submitbatch(self, req):
+"""run batch request <req> on the server
+Returns an iterator of the raw responses from the server.
+"""
+rsp = self._callstream("batch", cmds=encodebatchcmds(req))
+chunk = rsp.read(1024)
+work = [chunk]
+while chunk:
+while ';' not in chunk and chunk:
+chunk = rsp.read(1024)
+work.append(chunk)
+merged = ''.join(work)
+while ';' in merged:
+one, merged = merged.split(';', 1)
+yield unescapearg(one)
+chunk = rsp.read(1024)
+work = [merged, chunk]
+yield unescapearg(''.join(work))
+def _submitone(self, op, args):
+return self._call(op, **args)
 def debugwireargs(self, one, two, three=None, four=None, five=None):
 # don't pass optional arguments left at their default value
 opts = {}
 if three is not None:

Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.py @ 33806:dedab036215d