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

  $ cat >> $HGRCPATH << EOF

     4

  > [ui]

     5

  > username = nobody <no.reply@fb.com>

     6

  > [extensions]

     7

  > sparse=

     8

  > purge=

     9

  > strip=

    10

  > rebase=

    11

  > EOF

    12

    13

  $ hg init myrepo

    14

  $ cd myrepo

    15

  $ echo a > index.html

    16

  $ echo x > data.py

    17

  $ echo z > readme.txt

    18

  $ cat > webpage.sparse <<EOF

    19

  > [include]

    20

  > *.html

    21

  > EOF

    22

  $ cat > backend.sparse <<EOF

    23

  > [include]

    24

  > *.py

    25

  > EOF

    26

  $ hg ci -Aqm 'initial'

    27

  $ cd ..

    28

    29

Verify local clone with a sparse profile works

    30

    31

  $ hg clone --enable-profile webpage.sparse myrepo clone1

    32

  updating to branch default

    33

  warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it

    34

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

    35

  $ cd clone1

    36

  $ ls -A

    37

  .hg

    38

  index.html

    39

  $ cd ..

    40

    41

Verify local clone with include works

    42

    43

  $ hg clone --include *.sparse myrepo clone2

    44

  updating to branch default

    45

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    46

  $ cd clone2

    47

  $ ls -A

    48

  .hg

    49

  backend.sparse

    50

  webpage.sparse

    51

  $ cd ..

    52

    53

Verify local clone with exclude works

    54

    55

  $ hg clone --exclude data.py myrepo clone3

    56

  updating to branch default

    57

  4 files updated, 0 files merged, 0 files removed, 0 files unresolved

    58

  $ cd clone3

    59

  $ ls -A

    60

  .hg

    61

  backend.sparse

    62

  index.html

    63

  readme.txt

    64

  webpage.sparse

    65

  $ cd ..

    66

    67

Verify sparse clone profile over ssh works

    68

    69

  $ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4

    70

  warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it

    71

  $ cd clone4

    72

  $ ls -A

    73

  .hg

    74

  index.html

    75

  $ cd ..