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 no-windows

     2

     3

  $ . "$TESTDIR/remotefilelog-library.sh"

     4

     5

  $ hg init master

     6

  $ cd master

     7

  $ cat >> .hg/hgrc <<EOF

     8

  > [remotefilelog]

     9

  > server=True

    10

  > EOF

    11

  $ echo x > foo

    12

  $ echo y > bar

    13

  $ hg commit -qAm one

    14

    15

  $ cd ..

    16

    17

# partial shallow clone

    18

    19

  $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.includepattern=foo

    20

  streaming all changes

    21

  3 files to transfer, 336 bytes of data (no-zstd !)

    22

  transferred 336 bytes in * seconds (* */sec) (glob) (no-zstd !)

    23

  3 files to transfer, 338 bytes of data (zstd !)

    24

  transferred 338 bytes in * seconds (* */sec) (glob) (zstd !)

    25

  searching for changes

    26

  no changes found

    27

  $ cat >> shallow/.hg/hgrc <<EOF

    28

  > [remotefilelog]

    29

  > cachepath=$PWD/hgcache

    30

  > debug=True

    31

  > includepattern=foo

    32

  > reponame = master

    33

  > [extensions]

    34

  > remotefilelog=

    35

  > EOF

    36

  $ ls shallow/.hg/store/data

    37

  bar.i

    38

    39

# update partial clone

    40

    41

  $ cd shallow

    42

  $ hg update

    43

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

    44

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    45

  $ cat foo

    46

  x

    47

  $ cat bar

    48

  y

    49

  $ cd ..

    50

    51

# pull partial clone

    52

    53

  $ cd master

    54

  $ echo a >> foo

    55

  $ echo b >> bar

    56

  $ hg commit -qm two

    57

  $ cd ../shallow

    58

  $ hg pull

    59

  pulling from ssh://user@dummy/master

    60

  searching for changes

    61

  adding changesets

    62

  adding manifests

    63

  adding file changes

    64

  added 1 changesets with 0 changes to 0 files

    65

  new changesets a9688f18cb91

    66

  (run 'hg update' to get a working copy)

    67

  $ hg update

    68

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

    69

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    70

  $ cat foo

    71

  x

    72

  a

    73

  $ cat bar

    74

  y

    75

  b

    76

    77

  $ cd ..