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

Test update.requiredest

     2

  $ cd $TESTTMP

     3

  $ cat >> $HGRCPATH <<EOF

     4

  > [commands]

     5

  > update.requiredest = True

     6

  > EOF

     7

  $ hg init repo

     8

  $ cd repo

     9

  $ echo a >> a

    10

  $ hg commit -qAm aa

    11

  $ hg up

    12

  abort: you must specify a destination

    13

  (for example: hg update ".::")

    14

  [10]

    15

  $ hg up .

    16

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

    17

  $ HGPLAIN=1 hg up

    18

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

    19

  $ hg --config commands.update.requiredest=False up

    20

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

    21

    22

  $ cd ..

    23

    24

Check update.requiredest interaction with pull --update

    25

  $ hg clone repo clone

    26

  updating to branch default

    27

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    28

  $ cd repo

    29

  $ echo a >> a

    30

  $ hg commit -qAm aa

    31

  $ cd ../clone

    32

  $ hg pull --update

    33

  abort: update destination required by configuration

    34

  (use hg pull followed by hg update DEST)

    35

  [10]

    36

    37

  $ cd ..

    38

    39

update.requiredest should silent the "hg update" text after pull

    40

  $ hg init repo1

    41

  $ cd repo1

    42

  $ hg pull ../repo

    43

  pulling from ../repo

    44

  requesting all changes

    45

  adding changesets

    46

  adding manifests

    47

  adding file changes

    48

  added 2 changesets with 2 changes to 1 files

    49

  new changesets 8f0162e483d0:048c2cb95949