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

#!/bin/sh

     2

# -*- coding: utf-8 -*-

     3

#

     4

# Use this script to generate encoding.svndump

     5

#

     6

     7

mkdir temp

     8

cd temp

     9

    10

mkdir project-orig

    11

cd project-orig

    12

mkdir trunk

    13

mkdir branches

    14

mkdir tags

    15

cd ..

    16

    17

svnadmin create svn-repo

    18

svnurl=file://`pwd`/svn-repo

    19

svn import project-orig $svnurl -m "init projA"

    20

    21

svn co $svnurl project

    22

cd project

    23

echo e > trunk/é

    24

mkdir trunk/à

    25

echo d > trunk/à/é

    26

svn add trunk/é trunk/à

    27

svn ci -m hello

    28

    29

# Copy files and directories

    30

svn mv trunk/é trunk/è

    31

svn mv trunk/à trunk/ù

    32

svn ci -m "copy files"

    33

    34

# Remove files

    35

svn rm trunk/è

    36

svn rm trunk/ù

    37

svn ci -m 'remove files'

    38

    39

# Create branches with and from weird names

    40

svn up

    41

svn cp trunk branches/branché

    42

echo a > branches/branché/a

    43

svn ci -m 'branch to branché'

    44

svn up

    45

svn cp branches/branché branches/branchée

    46

echo a >> branches/branché/a

    47

svn ci -m 'branch to branchée'

    48

    49

# Create tag with weird name

    50

svn up

    51

svn cp trunk tags/branché

    52

svn ci -m 'tag trunk'

    53

svn cp branches/branchée tags/branchée

    54

svn ci -m 'tag branché'

    55

cd ..

    56

    57

svnadmin dump svn-repo > ../encoding.svndump