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 execbit

     2

     3

b51a8138292a introduced a regression where we would mention in the

     4

changelog executable files added by the second parent of a merge. Test

     5

that that doesn't happen anymore

     6

     7

  $ hg init repo

     8

  $ cd repo

     9

  $ echo foo > foo

    10

  $ hg ci -qAm 'add foo'

    11

    12

  $ echo bar > bar

    13

  $ chmod +x bar

    14

  $ hg ci -qAm 'add bar'

    15

    16

manifest of p2:

    17

    18

  $ hg manifest

    19

  bar

    20

  foo

    21

    22

  $ hg up -qC 0

    23

  $ echo >> foo

    24

  $ hg ci -m 'change foo'

    25

  created new head

    26

    27

manifest of p1:

    28

    29

  $ hg manifest

    30

  foo

    31

    32

  $ hg merge

    33

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

    34

  (branch merge, don't forget to commit)

    35

  $ chmod +x foo

    36

  $ hg ci -m 'merge'

    37

    38

this should not mention bar but should mention foo:

    39

    40

  $ hg tip -v

    41

  changeset:   3:c53d17ff3380

    42

  tag:         tip

    43

  parent:      2:ed1b79f46b9a

    44

  parent:      1:d394a8db219b

    45

  user:        test

    46

  date:        Thu Jan 01 00:00:00 1970 +0000

    47

  files:       foo

    48

  description:

    49

  merge

    50

    51

    52

    53

  $ hg debugindex bar

    54

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

    55

       0       1 b004912a8510 000000000000 000000000000

    56

    57

  $ cd ..