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

#require svn svn-bindings

     2

     3

  $ cat >> $HGRCPATH <<EOF

     4

  > [extensions]

     5

  > convert =

     6

  > EOF

     7

  $ convert()

     8

  > {

     9

  >     startrev=$1

    10

  >     repopath=A-r$startrev-hg

    11

  >     hg convert --config convert.svn.startrev=$startrev \

    12

  >         --config convert.svn.trunk=branches/branch1 \

    13

  >         --config convert.svn.branches="  " \

    14

  >         --config convert.svn.tags= \

    15

  >         --datesort svn-repo $repopath

    16

  >     hg -R $repopath log -G \

    17

  >         --template '{rev} {desc|firstline} files: {files}\n'

    18

  >     echo

    19

  > }

    20

    21

  $ svnadmin create svn-repo

    22

  $ svnadmin load -q svn-repo < "$TESTDIR/svn/startrev.svndump"

    23

    24

Convert before branching point

    25

    26

  $ convert 3

    27

  initializing destination A-r3-hg repository

    28

  scanning source...

    29

  sorting...

    30

  converting...

    31

  3 removeb

    32

  2 changeaa

    33

  1 branch, changeaaa

    34

  0 addc,changeaaaa

    35

  o  3 addc,changeaaaa files: a c

    36

  |

    37

  o  2 branch, changeaaa files: a

    38

  |

    39

  o  1 changeaa files: a

    40

  |

    41

  o  0 removeb files: a

    42

    43

    44

    45

Convert before branching point

    46

    47

  $ convert 4

    48

  initializing destination A-r4-hg repository

    49

  scanning source...

    50

  sorting...

    51

  converting...

    52

  2 changeaa

    53

  1 branch, changeaaa

    54

  0 addc,changeaaaa

    55

  o  2 addc,changeaaaa files: a c

    56

  |

    57

  o  1 branch, changeaaa files: a

    58

  |

    59

  o  0 changeaa files: a

    60

    61

    62

    63

Convert at branching point

    64

    65

  $ convert 5

    66

  initializing destination A-r5-hg repository

    67

  scanning source...

    68

  sorting...

    69

  converting...

    70

  1 branch, changeaaa

    71

  0 addc,changeaaaa

    72

  o  1 addc,changeaaaa files: a c

    73

  |

    74

  o  0 branch, changeaaa files: a

    75

    76

    77

    78

Convert last revision only

    79

    80

  $ convert 6

    81

  initializing destination A-r6-hg repository

    82

  scanning source...

    83

  sorting...

    84

  converting...

    85

  0 addc,changeaaaa

    86

  o  0 addc,changeaaaa files: a c

    87

    88