Mercurial > hg
view tests/test-sparse-fsmonitor.t @ 34192:da2f5f19312c
uncommit: move fb-extension to core which uncommits a changeset
uncommit extension in fb-hgext adds a uncommit command which by default
uncommits a changeset and move all the changes to the working directory. If
file names are passed, uncommit moves the changes from those files to the
working directory and left the changeset with remaining committed files.
The uncommit extension in fb-hgext does not creates an empty commit like the one
in evolve extension unless user has specified ui.alllowemptycommit to True.
The test file added is a combination of tests from test-uncommit.t,
test-uncommit-merge.t and test-uncommit-bookmark.t from fb-hgext.
.. feature::
A new uncommit extension which provides `hg uncommit` using which one can
uncommit part or all of the changeset. This command undoes the effect of a
local commit, returning the affected files to their uncommitted state.
Differential Revision: https://phab.mercurial-scm.org/D529
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 24 Aug 2017 22:55:56 +0530 |
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