This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2378

sshpeer: rename _recv and _send to _readframed and _writeframed
ClosedPublic

Authored by indygreg on Feb 21 2018, 5:07 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG7f8f74531b0b: sshpeer: rename _recv and _send to _readframed and _writeframed
Summary

Because it is reading and writing a chunk of data with a well-defined
size. "recv" and "send" make it sound like things are a direct proxy to
the underlying pipe, which they aren't.

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.Feb 21 2018, 5:07 PM
yuja accepted this revision.Feb 22 2018, 9:05 AM
This revision is now accepted and ready to land.Feb 22 2018, 9:05 AM
Closed by commit rHG7f8f74531b0b: sshpeer: rename _recv and _send to _readframed and _writeframed (authored by indygreg). · Explain WhyFeb 22 2018, 9:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (18 lines)

Diff 5996

mercurial/sshpeer.py

return self._pipei return self._pipei
def _callcompressable(self, cmd, **args): def _callcompressable(self, cmd, **args):
return self._callstream(cmd, **args) return self._callstream(cmd, **args)
def _call(self, cmd, **args): def _call(self, cmd, **args):
self._callstream(cmd, **args) self._callstream(cmd, **args)
return self._recv() return self._readframed()
def _callpush(self, cmd, fp, **args): def _callpush(self, cmd, fp, **args):
r = self._call(cmd, **args) r = self._call(cmd, **args)
if r: if r:
return '', r return '', r
for d in iter(lambda: fp.read(4096), ''): for d in iter(lambda: fp.read(4096), ''):
self._send(d) self._writeframed(d)
self._send("", flush=True) self._writeframed("", flush=True)
r = self._recv() r = self._readframed()
if r: if r:
return '', r return '', r
return self._recv(), '' return self._readframed(), ''
def _calltwowaystream(self, cmd, fp, **args): def _calltwowaystream(self, cmd, fp, **args):
r = self._call(cmd, **args) r = self._call(cmd, **args)
if r: if r:
# XXX needs to be made better # XXX needs to be made better
raise error.Abort(_('unexpected remote reply: %s') % r) raise error.Abort(_('unexpected remote reply: %s') % r)
for d in iter(lambda: fp.read(4096), ''): for d in iter(lambda: fp.read(4096), ''):
self._send(d) self._writeframed(d)
self._send("", flush=True) self._writeframed("", flush=True)
return self._pipei return self._pipei
def _getamount(self): def _getamount(self):
l = self._pipei.readline() l = self._pipei.readline()
if l == '\n': if l == '\n':
self._readerr() self._readerr()
msg = _('check previous remote output') msg = _('check previous remote output')
self._abort(error.OutOfBandError(hint=msg)) self._abort(error.OutOfBandError(hint=msg))
self._readerr() self._readerr()
try: try:
return int(l) return int(l)
except ValueError: except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), l)) self._abort(error.ResponseError(_("unexpected response:"), l))
def _recv(self): def _readframed(self):
return self._pipei.read(self._getamount()) 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)) self._pipeo.write("%d\n" % len(data))
if data: if data:
self._pipeo.write(data) self._pipeo.write(data)
if flush: if flush:
self._pipeo.flush() self._pipeo.flush()
self._readerr() self._readerr()
class sshv2peer(sshv1peer): class sshv2peer(sshv1peer):