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 a

     2

  $ cd a

     3

  $ echo a > a

     4

  $ hg ci -Am0

     5

  adding a

     6

  $ echo b > b

     7

  $ hg ci -Am1

     8

  adding b

     9

  $ hg tag -r0 default

    10

  warning: tag default conflicts with existing branch name

    11

  $ hg log

    12

  changeset:   2:30a83d1e4a1e

    13

  tag:         tip

    14

  user:        test

    15

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

    16

  summary:     Added tag default for changeset f7b1eb17ad24

    17

    18

  changeset:   1:925d80f479bb

    19

  user:        test

    20

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

    21

  summary:     1

    22

    23

  changeset:   0:f7b1eb17ad24

    24

  tag:         default

    25

  user:        test

    26

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

    27

  summary:     0

    28

    29

  $ hg update 'tag(default)'

    30

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

    31

  $ hg parents

    32

  changeset:   0:f7b1eb17ad24

    33

  tag:         default

    34

  user:        test

    35

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

    36

  summary:     0

    37

    38

  $ hg update 'branch(default)'

    39

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

    40

  $ hg parents

    41

  changeset:   2:30a83d1e4a1e

    42

  tag:         tip

    43

  user:        test

    44

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

    45

  summary:     Added tag default for changeset f7b1eb17ad24

    46

    47

    48

  $ cd ..