Mercurial > hg
view tests/test-sparse-fsmonitor.t @ 39527:9db856446298
sparse: add local files to temporaryfiles if they exist out of sparse
We get the f1 from args if it's merge and check that whether that exists in
sparse checkout or not. If that does not, we add that for merging.
The error comes from very low-level where we try to read data of a
working-filectx which does not exists in the working directory. It will be
extremely ugly to plug in logic to update sparse copy with new file at such a
low level.
We already have logic related to updating the checkout with required files in
calculateupdates() and let's handle this case there only. calculateupdates()
call sparse.filterupdatesactions() and the logic is added into the latter
function.
To get the exact traceback, this patch can be backed out and
test-sparse-merges.t can be run with ui.traceback=True.
Differential Revision: https://phab.mercurial-scm.org/D4341
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Tue, 21 Aug 2018 16:11:17 +0300 |
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