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

  $ hg init

     2

  $ touch a

     3

  $ hg add a

     4

  $ hg ci -m "a"

     5

     6

  $ echo 123 > b

     7

  $ hg add b

     8

  $ hg diff --nodates

     9

  diff -r 3903775176ed b

    10

  --- /dev/null

    11

  +++ b/b

    12

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

    13

  +123

    14

    15

  $ hg diff --nodates -r tip

    16

  diff -r 3903775176ed b

    17

  --- /dev/null

    18

  +++ b/b

    19

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

    20

  +123

    21

    22

  $ echo foo > a

    23

  $ hg diff --nodates

    24

  diff -r 3903775176ed a

    25

  --- a/a

    26

  +++ b/a

    27

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

    28

  +foo

    29

  diff -r 3903775176ed b

    30

  --- /dev/null

    31

  +++ b/b

    32

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

    33

  +123

    34

    35

  $ hg diff -r ""

    36

  hg: parse error: empty query

    37

  [10]

    38

  $ hg diff -r tip -r ""

    39

  hg: parse error: empty query

    40

  [10]

    41

    42

Remove a file that was added via merge. Since the file is not in parent 1,

    43

it should not be in the diff.

    44

    45

  $ hg ci -m 'a=foo' a

    46

  $ hg co -Cq null

    47

  $ echo 123 > b

    48

  $ hg add b

    49

  $ hg ci -m "b"

    50

  created new head

    51

  $ hg merge 1

    52

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

    53

  (branch merge, don't forget to commit)

    54

  $ hg rm -f a

    55

  $ hg diff --nodates

    56

    57

Rename a file that was added via merge. Since the rename source is not in

    58

parent 1, the diff should be relative to /dev/null

    59

    60

  $ hg co -Cq 2

    61

  $ hg merge 1

    62

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

    63

  (branch merge, don't forget to commit)

    64

  $ hg mv a a2

    65

  $ hg diff --nodates

    66

  diff -r cf44b38435e5 a2

    67

  --- /dev/null

    68

  +++ b/a2

    69

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

    70

  +foo

    71

  $ hg diff --nodates --git

    72

  diff --git a/a2 b/a2

    73

  new file mode 100644

    74

  --- /dev/null

    75

  +++ b/a2

    76

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

    77

  +foo