procutil: make stream detection in make_line_buffered more correct and strict In make_line_buffered(), we don’t want to wrap the stream if we know that lines get flushed to the underlying raw stream already. Previously, the heuristic was too optimistic. It assumed that any stream which is not an instance of io.BufferedIOBase doesn’t need wrapping. However, there are buffered streams that aren’t instances of io.BufferedIOBase, like Mercurial’s own winstdout. The new logic is different in two ways: First, only for the check, if unwraps any combination of WriteAllWrapper and winstdout. Second, it skips wrapping the stream only if it is an instance of io.RawIOBase (or already wrapped). If it is an instance of io.BufferedIOBase, it gets wrapped. In any other case, the function raises an exception. This ensures that, if an unknown stream is passed or we add another wrapper in the future, we don’t wrap the stream if it’s already line buffered or not wrap the stream if it’s not line buffered. In fact, this was already helpful during development of this change. Without it, I possibly would have forgot that WriteAllWrapper needs to be ignored for the check, leading to unnecessary wrapping if stdout is unbuffered. The alternative would have been to always wrap unknown streams. However, I don’t think that anyone would benefit from being less strict. We can expect streams from the standard library to be subclassing either io.RawIOBase or io.BufferedIOBase, so running Mercurial in the standard way should not regress by this change. Py2exe might replace sys.stdout and sys.stderr, but that currently breaks Mercurial anyway and also these streams don’t claim to be interactive, so this function is not called for them.

     1

syntax: glob

     2

     3

*.elc

     4

*.tmp

     5

*.orig

     6

*.rej

     7

*~

     8

*.mergebackup

     9

*.o

    10

*.so

    11

*.dll

    12

*.exe

    13

*.pyd

    14

*.pyc

    15

*.pyo

    16

*$py.class

    17

*.swp

    18

*.prof

    19

*.zip

    20

\#*\#

    21

.\#*

    22

tests/artifacts/cache/big-file-churn.hg

    23

tests/.coverage*

    24

tests/.testtimes*

    25

# the file is written in the CWD when run-tests is run.

    26

.testtimes

    27

tests/.hypothesis

    28

tests/hypothesis-generated

    29

tests/annotated

    30

tests/exceptions

    31

tests/python3

    32

tests/*.err

    33

tests/htmlcov

    34

build

    35

contrib/chg/chg

    36

contrib/hgsh/hgsh

    37

contrib/vagrant/.vagrant

    38

contrib/merge-lists/target/

    39

dist

    40

packages

    41

doc/common.txt

    42

doc/*.[0-9]

    43

doc/*.[0-9].txt

    44

doc/*.[0-9].gendoc.txt

    45

doc/*.[0-9].{x,ht}ml

    46

MANIFEST

    47

MANIFEST.in

    48

patches

    49

mercurial/__modulepolicy__.py

    50

mercurial/__version__.py

    51

mercurial/hgpythonlib.h

    52

mercurial.egg-info

    53

.DS_Store

    54

tags

    55

cscope.*

    56

.vscode/*

    57

.idea/*

    58

.asv/*

    59

.pytype/*

    60

.mypy_cache

    61

i18n/hg.pot

    62

locale/*/LC_MESSAGES/hg.mo

    63

hgext/__index__.py

    64

    65

rust/target/

    66

rust/*/target/

    67

    68

# Generated wheels

    69

wheelhouse/

    70

    71

syntax: rootglob

    72

# See Profiling in rust/README.rst

    73

.cargo/config

    74

    75

syntax: regexp

    76

^\.pc/

    77

^\.(pydev)?project

    78

    79

# hackable windows distribution additions

    80

^hg-python

    81

^hg.py$