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 gpg

     2

     3

Test the GPG extension

     4

     5

  $ cat <<EOF >> $HGRCPATH

     6

  > [extensions]

     7

  > gpg=

     8

  > 

     9

  > [gpg]

    10

  > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb

    11

  > EOF

    12

  $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME

    13

  $ cp -R "$TESTDIR/gpg" "$GNUPGHOME"

    14

    15

Start gpg-agent, which is required by GnuPG v2

    16

    17

#if gpg21

    18

  $ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \

    19

  > >> $DAEMON_PIDS

    20

#endif

    21

    22

and migrate secret keys

    23

    24

#if gpg2

    25

  $ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \

    26

  > > /dev/null 2>&1

    27

#endif

    28

    29

  $ hg init r

    30

  $ cd r

    31

  $ echo foo > foo

    32

  $ hg ci -Amfoo

    33

  adding foo

    34

    35

  $ hg sigs

    36

    37

  $ HGEDITOR=cat hg sign -e 0

    38

  gpg: error retrieving key fingerprint from card: Invalid name (?)

    39

  signing 0:e63c23eaa88a

    40

  Added signature for changeset e63c23eaa88a

    41

    42

    43

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

    44

  HG: Leave message empty to abort commit.

    45

  HG: --

    46

  HG: user: test

    47

  HG: branch 'default'

    48

  HG: added .hgsigs

    49

    50

  $ hg sigs

    51

  hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0

    52

    53

  $ hg sigcheck 0

    54

  e63c23eaa88a is signed by:

    55

   hgtest

    56

    57

  $ cd ..