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

Create extension that can disable exec checks:

     4

     5

  $ cat > noexec.py <<EOF

     6

  > from mercurial import extensions, util

     7

  > def setflags(orig, f, l, x):

     8

  >     pass

     9

  > def checkexec(orig, path):

    10

  >     return False

    11

  > def extsetup(ui):

    12

  >     extensions.wrapfunction(util, 'setflags', setflags)

    13

  >     extensions.wrapfunction(util, 'checkexec', checkexec)

    14

  > EOF

    15

    16

  $ hg init unix-repo

    17

  $ cd unix-repo

    18

  $ touch a

    19

  $ hg add a

    20

  $ hg commit -m 'unix: add a'

    21

  $ hg clone . ../win-repo

    22

  updating to branch default

    23

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

    24

  $ chmod +x a

    25

  $ hg commit -m 'unix: chmod a'

    26

  $ hg manifest -v

    27

  755 * a

    28

    29

  $ cd ../win-repo

    30

    31

  $ touch b

    32

  $ hg add b

    33

  $ hg commit -m 'win: add b'

    34

    35

  $ hg manifest -v

    36

  644   a

    37

  644   b

    38

    39

  $ hg pull

    40

  pulling from $TESTTMP/unix-repo

    41

  searching for changes

    42

  adding changesets

    43

  adding manifests

    44

  adding file changes

    45

  added 1 changesets with 0 changes to 0 files (+1 heads)

    46

  new changesets 2d8bcf2dda39

    47

  (run 'hg heads' to see heads, 'hg merge' to merge)

    48

    49

  $ hg manifest -v -r tip

    50

  755 * a

    51

    52

Simulate a Windows merge:

    53

    54

  $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug

    55

  resolving manifests

    56

   branchmerge: True, force: False, partial: False

    57

   ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39

    58

   a: update permissions -> e

    59

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

    60

  (branch merge, don't forget to commit)

    61

    62

Simulate a Windows commit:

    63

    64

  $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

    65

    66

  $ hg manifest -v

    67

  755 * a

    68

  644   b

    69

    70

  $ cd ..