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

 * Utility functions

     3

 *

     4

 * Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>

     5

 *

     6

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

     7

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

     8

 */

     9

    10

#ifndef UTIL_H_

    11

#define UTIL_H_

    12

    13

#ifdef __GNUC__

    14

#define PRINTF_FORMAT_ __attribute__((format(printf, 1, 2)))

    15

#define UNUSED_ __attribute__((unused))

    16

#else

    17

#define PRINTF_FORMAT_

    18

#define UNUSED_

    19

#endif

    20

    21

void abortmsg(const char *fmt, ...) PRINTF_FORMAT_;

    22

void abortmsgerrno(const char *fmt, ...) PRINTF_FORMAT_;

    23

    24

void enablecolor(void);

    25

void enabledebugmsg(void);

    26

void debugmsg(const char *fmt, ...) PRINTF_FORMAT_;

    27

    28

void fchdirx(int dirfd);

    29

void fsetcloexec(int fd);

    30

void *mallocx(size_t size);

    31

void *reallocx(void *ptr, size_t size);

    32

    33

int runshellcmd(const char *cmd, const char *envp[], const char *cwd);

    34

    35

#endif /* UTIL_H_ */