view tests/.balto.toml @ 45545:e5e1285b6f6f

largefiles: prevent in-memory merge instead of switching to on-disk

I enabled in-memory merge by default while testing some changes. I
spent quite some time troubleshooting why largefiles was still
creating an on-disk mergestate. Then I found out that it ignores the
callers `wc` argument to `mergemod._update()` and always uses on-disk
merge. This patch changes that so we raise an error if largefiles is
used with in-memory merge. That way we'll notice if in-memory merge is
used with largefiles instead of silently replacing ignoring the
`overlayworkingctx` instance and updating the working copy instead.

I felt a little bad that this would break things more for users with
both largefiles and in-memory rebase enabled. So I also added a
higher-level override to make sure that largefiles disables in-memory
rebase. It turns out that that fixes `run-tests.py -k largefiles
--extra-config-opt rebase.experimental.inmemory=1`.

Differential Revision: https://phab.mercurial-scm.org/D9069

# Balto (https://bitbucket.org/lothiraldan/balto/src) is a test orchestrator
# which is compatible with all test runner that can emit the LITF
# (https://github.com/lothiraldan/litf) test format.

# The plugin for the Mercurial test runner is mercurial-litf
# (https://pypi.org/project/mercurial-litf/). Make sure to follow the
# instruction and configuration instructions here:
# https://bitbucket.org/lothiraldan/mercurial_litf/src/default/

# You can launch Balto with `balto /path/to/mercurial/tests/`

name = "Mercurial Test Suite"
tool = "mercurial"