This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2274

py3: stringify integer with %d instead of bytes()
ClosedPublic

Authored by indygreg on Feb 14 2018, 7:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb67d4b7e8235: py3: stringify integer with %d instead of bytes()
Summary

The unbundle wire protocol command now returns a properly formatted
reply in Python 3.

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 14 2018, 7:42 PM
durin42 accepted this revision.Feb 14 2018, 8:35 PM
This revision is now accepted and ready to land.Feb 14 2018, 8:35 PM
Closed by commit rHGb67d4b7e8235: py3: stringify integer with %d instead of bytes() (authored by indygreg). · Explain WhyFeb 14 2018, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (2 lines)

Diff 5736

mercurial/wireprotoserver.py

elif isinstance(rsp, wireprototypes.bytesresponse): elif isinstance(rsp, wireprototypes.bytesresponse):
_sshv1respondbytes(self._fout, rsp.data) _sshv1respondbytes(self._fout, rsp.data)
elif isinstance(rsp, wireprototypes.streamres): elif isinstance(rsp, wireprototypes.streamres):
_sshv1respondstream(self._fout, rsp) _sshv1respondstream(self._fout, rsp)
elif isinstance(rsp, wireprototypes.streamreslegacy): elif isinstance(rsp, wireprototypes.streamreslegacy):
_sshv1respondstream(self._fout, rsp) _sshv1respondstream(self._fout, rsp)
elif isinstance(rsp, wireprototypes.pushres): elif isinstance(rsp, wireprototypes.pushres):
_sshv1respondbytes(self._fout, b'') _sshv1respondbytes(self._fout, b'')
_sshv1respondbytes(self._fout, bytes(rsp.res)) _sshv1respondbytes(self._fout, b'%d' % rsp.res)
elif isinstance(rsp, wireprototypes.pusherr): elif isinstance(rsp, wireprototypes.pusherr):
_sshv1respondbytes(self._fout, rsp.res) _sshv1respondbytes(self._fout, rsp.res)
elif isinstance(rsp, wireprototypes.ooberror): elif isinstance(rsp, wireprototypes.ooberror):
_sshv1respondooberror(self._fout, self._ui.ferr, rsp.message) _sshv1respondooberror(self._fout, self._ui.ferr, rsp.message)
else: else:
raise error.ProgrammingError('unhandled response type from ' raise error.ProgrammingError('unhandled response type from '
'wire protocol command: %s' % rsp) 'wire protocol command: %s' % rsp)
elif cmd: elif cmd:
_sshv1respondbytes(self._fout, b'') _sshv1respondbytes(self._fout, b'')
return cmd != '' return cmd != ''