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

     2

     3

  $ mkdir alpha

     4

  $ touch alpha/one

     5

  $ mkdir beta

     6

  $ touch beta/two

     7

     8

  $ hg add alpha/one beta/two

     9

  $ hg ci -m "start"

    10

    11

  $ echo 1 > alpha/one

    12

  $ echo 2 > beta/two

    13

    14

everything

    15

    16

  $ hg diff --nodates

    17

  diff -r 7d5ef1aea329 alpha/one

    18

  --- a/alpha/one

    19

  +++ b/alpha/one

    20

  @@ -0,0 +1,1 @@

    21

  +1

    22

  diff -r 7d5ef1aea329 beta/two

    23

  --- a/beta/two

    24

  +++ b/beta/two

    25

  @@ -0,0 +1,1 @@

    26

  +2

    27

    28

beta only

    29

    30

  $ hg diff --nodates beta

    31

  diff -r 7d5ef1aea329 beta/two

    32

  --- a/beta/two

    33

  +++ b/beta/two

    34

  @@ -0,0 +1,1 @@

    35

  +2

    36

    37

inside beta

    38

    39

  $ cd beta

    40

  $ hg diff --nodates .

    41

  diff -r 7d5ef1aea329 beta/two

    42

  --- a/beta/two

    43

  +++ b/beta/two

    44

  @@ -0,0 +1,1 @@

    45

  +2

    46

    47

relative to beta

    48

    49

  $ cd ..

    50

  $ hg diff --nodates --root beta

    51

  diff -r 7d5ef1aea329 two

    52

  --- a/two

    53

  +++ b/two

    54

  @@ -0,0 +1,1 @@

    55

  +2

    56

    57

inside beta

    58

    59

  $ cd beta

    60

  $ hg diff --nodates --root .

    61

  diff -r 7d5ef1aea329 two

    62

  --- a/two

    63

  +++ b/two

    64

  @@ -0,0 +1,1 @@

    65

  +2

    66

    67

  $ cd ..