This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8859

keepalive: Do not append _rbuf if _raw_readinto exists (issue6356)
ClosedPublic

Authored by ced on Aug 2 2020, 11:41 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHG49f8ba4febec: keepalive: Do not append _rbuf if _raw_readinto exists (issue6356)
Summary

The readline method append to the chunks the content of the _rbuf then there
is a loop that call _raw_read which on Python3 call readinto. But the readinto
version in mercurial append again the _rbuf content. So this creates the
duplicate content. This does not happen in Python2 because _raw_read does not
call readinto.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

ced created this revision.Aug 2 2020, 11:41 AM
marmoute accepted this revision.Aug 6 2020, 7:25 AM
marmoute added a subscriber: marmoute.

Looks legit. Thanks.

indygreg accepted this revision.Aug 8 2020, 5:01 PM
indygreg added a subscriber: indygreg.

Good work tracking down this obscure failure!

I'm going to land this in the stable branch so it is in the next release.

This revision is now accepted and ready to land.Aug 8 2020, 5:01 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/keepalive.py (6 lines)

Diff 22175

mercurial/keepalive.py

i = self._rbuf.find(b'\n') i = self._rbuf.find(b'\n')
if i >= 0: if i >= 0:
i += 1 i += 1
line = self._rbuf[:i] line = self._rbuf[:i]
self._rbuf = self._rbuf[i:] self._rbuf = self._rbuf[i:]
return line return line
# No newline in local buffer. Read until we find one. # No newline in local buffer. Read until we find one.
# readinto read via readinto will already return _rbuf
if self._raw_readinto is None:
chunks = [self._rbuf] chunks = [self._rbuf]
else:
chunks = []
i = -1 i = -1
readsize = self._rbufsize readsize = self._rbufsize
while True: while True:
new = self._raw_read(readsize) new = self._raw_read(readsize)
if not new: if not new:
break break
self.receivedbytescount += len(new) self.receivedbytescount += len(new)