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 repo

     2

  $ cd repo

     3

     4

  $ touch a.html b.html c.py d.py

     5

     6

  $ cat > frontend.sparse << EOF

     7

  > [include]

     8

  > *.html

     9

  > EOF

    10

    11

  $ hg -q commit -A -m initial

    12

    13

  $ echo 1 > a.html

    14

  $ echo 1 > c.py

    15

  $ hg commit -m 'commit 1'

    16

    17

Enable sparse profile

    18

    19

  $ hg debugrequires

    20

  dotencode

    21

  dirstate-v2 (dirstate-v2 !)

    22

  fncache

    23

  generaldelta

    24

  persistent-nodemap (rust !)

    25

  revlog-compression-zstd (zstd !)

    26

  revlogv1

    27

  share-safe

    28

  sparserevlog

    29

  store

    30

  testonly-simplestore (reposimplestore !)

    31

    32

  $ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse

    33

  $ ls -A

    34

  .hg

    35

  a.html

    36

  b.html

    37

    38

Requirement for sparse added when sparse is enabled

    39

    40

  $ hg debugrequires --config extensions.sparse=

    41

  dotencode

    42

  dirstate-v2 (dirstate-v2 !)

    43

  exp-sparse

    44

  fncache

    45

  generaldelta

    46

  persistent-nodemap (rust !)

    47

  revlog-compression-zstd (zstd !)

    48

  revlogv1

    49

  share-safe

    50

  sparserevlog

    51

  store

    52

  testonly-simplestore (reposimplestore !)

    53

    54

Client without sparse enabled reacts properly

    55

    56

  $ hg files

    57

  abort: repository is using sparse feature but sparse is not enabled; enable the "sparse" extensions to access

    58

  [255]

    59

    60

Requirement for sparse is removed when sparse is disabled

    61

    62

  $ hg debugsparse --reset --config extensions.sparse=

    63

    64

  $ hg debugrequires

    65

  dotencode

    66

  dirstate-v2 (dirstate-v2 !)

    67

  fncache

    68

  generaldelta

    69

  persistent-nodemap (rust !)

    70

  revlog-compression-zstd (zstd !)

    71

  revlogv1

    72

  share-safe

    73

  sparserevlog

    74

  store

    75

  testonly-simplestore (reposimplestore !)

    76

    77

And client without sparse can access

    78

    79

  $ hg files

    80

  a.html

    81

  b.html

    82

  c.py

    83

  d.py

    84

  frontend.sparse