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

     2

  $ cat >> $HGRCPATH <<EOF

     3

  > [extensions]

     4

  > convert=

     5

  > EOF

     6

     7

Prepare orig repo

     8

     9

  $ hg init orig

    10

  $ cd orig

    11

  $ echo foo > foo

    12

  $ HGUSER='user name' hg ci -qAm 'foo'

    13

  $ cd ..

    14

    15

Explicit --authors

    16

    17

  $ cat > authormap.txt <<EOF

    18

  > user name = Long User Name

    19

  > 

    20

  > # comment

    21

  > this line is ignored

    22

  > EOF

    23

  $ hg convert --authors authormap.txt orig new

    24

  initializing destination new repository

    25

  ignoring bad line in author map file authormap.txt: this line is ignored

    26

  scanning source...

    27

  sorting...

    28

  converting...

    29

  0 foo

    30

  writing author map file $TESTTMP/new/.hg/authormap

    31

  $ cat new/.hg/authormap

    32

  user name=Long User Name

    33

  $ hg -Rnew log

    34

  changeset:   0:d89716e88087

    35

  tag:         tip

    36

  user:        Long User Name

    37

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

    38

  summary:     foo

    39

    40

  $ rm -rf new

    41

    42

Implicit .hg/authormap

    43

    44

  $ hg init new

    45

  $ mv authormap.txt new/.hg/authormap

    46

  $ hg convert orig new

    47

  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored

    48

  scanning source...

    49

  sorting...

    50

  converting...

    51

  0 foo

    52

  $ hg -Rnew log

    53

  changeset:   0:d89716e88087

    54

  tag:         tip

    55

  user:        Long User Name

    56

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

    57

  summary:     foo

    58