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

Checking how hg behaves when one side of a pull/push doesn't support

     2

some capability (because it's running an older hg version, usually).

     3

     4

  $ hg init repo1

     5

  $ cd repo1

     6

  $ echo a > a; hg add -q a; hg commit -q -m a

     7

  $ hg bookmark a

     8

  $ hg clone -q . ../repo2

     9

  $ cd ../repo2

    10

    11

  $ touch $TESTTMP/disable-lookup.py

    12

  $ disable_cap() {

    13

  >   rm -f $TESTTMP/disable-lookup.pyc # pyc caching is buggy

    14

  >   cat <<EOF > $TESTTMP/disable-lookup.py

    15

  > from mercurial import extensions, wireprotov1server

    16

  > def wcapabilities(orig, *args, **kwargs):

    17

  >   cap = orig(*args, **kwargs)

    18

  >   cap.remove(b'$1')

    19

  >   return cap

    20

  > extensions.wrapfunction(wireprotov1server, '_capabilities', wcapabilities)

    21

  > EOF

    22

  > }

    23

  $ cat >> ../repo1/.hg/hgrc <<EOF

    24

  > [extensions]

    25

  > disable-lookup = $TESTTMP/disable-lookup.py

    26

  > EOF

    27

    28

  $ hg pull ssh://user@dummy/repo1 -r tip -B a

    29

  pulling from ssh://user@dummy/repo1

    30

  no changes found

    31

    32

  $ disable_cap lookup

    33

  $ hg pull ssh://user@dummy/repo1 -r tip -B a

    34

  pulling from ssh://user@dummy/repo1

    35

  abort: other repository doesn't support revision lookup, so a rev cannot be specified.

    36

  [255]

    37

    38

  $ disable_cap pushkey

    39

  $ hg pull ssh://user@dummy/repo1 -r tip -B a

    40

  pulling from ssh://user@dummy/repo1

    41

  abort: remote bookmark a not found!

    42

  [10]