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

#require no-windows

     2

     3

  $ . "$TESTDIR/remotefilelog-library.sh"

     4

     5

  $ hg init master

     6

  $ cd master

     7

  $ cat >> .hg/hgrc <<EOF

     8

  > [remotefilelog]

     9

  > server=True

    10

  > EOF

    11

  $ echo x > x

    12

  $ hg commit -qAm x

    13

  $ echo y >> x

    14

  $ hg commit -qAm y

    15

  $ echo z >> x

    16

  $ hg commit -qAm z

    17

  $ hg update 1

    18

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

    19

  $ echo w >> x

    20

  $ hg commit -qAm w

    21

    22

  $ cd ..

    23

    24

Shallow clone and activate getflogheads testing extension

    25

    26

  $ hgcloneshallow ssh://user@dummy/master shallow --noupdate

    27

  streaming all changes

    28

  2 files to transfer, 908 bytes of data

    29

  transferred 908 bytes in * seconds (*/sec) (glob)

    30

  searching for changes

    31

  no changes found

    32

  $ cd shallow

    33

    34

  $ cat >> .hg/hgrc <<EOF

    35

  > [extensions]

    36

  > getflogheads=$TESTDIR/remotefilelog-getflogheads.py

    37

  > EOF

    38

    39

Get heads of a remotefilelog

    40

    41

  $ hg getflogheads x

    42

  2797809ca5e9c2f307d82b1345e832f655fb99a2

    43

  ca758b402ddc91e37e3113e1a97791b537e1b7bb

    44

    45

Get heads of a non-existing remotefilelog

    46

    47

  $ hg getflogheads y

    48

  EMPTY