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

  $ hg init outer

     2

  $ cd outer

     3

     4

  $ echo '[paths]' >> .hg/hgrc

     5

  $ echo 'default = http://example.net/' >> .hg/hgrc

     6

     7

hg debugsub with no remapping

     8

     9

  $ echo 'sub = libfoo' > .hgsub

    10

  $ hg add .hgsub

    11

    12

  $ hg debugsub

    13

  path sub

    14

   source   libfoo

    15

   revision 

    16

    17

hg debugsub with remapping

    18

    19

  $ echo '[subpaths]' >> .hg/hgrc

    20

  $ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc

    21

    22

  $ hg debugsub

    23

  path sub

    24

   source   C:\libs\foo-lib\

    25

   revision 

    26

    27

test cumulative remapping, the $HGRCPATH file is loaded first

    28

    29

  $ echo '[subpaths]' >> $HGRCPATH

    30

  $ echo 'libfoo = libbar' >> $HGRCPATH

    31

  $ hg debugsub

    32

  path sub

    33

   source   C:\libs\bar-lib\

    34

   revision 

    35

    36

test absolute source path -- testing with a URL is important since

    37

standard os.path.join wont treat that as an absolute path

    38

    39

  $ echo 'abs = http://example.net/abs' > .hgsub

    40

  $ hg debugsub

    41

  path abs

    42

   source   http://example.net/abs

    43

   revision 

    44

    45

  $ echo 'abs = /abs' > .hgsub

    46

  $ hg debugsub

    47

  path abs

    48

   source   /abs

    49

   revision 

    50

    51

test bad subpaths pattern

    52

    53

  $ cat > .hg/hgrc <<EOF

    54

  > [subpaths]

    55

  > .* = \1

    56

  > EOF

    57

  $ hg debugsub

    58

  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference* (glob)

    59

  [255]

    60

    61

  $ cd ..