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

  $ for i in aaa zzz; do

     2

  >     hg init t

     3

  >     cd t

     4

  > 

     5

  >     echo

     6

  >     echo "-- With $i"

     7

  > 

     8

  >     touch file

     9

  >     hg add file

    10

  >     hg ci -m "Add"

    11

  > 

    12

  >     hg cp file $i

    13

  >     hg ci -m "a -> $i"

    14

  > 

    15

  >     hg cp $i other-file

    16

  >     echo "different" >> $i

    17

  >     hg ci -m "$i -> other-file"

    18

  > 

    19

  >     hg cp other-file somename

    20

  > 

    21

  >     echo "Status":

    22

  >     hg st -C

    23

  >     echo

    24

  >     echo "Diff:"

    25

  >     hg diff -g

    26

  > 

    27

  >     cd ..

    28

  >     rm -rf t

    29

  > done

    30

    31

  -- With aaa

    32

  Status:

    33

  A somename

    34

    other-file

    35

    36

  Diff:

    37

  diff --git a/other-file b/somename

    38

  copy from other-file

    39

  copy to somename

    40

    41

  -- With zzz

    42

  Status:

    43

  A somename

    44

    other-file

    45

    46

  Diff:

    47

  diff --git a/other-file b/somename

    48

  copy from other-file

    49

  copy to somename

    50

    51