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

     2

  $ cat > writepatterns.py <<EOF

     3

  > import sys

     4

  > 

     5

  > path = sys.argv[1]

     6

  > patterns = sys.argv[2:]

     7

  > 

     8

  > fp = open(path, 'wb')

     9

  > for pattern in patterns:

    10

  >     count = int(pattern[0:-1])

    11

  >     char = pattern[-1].encode('utf8') + b'\n'

    12

  >     fp.write(char * count)

    13

  > fp.close()

    14

  > EOF

    15

    16

prepare repo

    17

    18

  $ hg init a

    19

  $ cd a

    20

    21

These initial lines of Xs were not in the original file used to generate

    22

the patch.  So all the patch hunks need to be applied to a constant offset

    23

within this file.  If the offset isn't tracked then the hunks can be

    24

applied to the wrong lines of this file.

    25

    26

  $ "$PYTHON" ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A

    27

  $ hg commit -Am adda

    28

  adding a

    29

    30

This is a cleaner patch generated via diff

    31

In this case it reproduces the problem when

    32

the output of hg export does not

    33

import patch

    34

    35

  $ hg import -v -m 'b' -d '2 0' - <<EOF

    36

  > --- a/a	2009-12-08 19:26:17.000000000 -0800

    37

  > +++ b/a	2009-12-08 19:26:17.000000000 -0800

    38

  > @@ -9,7 +9,7 @@

    39

  >  A

    40

  >  A

    41

  >  B

    42

  > -A

    43

  > +a

    44

  >  A

    45

  >  A

    46

  >  A

    47

  > @@ -53,7 +53,7 @@

    48

  >  A

    49

  >  A

    50

  >  B

    51

  > -A

    52

  > +a

    53

  >  A

    54

  >  A

    55

  >  A

    56

  > @@ -75,7 +75,7 @@

    57

  >  A

    58

  >  A

    59

  >  B

    60

  > -A

    61

  > +a

    62

  >  A

    63

  >  A

    64

  >  A

    65

  > EOF

    66

  applying patch from stdin

    67

  patching file a

    68

  Hunk #1 succeeded at 43 (offset 34 lines).

    69

  Hunk #2 succeeded at 87 (offset 34 lines).

    70

  Hunk #3 succeeded at 109 (offset 34 lines).

    71

  committing files:

    72

  a

    73

  committing manifest

    74

  committing changelog

    75

  created 189885cecb41

    76

    77

compare imported changes against reference file

    78

    79

  $ "$PYTHON" ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A

    80

  $ diff aref a

    81

    82

  $ cd ..