Mercurial > hg
view tests/test-sparse-fsmonitor.t @ 48788:f90337706ce7
filemerge: make `_maketempfiles()` more reusable
`_maketempfiles()` is very specialized for its current use. I hope to
use it also when creating temporary files for input for tools that do
partial conflict resolution. That'll be possible if the function is
more generic. Instead of passing in two contexts (for "other" and
"base") and an optional path (for "local"), let's pass a single list
of files to make backups for. Even if we don't end up using for
partial conflict resolution, this is still a simplification (but I do
have a WIP patch for partial conflict resolution and it is able to
benefit from this).
Differential Revision: https://phab.mercurial-scm.org/D12193
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 14 Feb 2022 22:49:03 -0800 |
parents | abd7dedbaa36 |
children |
line wrap: on
line source
This test doesn't yet work due to the way fsmonitor is integrated with test runner $ exit 80 test sparse interaction with other extensions $ hg init myrepo $ cd myrepo $ cat > .hg/hgrc <<EOF > [extensions] > sparse= > strip= > EOF Test fsmonitor integration (if available) TODO: make fully isolated integration test a'la https://github.com/facebook/watchman/blob/master/tests/integration/WatchmanInstance.py (this one is using the systemwide watchman instance) $ touch .watchmanconfig $ echo "ignoredir1/" >> .hgignore $ hg commit -Am ignoredir1 adding .hgignore $ echo "ignoredir2/" >> .hgignore $ hg commit -m ignoredir2 $ hg sparse --reset $ hg sparse -I ignoredir1 -I ignoredir2 -I dir1 $ mkdir ignoredir1 ignoredir2 dir1 $ touch ignoredir1/file ignoredir2/file dir1/file Run status twice to compensate for a condition in fsmonitor where it will check ignored files the second time it runs, regardless of previous state (ask @sid0) $ hg status --config extensions.fsmonitor= ? dir1/file $ hg status --config extensions.fsmonitor= ? dir1/file Test that fsmonitor ignore hash check updates when .hgignore changes $ hg up -q ".^" $ hg status --config extensions.fsmonitor= ? dir1/file ? ignoredir2/file