test-remove.t
536 lines
| 17.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-remove.t
|
r12099 | $ remove() { | ||
> hg rm $@ | ||||
|
r19381 | > echo "exit code: $?" | ||
|
r12099 | > hg st | ||
> # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 | ||||
> find . -name .hg -prune -o -type f -print | sort | ||||
> hg up -C | ||||
> } | ||||
|
r28606 | $ cat >> $HGRCPATH <<EOF | ||
> [progress] | ||||
> disable=False | ||||
> assume-tty = 1 | ||||
> delay = 0 | ||||
> # set changedelay really large so we don't see nested topics | ||||
> changedelay = 30000 | ||||
> format = topic bar number | ||||
> refresh = 0 | ||||
> width = 60 | ||||
> EOF | ||||
|
r12099 | $ hg init a | ||
$ cd a | ||||
$ echo a > foo | ||||
file not managed | ||||
$ remove foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | not removing foo: file is untracked | ||
|
r12130 | exit code: 1 | ||
|
r12099 | ? foo | ||
./foo | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg add foo | ||||
$ hg commit -m1 | ||||
the table cases | ||||
00 state added, options none | ||||
$ echo b > bar | ||||
$ hg add bar | ||||
$ remove bar | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r29963 | not removing bar: file has been marked for add (use 'hg forget' to undo add) | ||
|
r12130 | exit code: 1 | ||
|
r12099 | A bar | ||
./bar | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
01 state clean, options none | ||||
$ remove foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
? bar | ||||
./bar | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
02 state modified, options none | ||||
$ echo b >> foo | ||||
$ remove foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | not removing foo: file is modified (use -f to force removal) | ||
|
r12130 | exit code: 1 | ||
|
r12099 | M foo | ||
? bar | ||||
./bar | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
03 state missing, options none | ||||
$ rm foo | ||||
$ remove foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
? bar | ||||
./bar | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
10 state added, options -f | ||||
$ echo b > bar | ||||
$ hg add bar | ||||
$ remove -f bar | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | ? bar | ||
./bar | ||||
./foo | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ rm bar | ||||
11 state clean, options -f | ||||
$ remove -f foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
12 state modified, options -f | ||||
$ echo b >> foo | ||||
$ remove -f foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
13 state missing, options -f | ||||
$ rm foo | ||||
$ remove -f foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
20 state added, options -A | ||||
$ echo b > bar | ||||
$ hg add bar | ||||
$ remove -A bar | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r18053 | not removing bar: file still exists | ||
|
r12130 | exit code: 1 | ||
|
r12099 | A bar | ||
./bar | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r35120 | 21 state clean, options -Av | ||
|
r12099 | |||
|
r35120 | $ remove -Av foo | ||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r18053 | not removing foo: file still exists | ||
|
r12130 | exit code: 1 | ||
|
r12099 | ? bar | ||
./bar | ||||
./foo | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r35120 | 22 state modified, options -Av | ||
|
r12099 | |||
$ echo b >> foo | ||||
|
r35120 | $ remove -Av foo | ||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r18053 | not removing foo: file still exists | ||
|
r12130 | exit code: 1 | ||
|
r12099 | M foo | ||
? bar | ||||
./bar | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
23 state missing, options -A | ||||
$ rm foo | ||||
$ remove -A foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
? bar | ||||
./bar | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
30 state added, options -Af | ||||
$ echo b > bar | ||||
$ hg add bar | ||||
$ remove -Af bar | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | ? bar | ||
./bar | ||||
./foo | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ rm bar | ||||
31 state clean, options -Af | ||||
$ remove -Af foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
32 state modified, options -Af | ||||
$ echo b >> foo | ||||
$ remove -Af foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
33 state missing, options -Af | ||||
$ rm foo | ||||
$ remove -Af foo | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R foo | ||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
test some directory stuff | ||||
$ mkdir test | ||||
$ echo a > test/foo | ||||
$ echo b > test/bar | ||||
$ hg ci -Am2 | ||||
adding test/bar | ||||
adding test/foo | ||||
dir, options none | ||||
$ rm test/bar | ||||
$ remove test | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [=====================> ] 1/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
removing test/foo | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R test/bar | ||
R test/foo | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
dir, options -f | ||||
$ rm test/bar | ||||
$ remove -f test | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [=====================> ] 1/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
removing test/foo | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R test/bar | ||
R test/foo | ||||
./foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r35120 | dir, options -Av | ||
|
r12099 | |||
$ rm test/bar | ||||
|
r35120 | $ remove -Av test | ||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
not removing test/foo: file still exists | ||||
|
r35120 | exit code: 1 | ||
R test/bar | ||||
./foo | ||||
./test/foo | ||||
\r (no-eol) (esc) | ||||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
dir, options -A <dir> | ||||
$ rm test/bar | ||||
|
r12099 | $ remove -A test | ||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
skipping [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
|
r35120 | exit code: 1 | ||
R test/bar | ||||
./foo | ||||
./test/foo | ||||
\r (no-eol) (esc) | ||||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
without any files/dirs, options -A | ||||
$ rm test/bar | ||||
$ remove -A | ||||
\r (no-eol) (esc) | ||||
skipping [=====================> ] 1/2\r (no-eol) (esc) | ||||
skipping [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
|
r12130 | exit code: 1 | ||
|
r12099 | R test/bar | ||
./foo | ||||
./test/foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
dir, options -Af | ||||
$ rm test/bar | ||||
$ remove -Af test | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [=====================> ] 1/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing test/bar | ||
removing test/foo | ||||
|
r12130 | exit code: 0 | ||
|
r12099 | R test/bar | ||
R test/foo | ||||
./foo | ||||
./test/foo | ||||
|
r28606 | \r (no-eol) (esc) | ||
updating [===========================================>] 2/2\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r12099 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
test remove dropping empty trees (issue1861) | ||||
$ mkdir -p issue1861/b/c | ||||
$ echo x > issue1861/x | ||||
$ echo y > issue1861/b/c/y | ||||
$ hg ci -Am add | ||||
adding issue1861/b/c/y | ||||
adding issue1861/x | ||||
$ hg rm issue1861/b | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing issue1861/b/c/y | ||
|
r12099 | $ hg ci -m remove | ||
$ ls issue1861 | ||||
x | ||||
|
r16904 | |||
test that commit does not crash if the user removes a newly added file | ||||
$ touch f1 | ||||
$ hg add f1 | ||||
$ rm f1 | ||||
$ hg ci -A -mx | ||||
removing f1 | ||||
nothing changed | ||||
[1] | ||||
|
r16913 | |||
|
r17848 | handling of untracked directories and missing files | ||
$ mkdir d1 | ||||
$ echo a > d1/a | ||||
$ hg rm --after d1 | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r17848 | not removing d1: no tracked files | ||
[1] | ||||
$ hg add d1/a | ||||
$ rm d1/a | ||||
$ hg rm --after d1 | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r35394 | removing d1/a | ||
|
r28889 | |||
|
r17862 | $ hg rm --after nosuch | ||
nosuch: * (glob) | ||||
|
r28608 | \r (no-eol) (esc) | ||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
|
r17848 | [1] | ||
|
r37168 | |||
test dry-run for remove | ||||
$ hg init testdryrun | ||||
$ cd testdryrun | ||||
$ echo a>a | ||||
$ hg ci -qAm1 | ||||
$ hg remove a -nv | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
deleting [===========================================>] 1/1\r (no-eol) (esc) | ||||
\r (no-eol) (esc) | ||||
removing a | ||||
$ hg diff | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [extensions] | ||||
> largefiles= | ||||
> EOF | ||||
$ echo 'B as largefile' > B | ||||
$ hg add --large B | ||||
$ hg ci -m "B" | ||||
$ hg remove B -nv | ||||
removing B | ||||
$ hg st | ||||
$ cd .. | ||||