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 serve

     2

     3

  $ cat <<EOF >> $HGRCPATH

     4

  > [extensions]

     5

  > schemes=

     6

  > 

     7

  > [schemes]

     8

  > l = http://localhost:$HGPORT/

     9

  > parts = http://{1}:$HGPORT/

    10

  > z = file:\$PWD/

    11

  > EOF

    12

  $ hg init test

    13

  $ cd test

    14

  $ echo a > a

    15

  $ hg ci -Am initial

    16

  adding a

    17

    18

invalid scheme

    19

    20

  $ hg log -R z:z

    21

  abort: no '://' in scheme url 'z:z'

    22

  [255]

    23

    24

http scheme

    25

    26

  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

    27

  $ cat hg.pid >> $DAEMON_PIDS

    28

  $ hg incoming l://

    29

  comparing with l://

    30

  searching for changes

    31

  no changes found

    32

  [1]

    33

    34

check that {1} syntax works

    35

    36

  $ hg incoming --debug parts://localhost

    37

  using http://localhost:$HGPORT/

    38

  sending capabilities command

    39

  comparing with parts://localhost/

    40

  query 1; heads

    41

  sending batch command

    42

  searching for changes

    43

  all remote heads known locally

    44

  no changes found

    45

  (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob)

    46

  [1]

    47

    48

check that paths are expanded

    49

    50

  $ PWD=`pwd` hg incoming z://

    51

  comparing with z://

    52

  searching for changes

    53

  no changes found

    54

  [1]

    55

    56

check that debugexpandscheme outputs the canonical form

    57

    58

  $ hg debugexpandscheme bb://user/repo

    59

  https://bitbucket.org/user/repo

    60

    61

expanding an unknown scheme emits the input

    62

    63

  $ hg debugexpandscheme foobar://this/that

    64

  foobar://this/that

    65

    66

expanding a canonical URL emits the input

    67

    68

  $ hg debugexpandscheme https://bitbucket.org/user/repo

    69

  https://bitbucket.org/user/repo

    70

    71

errors

    72

    73

  $ cat errors.log

    74

    75

  $ cd ..