Mercurial > hg
annotate tests/test-remove.t @ 28802:b16eacf5347c
test-filecache: sort import lines
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Tue, 05 Apr 2016 23:15:49 +0900 |
parents | 62e73d42bd14 |
children | 7a1e0711401e |
rev | line source |
---|---|
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
1 $ remove() { |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
2 > hg rm $@ |
19381
e033a7d444ac
tests: do not skip code-checking on some whole files
Simon Heimberg <simohe@besonet.ch>
parents:
18053
diff
changeset
|
3 > echo "exit code: $?" |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
4 > hg st |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
5 > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
6 > find . -name .hg -prune -o -type f -print | sort |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
7 > hg up -C |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
8 > } |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
9 |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
10 $ cat >> $HGRCPATH <<EOF |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
11 > [progress] |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
12 > disable=False |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
13 > assume-tty = 1 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
14 > delay = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
15 > # set changedelay really large so we don't see nested topics |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
16 > changedelay = 30000 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
17 > format = topic bar number |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
18 > refresh = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
19 > width = 60 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
20 > EOF |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
21 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
22 $ hg init a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
23 $ cd a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
24 $ echo a > foo |
936 | 25 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
26 file not managed |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
27 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
28 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
29 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
30 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
31 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
32 not removing foo: file is untracked |
12130 | 33 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
34 ? foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
35 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
36 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
37 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
38 $ hg add foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
39 $ hg commit -m1 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
40 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
41 the table cases |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
42 00 state added, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
43 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
44 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
45 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
46 $ remove bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
47 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
48 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
49 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
50 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
51 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
52 \r (no-eol) (esc) |
15115
c84b3f42d5ae
remove: suggest forget to undo adds
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
53 not removing bar: file has been marked for add (use forget to undo) |
12130 | 54 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
55 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
56 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
57 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
58 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
59 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
60 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
62 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
63 01 state clean, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
64 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
65 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
66 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
67 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
68 \r (no-eol) (esc) |
12130 | 69 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
70 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
71 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
72 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
73 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
74 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
75 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
77 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
78 02 state modified, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
79 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
80 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
81 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
82 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
83 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
84 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
85 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
86 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
87 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
88 not removing foo: file is modified (use -f to force removal) |
12130 | 89 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
90 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
91 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
92 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
93 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
94 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
95 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
96 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
98 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
99 03 state missing, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
100 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
101 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
102 $ remove foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
103 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
104 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
105 \r (no-eol) (esc) |
12130 | 106 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
107 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
108 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
109 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
110 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
111 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
112 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
114 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
115 10 state added, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
116 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
117 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
118 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
119 $ remove -f bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
120 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
121 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
122 \r (no-eol) (esc) |
12130 | 123 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
124 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
125 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
126 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
127 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
128 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
129 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
130 11 state clean, options -f |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
131 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
132 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
133 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
134 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
135 \r (no-eol) (esc) |
12130 | 136 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
137 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
138 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
139 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
140 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
142 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
143 12 state modified, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
144 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
145 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
146 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
147 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
148 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
149 \r (no-eol) (esc) |
12130 | 150 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
151 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
152 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
153 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
154 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
156 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
157 13 state missing, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
158 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
159 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
160 $ remove -f foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
161 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
162 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
163 \r (no-eol) (esc) |
12130 | 164 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
165 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
166 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
167 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
168 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
170 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
171 20 state added, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
172 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
173 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
174 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
175 $ remove -A bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
176 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
177 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
178 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
179 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
180 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
181 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
182 not removing bar: file still exists |
12130 | 183 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
184 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
185 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
186 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
187 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
188 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
189 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
190 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
191 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
192 21 state clean, options -A |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
193 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
194 $ remove -A foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
195 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
196 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
197 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
198 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
199 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
200 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
201 not removing foo: file still exists |
12130 | 202 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
203 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
204 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
205 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
207 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
208 22 state modified, options -A |
936 | 209 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
210 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
211 $ remove -A foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
212 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
213 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
214 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
215 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
216 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
217 \r (no-eol) (esc) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
218 not removing foo: file still exists |
12130 | 219 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
220 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
221 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
222 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
223 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
224 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
225 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
226 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
228 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
229 23 state missing, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
230 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
231 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
232 $ remove -A foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
233 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
234 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
235 \r (no-eol) (esc) |
12130 | 236 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
237 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
238 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
239 ./bar |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
240 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
241 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
242 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
244 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
245 30 state added, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
246 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
247 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
248 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
249 $ remove -Af bar |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
250 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
251 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
252 \r (no-eol) (esc) |
12130 | 253 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
254 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
255 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
256 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
258 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
259 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
260 31 state clean, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
261 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
262 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
263 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
264 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
265 \r (no-eol) (esc) |
12130 | 266 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
267 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
268 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
269 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
270 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
271 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
272 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
273 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
274 32 state modified, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
275 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
276 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
277 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
278 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
279 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
280 \r (no-eol) (esc) |
12130 | 281 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
282 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
283 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
284 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
285 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
286 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2309
b2f37c7026ca
remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2180
diff
changeset
|
288 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
289 33 state missing, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
290 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
291 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
292 $ remove -Af foo |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
293 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
294 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
295 \r (no-eol) (esc) |
12130 | 296 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
297 R foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
298 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
299 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
300 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
301 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
302 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
303 test some directory stuff |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
304 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
305 $ mkdir test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
306 $ echo a > test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
307 $ echo b > test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
308 $ hg ci -Am2 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
309 adding test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
310 adding test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
311 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
312 dir, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
313 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
314 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
315 $ remove test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
316 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
317 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
318 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
319 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
320 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
321 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
322 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
323 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
324 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
325 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
326 \r (no-eol) (esc) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
327 removing test/bar (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
328 removing test/foo (glob) |
12130 | 329 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
330 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
331 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
332 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
333 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
334 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
335 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
336 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
337 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
338 dir, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
339 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
340 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
341 $ remove -f test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
342 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
343 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
344 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
345 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
346 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
347 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
348 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
349 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
350 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
351 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
352 \r (no-eol) (esc) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
353 removing test/bar (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
354 removing test/foo (glob) |
12130 | 355 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
356 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
357 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
358 ./foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
359 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
360 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
361 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
362 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
363 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
364 dir, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
365 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
366 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
367 $ remove -A test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
368 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
369 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
370 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
371 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
372 skipping [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
373 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
374 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
375 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
376 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
377 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
378 \r (no-eol) (esc) |
28607
a88959ae5938
remove: queue warnings until after status messages (issue5140) (API)
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
379 removing test/bar (glob) |
18053
0c2f0048125d
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning
Mads Kiilerich <madski@unity3d.com>
parents:
17862
diff
changeset
|
380 not removing test/foo: file still exists (glob) |
12130 | 381 exit code: 1 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
382 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
383 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
384 ./test/foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
385 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
386 updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
387 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
388 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
389 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
390 dir, options -Af |
9572
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
6358
diff
changeset
|
391 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
392 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
393 $ remove -Af test |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
394 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
395 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
396 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
397 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
398 deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
399 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
400 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
401 deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
402 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
403 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
404 \r (no-eol) (esc) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
405 removing test/bar (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
406 removing test/foo (glob) |
12130 | 407 exit code: 0 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
408 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
409 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
410 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
411 ./test/foo |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
412 \r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
413 updating [===========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
19381
diff
changeset
|
414 \r (no-eol) (esc) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
415 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
416 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
417 test remove dropping empty trees (issue1861) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
418 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
419 $ mkdir -p issue1861/b/c |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
420 $ echo x > issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
421 $ echo y > issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
422 $ hg ci -Am add |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
423 adding issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
424 adding issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
425 $ hg rm issue1861/b |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
426 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
427 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
428 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
429 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
430 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
431 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
432 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
433 \r (no-eol) (esc) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15115
diff
changeset
|
434 removing issue1861/b/c/y (glob) |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
435 $ hg ci -m remove |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
436 $ ls issue1861 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
437 x |
16904
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
438 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
439 test that commit does not crash if the user removes a newly added file |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
440 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
441 $ touch f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
442 $ hg add f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
443 $ rm f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
444 $ hg ci -A -mx |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
445 removing f1 |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
446 nothing changed |
9d0f988364bd
test-remove-new: integrate into test-remove.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
15447
diff
changeset
|
447 [1] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16904
diff
changeset
|
448 |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
449 handling of untracked directories and missing files |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
450 |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
451 $ mkdir d1 |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
452 $ echo a > d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
453 $ hg rm --after d1 |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
454 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
455 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
456 \r (no-eol) (esc) |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
457 not removing d1: no tracked files |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
458 [1] |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
459 $ hg add d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
460 $ rm d1/a |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
461 $ hg rm --after d1 |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
462 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
463 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
464 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
465 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
466 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
467 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
468 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
469 \r (no-eol) (esc) |
17861
3125af2d99d2
test-remove: fix \ vs. / issues on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17848
diff
changeset
|
470 removing d1/a (glob) |
17862
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
471 #if windows |
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
472 $ hg rm --after nosuch |
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
473 nosuch: * (glob) |
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
474 [1] |
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
475 #else |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
476 $ hg rm --after nosuch |
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
477 nosuch: No such file or directory |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
478 \r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
479 deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28607
diff
changeset
|
480 \r (no-eol) (esc) |
17848
66f0c78350ab
remove: don't return error on directories with tracked files
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
481 [1] |
17862
2142691be14f
test-remove: adapt to differing error message on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17861
diff
changeset
|
482 #endif |