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

  $ cat <<EOF >> $HGRCPATH

     2

  > [extensions]

     3

  > hooklib =

     4

  > 

     5

  > [phases]

     6

  > publish = False

     7

  > EOF

     8

  $ hg init a

     9

  $ hg --cwd a debugbuilddag '.:parent.*parent'

    10

  $ hg --cwd a log -G

    11

  o  changeset:   2:fa942426a6fd

    12

  |  tag:         tip

    13

  |  parent:      0:1ea73414a91b

    14

  |  user:        debugbuilddag

    15

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

    16

  |  summary:     r2

    17

  |

    18

  | o  changeset:   1:66f7d451a68b

    19

  |/   user:        debugbuilddag

    20

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

    21

  |    summary:     r1

    22

  |

    23

  o  changeset:   0:1ea73414a91b

    24

     tag:         parent

    25

     user:        debugbuilddag

    26

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

    27

     summary:     r0

    28

    29

  $ hg init b

    30

  $ cat <<EOF >> b/.hg/hgrc

    31

  > [hooks]

    32

  > pretxnclose.reject_new_heads = \

    33

  >   python:hgext.hooklib.reject_new_heads.hook

    34

  > EOF

    35

  $ hg --cwd b pull ../a

    36

  pulling from ../a

    37

  requesting all changes

    38

  adding changesets

    39

  adding manifests

    40

  adding file changes

    41

  error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads

    42

  transaction abort!

    43

  rollback completed

    44

  abort: Changes on branch 'default' resulted in multiple heads

    45

  [255]

    46

  $ hg --cwd b pull ../a -r 1ea73414a91b

    47

  pulling from ../a

    48

  adding changesets

    49

  adding manifests

    50

  adding file changes

    51

  added 1 changesets with 0 changes to 0 files

    52

  new changesets 1ea73414a91b (1 drafts)

    53

  (run 'hg update' to get a working copy)