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

Tests about metadataonlyctx

     2

     3

  $ hg init

     4

  $ echo A > A

     5

  $ hg commit -A A -m 'Add A'

     6

  $ echo B > B

     7

  $ hg commit -A B -m 'Add B'

     8

  $ hg rm A

     9

  $ echo C > C

    10

  $ echo B2 > B

    11

  $ hg add C -q

    12

  $ hg commit -m 'Remove A'

    13

    14

  $ cat > metaedit.py <<EOF

    15

  > from mercurial import context, pycompat, registrar

    16

  > cmdtable = {}

    17

  > command = registrar.command(cmdtable)

    18

  > @command(b'metaedit')

    19

  > def metaedit(ui, repo, arg):

    20

  >     # Modify commit message to "FOO"

    21

  >     with repo.wlock(), repo.lock(), repo.transaction(b'metaedit'):

    22

  >         old = repo[b'.']

    23

  >         kwargs = dict(s.split(b'=', 1) for s in arg.split(b';'))

    24

  >         if b'parents' in kwargs:

    25

  >             kwargs[b'parents'] = map(int, kwargs[b'parents'].split(b','))

    26

  >         new = context.metadataonlyctx(repo, old,

    27

  >                                       **pycompat.strkwargs(kwargs))

    28

  >         new.commit()

    29

  > EOF

    30

  $ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'text=Changed'

    31

  $ hg log -r tip

    32

  changeset:   3:ad83e9e00ec9

    33

  tag:         tip

    34

  parent:      1:3afb7afe6632

    35

  user:        test

    36

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

    37

  summary:     Changed

    38

    39

  $ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'parents=0' 2>&1 | egrep '^RuntimeError'

    40

  RuntimeError: can't reuse the manifest: its p1 doesn't match the new ctx p1

    41

    42

  $ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'user=foo <foo@example.com>'

    43

  $ hg log -r tip

    44

  changeset:   4:1f86eaeca92b

    45

  tag:         tip

    46

  parent:      1:3afb7afe6632

    47

  user:        foo <foo@example.com>

    48

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

    49

  summary:     Remove A

    50