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

  $ cat > echo.py <<EOF

     2

  > #!$PYTHON

     3

  > import os

     4

  > import sys

     5

  > try:

     6

  >     import msvcrt

     7

  >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

     8

  >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

     9

  > except ImportError:

    10

  >     pass

    11

  > 

    12

  > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):

    13

  >     print(k, os.environ[k])

    14

  > EOF

    15

    16

Create 2 heads containing the same file, once as

    17

a file, once as a link. Bundle was generated with:

    18

    19

# hg init t

    20

# cd t

    21

# echo a > a

    22

# hg ci -qAm t0 -d '0 0'

    23

# echo l > l

    24

# hg ci -qAm t1 -d '1 0'

    25

# hg up -C 0

    26

# ln -s a l

    27

# hg ci -qAm t2 -d '2 0'

    28

# echo l2 > l2

    29

# hg ci -qAm t3 -d '3 0'

    30

    31

  $ hg init t

    32

  $ cd t

    33

  $ hg -q unbundle "$TESTDIR/bundles/test-merge-symlinks.hg"

    34

  $ hg up -C 3

    35

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

    36

    37

Merge them and display *_ISLINK vars

    38

merge heads

    39

    40

  $ hg merge --tool="\"$PYTHON\" ../echo.py"

    41

  merging l

    42

  HG_FILE l

    43

  HG_MY_ISLINK 1

    44

  HG_OTHER_ISLINK 0

    45

  HG_BASE_ISLINK 0

    46

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

    47

  (branch merge, don't forget to commit)

    48

    49

Test working directory symlink bit calculation wrt copies,

    50

especially on non-supporting systems.

    51

merge working directory

    52

    53

  $ hg up -C 2

    54

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

    55

  $ hg copy l l2

    56

  $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3

    57

  merging l2

    58

  HG_FILE l2

    59

  HG_MY_ISLINK 1

    60

  HG_OTHER_ISLINK 0

    61

  HG_BASE_ISLINK 0

    62

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

    63

    64

  $ cd ..