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

https://bz.mercurial-scm.org/1502

     2

     3

Initialize repository

     4

     5

  $ hg init foo

     6

  $ touch foo/a && hg -R foo commit -A -m "added a"

     7

  adding a

     8

     9

  $ hg clone foo foo1

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

    13

  $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"

    14

  $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"

    15

  $ hg -R foo1 pull

    16

  pulling from $TESTTMP/foo

    17

  searching for changes

    18

  adding changesets

    19

  adding manifests

    20

  adding file changes

    21

  added 1 changesets with 1 changes to 1 files (+1 heads)

    22

  new changesets 273d008d6e8e

    23

  (run 'hg heads' to see heads, 'hg merge' to merge)

    24

    25

  $ hg -R foo1 book branchy

    26

  $ hg -R foo1 book

    27

   * branchy                   1:e3e522925eff

    28

    29

Pull. Bookmark should not jump to new head.

    30

    31

  $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"

    32

  $ hg -R foo1 pull

    33

  pulling from $TESTTMP/foo

    34

  searching for changes

    35

  adding changesets

    36

  adding manifests

    37

  adding file changes

    38

  added 1 changesets with 1 changes to 1 files

    39

  new changesets 84a798d48b17

    40

  (run 'hg update' to get a working copy)

    41

    42

  $ hg -R foo1 book

    43

   * branchy                   1:e3e522925eff