This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12555

procutil: avoid `+= None` when writing to full std{err,out} descriptor on py3
AcceptedPublic

Authored by mharbison72 on Wed, Apr 13, 6:48 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

The write function returns None if there was no room to write the given
data[1]. I don't like that this is effectively an infinite loop if there's
never any progress emptying the underlying buffer, but we're no worse off than
before, and it fixes random stacktrace popups seen in the py3 build of
TortoiseHg.

[1] https://docs.python.org/3/library/io.html#io.RawIOBase.write

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/procutil.py (4 lines)

Diff 33170

mercurial/utils/procutil.py

return getattr(self.orig, attr) return getattr(self.orig, attr)
def write(self, s): def write(self, s):
write1 = self.orig.write write1 = self.orig.write
m = memoryview(s) m = memoryview(s)
total_to_write = len(s) total_to_write = len(s)
total_written = 0 total_written = 0
while total_written < total_to_write: while total_written < total_to_write:
total_written += write1(m[total_written:]) c = write1(m[total_written:])
if c:
total_written += c
return total_written return total_written
# pytype: disable=attribute-error # pytype: disable=attribute-error
io.IOBase.register(WriteAllWrapper) io.IOBase.register(WriteAllWrapper)
# pytype: enable=attribute-error # pytype: enable=attribute-error