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

  $ echo "[extensions]" >> $HGRCPATH

     2

  $ echo "mq=" >> $HGRCPATH

     3

     4

  $ hg init a

     5

  $ cd a

     6

  $ echo a > a

     7

  $ hg ci -Ama

     8

  adding a

     9

    10

  $ hg qnew a.patch

    11

  $ echo a >> a

    12

  $ hg qrefresh

    13

    14

  $ hg qnew b.patch

    15

  $ echo b > b

    16

  $ hg add b

    17

  $ hg qrefresh

    18

    19

  $ hg qnew c.patch

    20

  $ echo c > c

    21

  $ hg add c

    22

  $ hg qrefresh

    23

    24

  $ hg qgoto a.patch

    25

  popping c.patch

    26

  popping b.patch

    27

  now at: a.patch

    28

    29

  $ hg qgoto c.patch

    30

  applying b.patch

    31

  applying c.patch

    32

  now at: c.patch

    33

    34

  $ hg qgoto b.patch

    35

  popping c.patch

    36

  now at: b.patch

    37

    38

Using index:

    39

    40

  $ hg qgoto 0

    41

  popping b.patch

    42

  now at: a.patch

    43

    44

  $ hg qgoto 2

    45

  applying b.patch

    46

  applying c.patch

    47

  now at: c.patch

    48

    49

No warnings when using index ... and update from non-qtip and with pending

    50

changes in unrelated files:

    51

    52

  $ hg qnew bug314159

    53

  $ echo d >> c

    54

  $ hg qrefresh

    55

  $ hg qnew bug141421

    56

  $ echo e >> b

    57

  $ hg qrefresh

    58

    59

  $ hg up -r bug314159

    60

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

    61

  $ echo f >> a

    62

  $ echo f >> b

    63

  $ echo f >> c

    64

    65

  $ hg qgoto 1

    66

  abort: local changes found, qrefresh first

    67

  [255]

    68

  $ hg qgoto 1 -f

    69

  popping bug141421

    70

  popping bug314159

    71

  popping c.patch

    72

  now at: b.patch

    73

  $ hg st

    74

  M a

    75

  M b

    76

  ? c.orig

    77

  $ hg up -qCr.

    78

    79

  $ hg qgoto 3

    80

  applying c.patch

    81

  applying bug314159

    82

  now at: bug314159

    83

    84

Detect ambiguous non-index:

    85

    86

  $ hg qgoto 14

    87

  patch name "14" is ambiguous:

    88

    bug314159

    89

    bug141421

    90

  abort: patch 14 not in series

    91

  [255]

    92

    93

  $ cd ..