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

# Copyright (C) 2006 - Marco Barisione <marco@barisione.org>

     2

#

     3

# This is a small extension for Mercurial (https://mercurial-scm.org/)

     4

# that removes files not known to mercurial

     5

#

     6

# This program was inspired by the "cvspurge" script contained in CVS

     7

# utilities (http://www.red-bean.com/cvsutils/).

     8

#

     9

# For help on the usage of "hg purge" use:

    10

#  hg help purge

    11

#

    12

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

    13

# it under the terms of the GNU General Public License as published by

    14

# the Free Software Foundation; either version 2 of the License, or

    15

# (at your option) any later version.

    16

#

    17

# This program is distributed in the hope that it will be useful,

    18

# but WITHOUT ANY WARRANTY; without even the implied warranty of

    19

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    20

# GNU General Public License for more details.

    21

#

    22

# You should have received a copy of the GNU General Public License

    23

# along with this program; if not, see <http://www.gnu.org/licenses/>.

    24

    25

'''command to delete untracked files from the working directory (DEPRECATED)

    26

    27

The functionality of this extension has been included in core Mercurial since

    28

version 5.7. Please use :hg:`purge ...` instead. :hg:`purge --confirm` is now

    29

the default, unless the extension is enabled for backward compatibility.

    30

'''

    31

    32

# This empty extension looks pointless, but core mercurial checks if it's loaded

    33

# to implement the slightly different behavior documented above.

    34

    35

# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

    36

# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

    37

# be specifying the version(s) of Mercurial they are tested with, or

    38

# leave the attribute unspecified.

    39

testedwith = b'ships-with-hg-core'