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

Minimal hgk check

     2

     3

  $ echo "[extensions]" >> $HGRCPATH

     4

  $ echo "hgk=" >> $HGRCPATH

     5

  $ hg init repo

     6

  $ cd repo

     7

  $ echo a > a

     8

  $ hg ci -Am adda

     9

  adding a

    10

  $ hg debug-cat-file commit 0

    11

  tree a0c8bcbbb45c

    12

  parent 000000000000

    13

  author test 0 0

    14

  revision 0

    15

  branch default

    16

  phase draft

    17

    18

  adda

    19

  $ echo b > b

    20

  $ hg ci -Am addb

    21

  adding b

    22

  $ hg log -T '{node}\n'

    23

  102a90ea7b4a3361e4082ed620918c261189a36a

    24

  07f4944404050f47db2e5c5071e0e84e7a27bba9

    25

    26

  $ hg debug-diff-tree 07f494440405 102a90ea7b4a

    27

  :000000 100664 000000000000 1e88685f5dde N	b	b

    28

  $ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch

    29

  diff --git a/b b/b

    30

  new file mode 100644

    31

  --- /dev/null

    32

  +++ b/b

    33

  @@ -0,0 +1,1 @@

    34

  +b

    35

    36

Ensure that diff-tree output isn't affected by diffopts

    37

  $ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a

    38

  :000000 100664 000000000000 1e88685f5dde N	b	b

    39

  $ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a

    40

  diff --git a/b b/b

    41

  new file mode 100644

    42

  --- /dev/null

    43

  +++ b/b

    44

  @@ -0,0 +1,1 @@

    45

  +b

    46

    47

  $ cd ..