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

  $ . "$TESTDIR/narrow-library.sh"

     2

  $ hg init repo

     3

  $ cd repo

     4

  $ cat << EOF > .hg/store/narrowspec

     5

  > [include]

     6

  > path:foo

     7

  > [exclude]

     8

  > EOF

     9

  $ cp .hg/store/narrowspec .hg/narrowspec.dirstate

    10

  $ echo treemanifest >> .hg/requires

    11

  $ echo narrowhg-experimental >> .hg/requires

    12

  $ mkdir -p foo/bar

    13

  $ echo b > foo/f

    14

  $ echo c > foo/bar/f

    15

  $ hg commit -Am hi

    16

  adding foo/bar/f

    17

  adding foo/f

    18

  $ hg debugindex -m

    19

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    20

       0       0 14a5d056d75a 000000000000 000000000000

    21

  $ hg debugindex --dir foo

    22

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    23

       0       0 e635c7857aef 000000000000 000000000000

    24

  $ hg debugindex --dir foo/

    25

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    26

       0       0 e635c7857aef 000000000000 000000000000

    27

  $ hg debugindex --dir foo/bar

    28

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    29

       0       0 e091d4224761 000000000000 000000000000

    30

  $ hg debugindex --dir foo/bar/

    31

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    32

       0       0 e091d4224761 000000000000 000000000000

    33

  $ hg debugdata -m 0

    34

  foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)

    35

  $ hg debugdata --dir foo 0

    36

  bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)

    37

  f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)

    38

  $ hg debugdata --dir foo/ 0

    39

  bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)

    40

  f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)

    41

  $ hg debugdata --dir foo/bar 0

    42

  f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)

    43

  $ hg debugdata --dir foo/bar/ 0

    44

  f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)