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

test sparse

     2

     3

  $ hg init myrepo

     4

  $ cd myrepo

     5

  $ cat >> $HGRCPATH <<EOF

     6

  > [extensions]

     7

  > sparse=

     8

  > purge=

     9

  > strip=

    10

  > rebase=

    11

  > EOF

    12

    13

  $ echo a > index.html

    14

  $ echo x > data.py

    15

  $ echo z > readme.txt

    16

  $ cat > base.sparse <<EOF

    17

  > [include]

    18

  > *.sparse

    19

  > EOF

    20

  $ hg ci -Aqm 'initial'

    21

  $ cat > webpage.sparse <<EOF

    22

  > %include base.sparse

    23

  > [include]

    24

  > *.html

    25

  > EOF

    26

  $ hg ci -Aqm 'initial'

    27

    28

Clear rules when there are includes

    29

    30

  $ hg debugsparse --include *.py

    31

  $ ls -A

    32

  .hg

    33

  data.py

    34

  $ hg debugsparse --clear-rules

    35

  $ ls -A

    36

  .hg

    37

  base.sparse

    38

  data.py

    39

  index.html

    40

  readme.txt

    41

  webpage.sparse

    42

    43

Clear rules when there are excludes

    44

    45

  $ hg debugsparse -X base.sparse -X webpage.sparse

    46

  $ ls -A

    47

  .hg

    48

  data.py

    49

  index.html

    50

  readme.txt

    51

  $ hg debugsparse --clear-rules

    52

  $ ls -A

    53

  .hg

    54

  base.sparse

    55

  data.py

    56

  index.html

    57

  readme.txt

    58

  webpage.sparse

    59

    60

Clearing rules should not alter profiles

    61

    62

  $ hg debugsparse --enable-profile webpage.sparse

    63

  $ ls -A

    64

  .hg

    65

  base.sparse

    66

  index.html

    67

  webpage.sparse

    68

  $ hg debugsparse --include *.py

    69

  $ ls -A

    70

  .hg

    71

  base.sparse

    72

  data.py

    73

  index.html

    74

  webpage.sparse

    75

  $ hg debugsparse --clear-rules

    76

  $ ls -A

    77

  .hg

    78

  base.sparse

    79

  index.html

    80

  webpage.sparse