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

     8

  $ svnadmin create svn-repo

     9

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

    10

    11

Convert

    12

  $ hg convert --datesort svn-repo A-hg

    13

  initializing destination A-hg repository

    14

  scanning source...

    15

  sorting...

    16

  converting...

    17

  5 init projA

    18

  4 adda

    19

  3 changea

    20

  2 changea2

    21

  1 changea3

    22

  0 changea

    23

  updating tags

    24

    25

  $ cd A-hg

    26

  $ hg log -G --template '{rev} {desc|firstline} tags: {tags}\n'

    27

  o  6 update tags tags: tip

    28

  |

    29

  o  5 changea tags: trunk.goodtag

    30

  |

    31

  o  4 changea3 tags:

    32

  |

    33

  o  3 changea2 tags: trunk.v1

    34

  |

    35

  o  2 changea tags:

    36

  |

    37

  o  1 adda tags:

    38

  |

    39

  o  0 init projA tags:

    40

    41

    42

  $ hg tags -q

    43

  tip

    44

  trunk.goodtag

    45

  trunk.v1

    46

    47

  $ cd ..

    48

    49

Convert without tags

    50

    51

  $ hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg

    52

  initializing destination A-notags-hg repository

    53

  scanning source...

    54

  sorting...

    55

  converting...

    56

  5 init projA

    57

  4 adda

    58

  3 changea

    59

  2 changea2

    60

  1 changea3

    61

  0 changea

    62

    63

  $ hg -R A-notags-hg tags -q

    64

  tip

    65