Mercurial > hg
view tests/test-narrow-strip-tree.t @ 36079:a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Adjustments:
* renamed src to hgext/narrow
* marked extension experimental
* added correct copyright header where it was missing
* updated hgrc extension enable line in library.sh
* renamed library.sh to narrow-library.sh
* dropped all files from repo root as they're not interesting
* dropped test-pyflakes.t, test-check-code.t and test-check-py3-compat.t
* renamed remaining tests to all be test-narrow-* when they didn't already
* fixed test-narrow-expanddirstate.t to refer to narrow and not narrowhg
* fixed tests that wanted `update -C .` instead of `merge --abort`
* corrected a two-space indent in narrowspec.py
* added a missing _() in narrowcommands.py
* fixed imports to pass the import checker
* narrow only adds its --include and --exclude to clone if sparse isn't
enabled to avoid breaking test-duplicateoptions.py. This is a kludge,
and we'll need to come up with a better solution in the future.
These were more or less the minimum to import something that would
pass tests and not create a bunch of files we'll never use.
Changes I intend to make as followups:
* rework the test-narrow-*-tree.t tests to use the new testcases
functionality in run-tests.py
* remove lots of monkeypatches of core things
Differential Revision: https://phab.mercurial-scm.org/D1974
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 29 Jan 2018 16:19:33 -0500 |
parents | |
children |
line wrap: on
line source
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \ > --extra-config-opt experimental.treemanifest=1 test-narrow-strip.t 2>&1 | \ > grep -v 'unexpected mercurial lib' | egrep -v '\(expected' --- */test-narrow-strip.t (glob) +++ */test-narrow-strip.t.err (glob) @@ -\d+,\d+ \+\d+,\d+ @@ (re) o 0 initial $ hg debugdata -m 1 - inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) - outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) + inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) + outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) $ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg $ hg strip . @@ -\d+,\d+ \+\d+,\d+ @@ (re) Check that hash of file outside narrow spec got restored $ hg debugdata -m 2 - inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) - outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) + inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) + outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) Also verify we can apply the bundle with 'hg pull': $ hg co -r 'desc("modify inside")' @@ -\d+,\d+ \+\d+,\d+ @@ (re) date: Thu Jan 01 00:00:00 1970 +0000 summary: initial - changeset: 1:9e48d953700d + changeset: 1:3888164bccf0 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify outside again - changeset: 2:f505d5e96aa8 + changeset: 2:40b66f95a209 tag: tip - parent: 0:a99f4d53924d + parent: 0:c2a5fabcca3c user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify inside ERROR: test-narrow-strip.t output changed ! Failed test-narrow-strip.t: output changed # Ran 1 tests, 0 skipped, 1 failed. python hash seed: * (glob)