Mercurial > hg
diff tests/test-narrow-update.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 | 6767e7ce2c31 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-narrow-update.t Mon Jan 29 16:19:33 2018 -0500 @@ -0,0 +1,76 @@ + + $ . "$TESTDIR/narrow-library.sh" + +create full repo + + $ hg init master + $ cd master + $ echo init > init + $ hg ci -Aqm 'initial' + + $ mkdir inside + $ echo inside > inside/f1 + $ mkdir outside + $ echo outside > outside/f1 + $ hg ci -Aqm 'add inside and outside' + + $ echo modified > inside/f1 + $ hg ci -qm 'modify inside' + + $ echo modified > outside/f1 + $ hg ci -qm 'modify outside' + + $ cd .. + + $ hg clone --narrow ssh://user@dummy/master narrow --include inside + requesting all changes + adding changesets + adding manifests + adding file changes + added 4 changesets with 2 changes to 1 files + new changesets *:* (glob) + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd narrow + $ hg debugindex -c + rev offset length base linkrev nodeid p1 p2 + 0 0 64 0 0 9958b1af2add 000000000000 000000000000 + 1 64 81 1 1 2db4ce2a3bfe 9958b1af2add 000000000000 + 2 145 75 2 2 0980ee31a742 2db4ce2a3bfe 000000000000 + 3 220 (76|77) 3 3 4410145019b7 0980ee31a742 000000000000 (re) + + $ hg update -q 0 + +Can update to revision with changes inside + + $ hg update -q 'desc("add inside and outside")' + $ hg update -q 'desc("modify inside")' + $ find * + inside + inside/f1 (glob) + $ cat inside/f1 + modified + +Can update to revision with changes outside + + $ hg update -q 'desc("modify outside")' + $ find * + inside + inside/f1 (glob) + $ cat inside/f1 + modified + +Can update with a deleted file inside + + $ hg rm inside/f1 + $ hg update -q 'desc("modify inside")' + $ hg update -q 'desc("modify outside")' + $ hg update -q 'desc("initial")' + $ hg update -q 'desc("modify inside")' + +Can update with a moved file inside + + $ hg mv inside/f1 inside/f2 + $ hg update -q 'desc("modify outside")' + $ hg update -q 'desc("initial")' + $ hg update -q 'desc("modify inside")'