tests/test-check-commit.t
author Manuel Jacob <me@manueljacob.de>
Wed, 10 Jun 2020 13:02:39 +0200
changeset 44991 f9734b2d59cc
parent 37816 33817e09c663
permissions -rw-r--r--
py3: make stdout line-buffered if connected to a TTY Status messages that are to be shown on the terminal should be written to the file descriptor before anything further is done, to keep the user updated. One common way to achieve this is to make stdout line-buffered if it is connected to a TTY. This is done on Python 2 (except on Windows, where libc, which the CPython 2 streams depend on, does not properly support this). Python 3 rolls it own I/O streams. On Python 3, buffered binary streams can't be set line-buffered. The previous code (added in 227ba1afcb65) incorrectly assumed that on Python 3, pycompat.stdout (sys.stdout.buffer) is already line-buffered. However the interpreter initializes it with a block-buffered stream or an unbuffered stream (when the -u option or the PYTHONUNBUFFERED environment variable is set), never with a line-buffered stream. One example where the current behavior is unacceptable is when running `hg pull https://www.mercurial-scm.org/repo/hg` on Python 3, where the line "pulling from https://www.mercurial-scm.org/repo/hg" does not appear on the terminal before the hg process blocks while waiting for the server. Various approaches to fix this problem are possible, including: 1. Weaken the contract of procutil.stdout to not give any guarantees about buffering behavior. In this case, users of procutil.stdout need to be changed to do enough flushes. In particular, 1. either ui must insert enough flushes for ui.write() and friends, or 2. ui.write() and friends get split into flushing and fully buffered methods, or 3. users of ui.write() and friends must flush explicitly. 2. Make stdout unbuffered. 3. Make stdout line-buffered. Since Python 3 does not natively support that for binary streams, we must implement it ourselves. (2.) is problematic because using unbuffered I/O changes the performance characteristics significantly compared to line-buffered (which is used on Python 2) and this would be a regression. (1.2.) and (1.3) are a substantial amount of work. It’s unclear whether the added complexity would be justified, given that raw performance doesn’t matter that much when writing to a terminal much faster than the user could read it. (1.1.) pushes complexity into the ui class instead of separating the concern of how stdout is buffered. Other users of procutil.stdout would still need to take care of the flushes. This patch implements (3.). The general performance considerations are very similar to (1.1.). The extra method invocation and method forwarding add a little more overhead if the class is used. In exchange, it doesn’t add overhead if not used. For the benchmarks, I compared the previous implementation (incorrect on Python 3), (1.1.), (3.) and (2.). The command was chosen so that the streams were configured as if they were writing to a TTY, but actually write to a pager, which is also the default: HGRCPATH=/dev/null python3 ./hg --cwd ~/vcs/mozilla-central --time --pager yes --config pager.pager='cat > /dev/null' status --all previous: time: real 7.880 secs (user 7.290+0.050 sys 0.580+0.170) time: real 7.830 secs (user 7.220+0.070 sys 0.590+0.140) time: real 7.800 secs (user 7.210+0.050 sys 0.570+0.170) (1.1.) using Yuya Nishihara’s patch: time: real 9.860 secs (user 8.670+0.350 sys 1.160+0.830) time: real 9.540 secs (user 8.430+0.370 sys 1.100+0.770) time: real 9.830 secs (user 8.630+0.370 sys 1.180+0.840) (3.) using this patch: time: real 9.580 secs (user 8.480+0.350 sys 1.090+0.770) time: real 9.670 secs (user 8.480+0.330 sys 1.170+0.860) time: real 9.640 secs (user 8.500+0.350 sys 1.130+0.810) (2.) using a previous patch by me: time: real 10.480 secs (user 8.850+0.720 sys 1.590+1.500) time: real 10.490 secs (user 8.750+0.750 sys 1.710+1.470) time: real 10.240 secs (user 8.600+0.700 sys 1.590+1.510) As expected, there’s no difference on Python 2, as exactly the same code paths are used: previous: time: real 6.950 secs (user 5.870+0.330 sys 1.070+0.770) time: real 7.040 secs (user 6.040+0.360 sys 0.980+0.750) time: real 7.070 secs (user 5.950+0.360 sys 1.100+0.760) this patch: time: real 7.010 secs (user 5.900+0.390 sys 1.070+0.730) time: real 7.000 secs (user 5.850+0.350 sys 1.120+0.760) time: real 7.000 secs (user 5.790+0.380 sys 1.170+0.710)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22067
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     1
#require test-repo
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
Enable obsolescence to avoid the warning issue when obsmarker are found
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 28293
diff changeset
     5
  $ . "$TESTDIR/helpers-testrepo.sh"
22067
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     6
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     7
Go back in the hg repo
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     9
  $ cd $TESTDIR/..
14306a686e71 test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    10
37816
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    11
  $ REVSET='not public() and ::. and not desc("# no-check-commit")'
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    12
37687
8872d46643b6 test-check-commit: don't run hg per commit
Yuya Nishihara <yuya@tcha.org>
parents: 33204
diff changeset
    13
  $ mkdir "$TESTTMP/p"
37816
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    14
  $ REVS=`testrepohg log -r "$REVSET" -T.`
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    15
  $ if [ -n "$REVS" ] ; then
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    16
  >   testrepohg export --git -o "$TESTTMP/p/%n-%h" -r "$REVSET"
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    17
  >   for f in `ls "$TESTTMP/p"`; do
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    18
  >      contrib/check-commit < "$TESTTMP/p/$f" > "$TESTTMP/check-commit.out"
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    19
  >      if [ $? -ne 0 ]; then
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    20
  >          node="${f##*-}"
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    21
  >          echo "Revision $node does not comply with rules"
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    22
  >          echo '------------------------------------------------------'
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    23
  >          cat ${TESTTMP}/check-commit.out
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    24
  >          echo
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    25
  >     fi
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    26
  >   done
33817e09c663 tests: fix test-check-commit.t when all commits are public
Augie Fackler <augie@google.com>
parents: 37687
diff changeset
    27
  > fi