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

https://bz.mercurial-scm.org/1877

     2

     3

  $ hg init a

     4

  $ cd a

     5

  $ echo a > a

     6

  $ hg add a

     7

  $ hg ci -m 'a'

     8

  $ echo b > a

     9

  $ hg ci -m'b'

    10

  $ hg up 0

    11

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

    12

  $ hg book main

    13

  $ hg book

    14

   * main                      0:cb9a9f314b8b

    15

  $ echo c > c

    16

  $ hg add c

    17

  $ hg ci -m'c'

    18

  created new head

    19

  $ hg book

    20

   * main                      2:d36c0562f908

    21

  $ hg heads

    22

  changeset:   2:d36c0562f908

    23

  bookmark:    main

    24

  tag:         tip

    25

  parent:      0:cb9a9f314b8b

    26

  user:        test

    27

  date:        Thu Jan 01 00:00:00 1970 +0000

    28

  summary:     c

    29

    30

  changeset:   1:1e6c11564562

    31

  user:        test

    32

  date:        Thu Jan 01 00:00:00 1970 +0000

    33

  summary:     b

    34

    35

  $ hg up 1e6c11564562

    36

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

    37

  (leaving bookmark main)

    38

  $ hg merge main

    39

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

    40

  (branch merge, don't forget to commit)

    41

  $ hg book

    42

     main                      2:d36c0562f908

    43

  $ hg ci -m'merge'

    44

  $ hg book

    45

     main                      2:d36c0562f908

    46

    47

  $ cd ..