From patchwork Thu Feb 22 14:18:40 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D2378: sshpeer: rename _recv and _send to _readframed and _writeframed
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 28250
Message-Id: <790646178c1eb099c6bbc1c64ed881d8@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 22 Feb 2018 14:18:40 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7f8f74531b0b: sshpeer: rename _recv and _send to _readframed and _writeframed (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2378?vs=5964&id=5996

REVISION DETAIL
  https://phab.mercurial-scm.org/D2378

AFFECTED FILES
  mercurial/sshpeer.py

CHANGE DETAILS




To: indygreg, #hg-reviewers, yuja
Cc: mercurial-devel

diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
--- a/mercurial/sshpeer.py
+++ b/mercurial/sshpeer.py
@@ -452,28 +452,28 @@
 
     def _call(self, cmd, **args):
         self._callstream(cmd, **args)
-        return self._recv()
+        return self._readframed()
 
     def _callpush(self, cmd, fp, **args):
         r = self._call(cmd, **args)
         if r:
             return '', r
         for d in iter(lambda: fp.read(4096), ''):
-            self._send(d)
-        self._send("", flush=True)
-        r = self._recv()
+            self._writeframed(d)
+        self._writeframed("", flush=True)
+        r = self._readframed()
         if r:
             return '', r
-        return self._recv(), ''
+        return self._readframed(), ''
 
     def _calltwowaystream(self, cmd, fp, **args):
         r = self._call(cmd, **args)
         if r:
             # XXX needs to be made better
             raise error.Abort(_('unexpected remote reply: %s') % r)
         for d in iter(lambda: fp.read(4096), ''):
-            self._send(d)
-        self._send("", flush=True)
+            self._writeframed(d)
+        self._writeframed("", flush=True)
         return self._pipei
 
     def _getamount(self):
@@ -488,10 +488,10 @@
         except ValueError:
             self._abort(error.ResponseError(_("unexpected response:"), l))
 
-    def _recv(self):
+    def _readframed(self):
         return self._pipei.read(self._getamount())
 
-    def _send(self, data, flush=False):
+    def _writeframed(self, data, flush=False):
         self._pipeo.write("%d\n" % len(data))
         if data:
             self._pipeo.write(data)