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 unix-permissions no-root reporevlogstore

     2

     3

#testcases dirstate-v1 dirstate-v2

     4

     5

#if dirstate-v2

     6

  $ cat >> $HGRCPATH << EOF

     7

  > [format]

     8

  > use-dirstate-v2=1

     9

  > [storage]

    10

  > dirstate-v2.slow-path=allow

    11

  > EOF

    12

#endif

    13

    14

  $ hg init t

    15

  $ cd t

    16

    17

  $ echo foo > a

    18

  $ hg add a

    19

    20

  $ hg commit -m "1"

    21

    22

  $ hg verify

    23

  checking changesets

    24

  checking manifests

    25

  crosschecking files in changesets and manifests

    26

  checking files

    27

  checked 1 changesets with 1 changes to 1 files

    28

    29

  $ chmod -r .hg/store/data/a.i

    30

    31

  $ hg verify

    32

  checking changesets

    33

  checking manifests

    34

  crosschecking files in changesets and manifests

    35

  checking files

    36

  abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i'

    37

  [255]

    38

    39

  $ chmod +r .hg/store/data/a.i

    40

    41

  $ hg verify

    42

  checking changesets

    43

  checking manifests

    44

  crosschecking files in changesets and manifests

    45

  checking files

    46

  checked 1 changesets with 1 changes to 1 files

    47

    48

  $ chmod -w .hg/store/data/a.i

    49

    50

  $ echo barber > a

    51

  $ hg commit -m "2"

    52

  trouble committing a!

    53

  abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i'

    54

  [255]

    55

    56

  $ chmod -w .

    57

    58

  $ hg diff --nodates

    59

  diff -r 2a18120dc1c9 a

    60

  --- a/a

    61

  +++ b/a

    62

  @@ -1,1 +1,1 @@

    63

  -foo

    64

  +barber

    65

    66

  $ chmod +w .

    67

    68

  $ chmod +w .hg/store/data/a.i

    69

  $ mkdir dir

    70

  $ touch dir/a

    71

  $ hg status

    72

  M a

    73

  ? dir/a

    74

  $ chmod -rx dir

    75

    76

#if no-fsmonitor

    77

    78

(fsmonitor makes "hg status" avoid accessing to "dir")

    79

    80

  $ hg status

    81

  dir: Permission denied* (glob)

    82

  M a

    83

    84

#endif

    85

    86

Reenable perm to allow deletion:

    87

    88

  $ chmod +rx dir

    89

    90

  $ cd ..