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

#

     2

# tcsh completion for Mercurial

     3

#

     4

# This file has been auto-generated by tcsh_completion_build.sh for

     5

# Mercurial Distributed SCM (version 1.7.5+157-8a220ae0b2ba)

     6

#

     7

# Copyright (C) 2005 TK Soh.

     8

#

     9

# This is free software; you can redistribute it and/or modify it under

    10

# the terms of the GNU General Public License as published by the Free

    11

# Software Foundation; either version 2 of the License, or (at your

    12

# option) any later version.

    13

#

    14

    15

complete hg \

    16

  'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \

    17

  'C/-/( -R --repository \

    18

    --cwd \

    19

    -y --noninteractive \

    20

    -q --quiet \

    21

    -v --verbose \

    22

    --config \

    23

    --debug \

    24

    --debugger \

    25

    --encoding \

    26

    --encodingmode \

    27

    --traceback \

    28

    --time \

    29

    --profile \

    30

    --version \

    31

    -h --help)/' \

    32

  'p/1/(add addremove annotate blame archive \

    33

    backout bisect bookmarks branch branches \

    34

    bundle cat clone commit ci \

    35

    copy cp debugancestor debugbuilddag debugcheckstate \

    36

    debugcommands debugcomplete debugdag debugdata debugdate \

    37

    debugfsinfo debugignore debugindex debugindexdot debuginstall \

    38

    debugpushkey debugrebuildstate debugrename debugrevspec debugsetparents \

    39

    debugstate debugsub debugwalk diff export \

    40

    forget grep heads help identify \

    41

    id import patch incoming in \

    42

    init locate log history manifest \

    43

    merge outgoing out parents paths \

    44

    pull push recover remove rm \

    45

    rename move mv resolve revert \

    46

    rollback root serve showconfig debugconfig \

    47

    status st summary sum tag \

    48

    tags tip unbundle update up \

    49

    checkout co verify version)/'

    50