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 svn13

     2

     3

  $ cat <<EOF >> $HGRCPATH

     4

  > [extensions]

     5

  > mq =

     6

  > [diff]

     7

  > nodates = 1

     8

  > [subrepos]

     9

  > allowed = true

    10

  > svn:allowed = true

    11

  > EOF

    12

    13

fn to create new repository, and cd into it

    14

  $ mkrepo() {

    15

  >     hg init $1

    16

  >     cd $1

    17

  >     hg qinit

    18

  > }

    19

    20

    21

handle svn subrepos safely

    22

    23

  $ svnadmin create svn-repo-2499

    24

    25

  $ SVNREPOPATH=`pwd`/svn-repo-2499/project

    26

  $ SVNREPOURL="`"$PYTHON" $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"

    27

    28

  $ mkdir -p svn-project-2499/trunk

    29

  $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"

    30

    31

qnew on repo w/svn subrepo

    32

  $ mkrepo repo-2499-svn-subrepo

    33

  $ svn co "$SVNREPOURL"/trunk sub

    34

  Checked out revision 1.

    35

  $ echo 'sub = [svn]sub' >> .hgsub

    36

  $ hg add .hgsub

    37

  $ hg status -S -X '**/format'

    38

  A .hgsub

    39

  $ hg qnew -m0 0.diff

    40

  $ cd sub

    41

  $ echo a > a

    42

  $ svn add a

    43

  A         a

    44

  $ svn st

    45

  A*    a (glob)

    46

  $ cd ..

    47

  $ hg status -S        # doesn't show status for svn subrepos (yet)

    48

  $ hg qnew -m1 1.diff

    49

  abort: uncommitted changes in subrepository "sub"

    50

  [255]

    51

    52

  $ cd ..