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

  $ hg init base

     2

     3

  $ cd base

     4

  $ echo 'alpha' > alpha

     5

  $ hg ci -A -m 'add alpha'

     6

  adding alpha

     7

  $ cd ..

     8

     9

  $ hg clone base work

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

    13

  $ cd work

    14

  $ echo 'beta' > beta

    15

  $ hg ci -A -m 'add beta'

    16

  adding beta

    17

  $ cd ..

    18

    19

  $ cd base

    20

  $ echo 'gamma' > gamma

    21

  $ hg ci -A -m 'add gamma'

    22

  adding gamma

    23

  $ cd ..

    24

    25

  $ cd work

    26

  $ hg pull -q

    27

  $ hg merge

    28

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

  (branch merge, don't forget to commit)

    30

    31

Update --clean to revision 1 to simulate a failed merge:

    32

    33

  $ rm alpha beta gamma

    34

  $ hg update --clean 1

    35

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    36

    37

  $ cd ..