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

# revset.py - asv revset benchmarks

     2

#

     3

# Copyright 2016 Logilab SA <contact@logilab.fr>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

'''ASV revset benchmarks generated from contrib/base-revsets.txt

     9

    10

Each revset benchmark is parameterized with variants (first, last, sort, ...)

    11

'''

    12

    13

    14

import os

    15

import string

    16

import sys

    17

    18

from . import basedir, perfbench

    19

    20

    21

def createrevsetbenchmark(baseset, variants=None):

    22

    if variants is None:

    23

        # Default variants

    24

        variants = ["plain", "first", "last", "sort", "sort+first", "sort+last"]

    25

    fname = "track_" + "_".join(

    26

        "".join(

    27

            [c if c in string.digits + string.letters else " " for c in baseset]

    28

        ).split()

    29

    )

    30

    31

    def wrap(fname, baseset):

    32

        @perfbench(name=baseset, params=[("variant", variants)])

    33

        def f(perf, variant):

    34

            revset = baseset

    35

            if variant != "plain":

    36

                for var in variant.split("+"):

    37

                    revset = "%s(%s)" % (var, revset)

    38

            return perf("perfrevset", revset)

    39

    40

        f.__name__ = fname

    41

        return f

    42

    43

    return wrap(fname, baseset)

    44

    45

    46

def initializerevsetbenchmarks():

    47

    mod = sys.modules[__name__]

    48

    with open(os.path.join(basedir, 'contrib', 'base-revsets.txt'), 'rb') as fh:

    49

        for line in fh:

    50

            baseset = line.strip()

    51

            if baseset and not baseset.startswith('#'):

    52

                func = createrevsetbenchmark(baseset)

    53

                setattr(mod, func.__name__, func)

    54

    55

    56

initializerevsetbenchmarks()