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

Create an empty repo:

     2

     3

  $ hg init a

     4

  $ cd a

     5

     6

Try some commands:

     7

     8

  $ hg log

     9

  $ hg grep wah

    10

  [1]

    11

  $ hg manifest

    12

  $ hg verify

    13

  checking changesets

    14

  checking manifests

    15

  crosschecking files in changesets and manifests

    16

  checking files

    17

  checked 0 changesets with 0 changes to 0 files

    18

    19

Check the basic files created:

    20

    21

  $ ls .hg

    22

  00changelog.i

    23

  cache

    24

  requires

    25

  store

    26

  wcache

    27

    28

Should be empty (except for the "basic" requires):

    29

    30

  $ ls .hg/store

    31

  requires

    32

    33

Poke at a clone:

    34

    35

  $ cd ..

    36

  $ hg clone a b

    37

  updating to branch default

    38

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

    39

  $ cd b

    40

  $ hg verify

    41

  checking changesets

    42

  checking manifests

    43

  crosschecking files in changesets and manifests

    44

  checking files

    45

  checked 0 changesets with 0 changes to 0 files

    46

  $ ls .hg

    47

  00changelog.i

    48

  cache

    49

  dirstate

    50

  hgrc

    51

  requires

    52

  store

    53

  wcache

    54

    55

Should be empty (except for the "basic" requires):

    56

    57

  $ ls .hg/store

    58

  requires

    59

    60

  $ cd ..