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 that we don't interrupt the merge session if

     2

a file-level merge failed

     3

     4

  $ hg init repo

     5

  $ cd repo

     6

     7

  $ echo foo > foo

     8

  $ echo a > bar

     9

  $ hg ci -Am 'add foo'

    10

  adding bar

    11

  adding foo

    12

    13

  $ hg mv foo baz

    14

  $ echo b >> bar

    15

  $ echo quux > quux1

    16

  $ hg ci -Am 'mv foo baz'

    17

  adding quux1

    18

    19

  $ hg up -qC 0

    20

  $ echo >> foo

    21

  $ echo c >> bar

    22

  $ echo quux > quux2

    23

  $ hg ci -Am 'change foo'

    24

  adding quux2

    25

  created new head

    26

    27

test with the rename on the remote side

    28

  $ HGMERGE=false hg merge

    29

  merging bar

    30

  merging bar failed!

    31

  merging foo and baz to baz

    32

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

    33

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

    34

  [1]

    35

  $ hg resolve -l

    36

  U bar

    37

  R baz

    38

    39

test with the rename on the local side

    40

  $ hg up -C 1

    41

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

    42

  $ HGMERGE=false hg merge

    43

  merging bar

    44

  merging bar failed!

    45

  merging baz and foo to baz

    46

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

    47

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

    48

  [1]

    49

    50

show unresolved

    51

  $ hg resolve -l

    52

  U bar

    53

  R baz

    54

    55

unmark baz

    56

  $ hg resolve -u baz

    57

    58

show

    59

  $ hg resolve -l

    60

  U bar

    61

  U baz

    62

  $ hg st

    63

  M bar

    64

  M baz

    65

  M quux2

    66

  ? bar.orig

    67

    68

re-resolve baz

    69

  $ hg resolve baz

    70

  merging baz and foo to baz

    71

    72

after resolve

    73

  $ hg resolve -l

    74

  U bar

    75

  R baz

    76

    77

resolve all warning

    78

  $ hg resolve

    79

  abort: no files or directories specified

    80

  (use --all to re-merge all unresolved files)

    81

  [10]

    82

    83

resolve all

    84

  $ hg resolve -a

    85

  merging bar

    86

  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')

    87

  [1]

    88

    89

after

    90

  $ hg resolve -l

    91

  U bar

    92

  R baz

    93

    94

  $ cd ..