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