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

     2

  $ echo a > a

     3

  $ hg ci -Am0

     4

  adding a

     5

     6

  $ hg -q clone . foo

     7

     8

  $ touch .hg/store/journal

     9

    10

  $ echo foo > a

    11

  $ hg ci -Am0

    12

  abort: abandoned transaction found

    13

  (run 'hg recover' to clean up transaction)

    14

  [255]

    15

    16

  $ hg recover

    17

  rolling back interrupted transaction

    18

  (verify step skipped, run `hg verify` to check your repository content)

    19

    20

recover, explicit verify

    21

    22

  $ touch .hg/store/journal

    23

  $ hg ci -Am0

    24

  abort: abandoned transaction found

    25

  (run 'hg recover' to clean up transaction)

    26

  [255]

    27

  $ hg recover --verify

    28

  rolling back interrupted transaction

    29

  checking changesets

    30

  checking manifests

    31

  crosschecking files in changesets and manifests

    32

  checking files

    33

  checked 1 changesets with 1 changes to 1 files

    34

    35

recover, no verify

    36

    37

  $ touch .hg/store/journal

    38

  $ hg ci -Am0

    39

  abort: abandoned transaction found

    40

  (run 'hg recover' to clean up transaction)

    41

  [255]

    42

  $ hg recover --no-verify

    43

  rolling back interrupted transaction

    44

  (verify step skipped, run `hg verify` to check your repository content)

    45

    46

    47

Check that zero-size journals are correctly aborted:

    48

    49

#if unix-permissions no-root

    50

  $ hg bundle -qa repo.hg

    51

  $ chmod -w foo/.hg/store/00changelog.i

    52

    53

  $ hg -R foo unbundle repo.hg

    54

  adding changesets

    55

  abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)

    56

  [255]

    57

    58

  $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi

    59

#endif

    60