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

basic:

     2

     3

* neither file exists

     4

creating

     5

* neither file still exists

     6

* empty file x created

     7

creating

     8

* file x changed size

     9

creating

    10

* nothing changed with either file

    11

* file x changed inode

    12

creating

    13

* empty file y created

    14

creating

    15

* file y changed size

    16

creating

    17

* file y changed inode

    18

creating

    19

* both files changed inode

    20

creating

    21

    22

fakeuncacheable:

    23

    24

* neither file exists

    25

creating

    26

* neither file still exists

    27

creating

    28

* empty file x created

    29

creating

    30

* file x changed size

    31

creating

    32

* nothing changed with either file

    33

creating

    34

* file x changed inode

    35

creating

    36

* empty file y created

    37

creating

    38

* file y changed size

    39

creating

    40

* file y changed inode

    41

creating

    42

* both files changed inode

    43

creating

    44

repository tip rolled back to revision -1 (undo commit)

    45

working directory now based on revision -1

    46

repository tip rolled back to revision -1 (undo commit)

    47

working directory now based on revision -1

    48

    49

setbeforeget:

    50

    51

* neither file exists

    52

string set externally

    53

* file x created

    54

creating

    55

string from function

    56

* string set externally again

    57

string 2 set externally

    58

* file y created

    59

creating

    60

string from function

    61

    62

antiambiguity:

    63