Mercurial > hg
view tests/test-update-names.t @ 33116:6c113a7dec52
tests: use the system hg for examining the local repository
Most test scripts use "hg" to interact with a temporary test repository.
However a few tests also want to run hg commands to interact with the local
repository containing the mercurial source code. Notably, many of the
test-check-* tests want to check local files and commit messages.
These tests were previously using the version of hg being tested to query the
source repository. However, this will fail if the source repository requires
extensions or other settings not supported by the version of mercurial being
tested. The source repository was typically initially cloned using the system
hg installation, so we should use the system hg installation to query it.
There was already a helpers-testrepo.sh script designed to help cope with
different requirements for the source repository versus the test repositories.
However, it only handled the evolve extension. This new behavior works with
any extensions that are different between the system installation and the test
installation.
author | Adam Simpkins <simpkins@fb.com> |
---|---|
date | Tue, 27 Jun 2017 17:24:31 -0700 |
parents | 478999e8281d |
children | 33c8a6837181 |
line wrap: on
line source
Test update logic when there are renames or weird same-name cases between dirs and files Update with local changes across a file rename $ hg init r1 && cd r1 $ echo a > a $ hg add a $ hg ci -m a $ hg mv a b $ hg ci -m rename $ echo b > b $ hg ci -m change $ hg up -q 0 $ echo c > a $ hg up merging a and b to b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] Test update when local untracked directory exists with the same name as a tracked file in a commit we are updating to $ hg init r2 && cd r2 $ echo root > root && hg ci -Am root # rev 0 adding root $ echo text > name && hg ci -Am "name is a file" # rev 1 adding name $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkdir name $ hg up 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Test update when local untracked directory exists with some files in it and has the same name a tracked file in a commit we are updating to. In future this should be updated to give an friendlier error message, but now we should just make sure that this does not erase untracked data $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkdir name $ echo text > name/file $ hg st ? name/file $ hg up 1 abort: *: '$TESTTMP/r1/r2/name' (glob) [255] $ cd .. #if symlink Test update when two commits have symlinks that point to different folders $ hg init r3 && cd r3 $ echo root > root && hg ci -Am root adding root $ mkdir folder1 && mkdir folder2 $ ln -s folder1 folder $ hg ci -Am "symlink to folder1" adding folder $ rm folder $ ln -s folder2 folder $ hg ci -Am "symlink to folder2" $ hg up 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. #endif #if rmcwd Test that warning is printed if cwd is deleted during update $ hg init r4 && cd r4 $ mkdir dir $ cd dir $ echo a > a $ echo b > b $ hg add a b $ hg ci -m "file and dir" $ hg up -q null current directory was removed (consider changing to repo root: $TESTTMP/r1/r4) #endif