Mercurial > hg
annotate tests/helper-runtests.sh @ 46100:a771ffc378a8
simplemerge: write output only once it's complete
`simplemerge()` can write either to `ui.fout` or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.
Differential Revision: https://phab.mercurial-scm.org/D9550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Dec 2020 00:00:19 -0800 |
parents | 054bcdad6042 |
children |
rev | line source |
---|---|
29220
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
1 # |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
2 # Avoid interference from actual test env: |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
3 |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
4 unset HGTEST_JOBS |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
5 unset HGTEST_TIMEOUT |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
6 unset HGTEST_PORT |
054bcdad6042
tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff
changeset
|
7 unset HGTEST_SHELL |