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

# Extract version number into 4 parts, some of which may be empty:

     2

#

     3

# version: the numeric part of the most recent tag. Will always look like 1.3.

     4

#

     5

# type: if an rc build, "rc", otherwise empty

     6

#

     7

# distance: the distance from the nearest tag, or empty if built from a tag

     8

#

     9

# node: the node|short hg was built from, or empty if built from a tag

    10

gethgversion() {

    11

    if [ -z "${1+x}" ]; then

    12

        python="python"

    13

    else

    14

        python="$1"

    15

    fi

    16

    export HGRCPATH=

    17

    export HGPLAIN=

    18

    19

    make cleanbutpackages PYTHON=$python

    20

    make local PURE=--pure PYTHON=$python

    21

    HG="$PWD/hg"

    22

    23

    $python "$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }

    24

    25

    hgversion=`LANGUAGE=C $python "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`

    26

    27

    if echo $hgversion | grep + > /dev/null 2>&1 ; then

    28

        tmp=`echo $hgversion | cut -d+ -f 2`

    29

        hgversion=`echo $hgversion | cut -d+ -f 1`

    30

        distance=`echo $tmp | cut -d- -f 1`

    31

        node=`echo $tmp | cut -d- -f 2`

    32

    else

    33

        distance=''

    34

        node=''

    35

    fi

    36

    if echo $hgversion | grep -E -- '[0-9]\.[0-9](\.[0-9])?rc' > /dev/null 2>&1; then

    37

        version=`echo $hgversion | cut -d'r' -f1`

    38

        type="rc`echo $hgversion | cut -d'c' -f2-`"

    39

    else

    40

        version=$hgversion

    41

        type=''

    42

    fi

    43

}