##// END OF EJS Templates
tests: replace imported module to avoid check-code.py error...
FUJIWARA Katsunori -
r41882:67333663 default
parent child Browse files
Show More
@@ -1,654 +1,654
1 $ hg init repo1
1 $ hg init repo1
2 $ cd repo1
2 $ cd repo1
3 $ mkdir a b a/1 b/1 b/2
3 $ mkdir a b a/1 b/1 b/2
4 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
4 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
5
5
6 hg status in repo root:
6 hg status in repo root:
7
7
8 $ hg status
8 $ hg status
9 ? a/1/in_a_1
9 ? a/1/in_a_1
10 ? a/in_a
10 ? a/in_a
11 ? b/1/in_b_1
11 ? b/1/in_b_1
12 ? b/2/in_b_2
12 ? b/2/in_b_2
13 ? b/in_b
13 ? b/in_b
14 ? in_root
14 ? in_root
15
15
16 hg status . in repo root:
16 hg status . in repo root:
17
17
18 $ hg status .
18 $ hg status .
19 ? a/1/in_a_1
19 ? a/1/in_a_1
20 ? a/in_a
20 ? a/in_a
21 ? b/1/in_b_1
21 ? b/1/in_b_1
22 ? b/2/in_b_2
22 ? b/2/in_b_2
23 ? b/in_b
23 ? b/in_b
24 ? in_root
24 ? in_root
25
25
26 $ hg status --cwd a
26 $ hg status --cwd a
27 ? a/1/in_a_1
27 ? a/1/in_a_1
28 ? a/in_a
28 ? a/in_a
29 ? b/1/in_b_1
29 ? b/1/in_b_1
30 ? b/2/in_b_2
30 ? b/2/in_b_2
31 ? b/in_b
31 ? b/in_b
32 ? in_root
32 ? in_root
33 $ hg status --cwd a .
33 $ hg status --cwd a .
34 ? 1/in_a_1
34 ? 1/in_a_1
35 ? in_a
35 ? in_a
36 $ hg status --cwd a ..
36 $ hg status --cwd a ..
37 ? 1/in_a_1
37 ? 1/in_a_1
38 ? in_a
38 ? in_a
39 ? ../b/1/in_b_1
39 ? ../b/1/in_b_1
40 ? ../b/2/in_b_2
40 ? ../b/2/in_b_2
41 ? ../b/in_b
41 ? ../b/in_b
42 ? ../in_root
42 ? ../in_root
43
43
44 $ hg status --cwd b
44 $ hg status --cwd b
45 ? a/1/in_a_1
45 ? a/1/in_a_1
46 ? a/in_a
46 ? a/in_a
47 ? b/1/in_b_1
47 ? b/1/in_b_1
48 ? b/2/in_b_2
48 ? b/2/in_b_2
49 ? b/in_b
49 ? b/in_b
50 ? in_root
50 ? in_root
51 $ hg status --cwd b .
51 $ hg status --cwd b .
52 ? 1/in_b_1
52 ? 1/in_b_1
53 ? 2/in_b_2
53 ? 2/in_b_2
54 ? in_b
54 ? in_b
55 $ hg status --cwd b ..
55 $ hg status --cwd b ..
56 ? ../a/1/in_a_1
56 ? ../a/1/in_a_1
57 ? ../a/in_a
57 ? ../a/in_a
58 ? 1/in_b_1
58 ? 1/in_b_1
59 ? 2/in_b_2
59 ? 2/in_b_2
60 ? in_b
60 ? in_b
61 ? ../in_root
61 ? ../in_root
62
62
63 $ hg status --cwd a/1
63 $ hg status --cwd a/1
64 ? a/1/in_a_1
64 ? a/1/in_a_1
65 ? a/in_a
65 ? a/in_a
66 ? b/1/in_b_1
66 ? b/1/in_b_1
67 ? b/2/in_b_2
67 ? b/2/in_b_2
68 ? b/in_b
68 ? b/in_b
69 ? in_root
69 ? in_root
70 $ hg status --cwd a/1 .
70 $ hg status --cwd a/1 .
71 ? in_a_1
71 ? in_a_1
72 $ hg status --cwd a/1 ..
72 $ hg status --cwd a/1 ..
73 ? in_a_1
73 ? in_a_1
74 ? ../in_a
74 ? ../in_a
75
75
76 $ hg status --cwd b/1
76 $ hg status --cwd b/1
77 ? a/1/in_a_1
77 ? a/1/in_a_1
78 ? a/in_a
78 ? a/in_a
79 ? b/1/in_b_1
79 ? b/1/in_b_1
80 ? b/2/in_b_2
80 ? b/2/in_b_2
81 ? b/in_b
81 ? b/in_b
82 ? in_root
82 ? in_root
83 $ hg status --cwd b/1 .
83 $ hg status --cwd b/1 .
84 ? in_b_1
84 ? in_b_1
85 $ hg status --cwd b/1 ..
85 $ hg status --cwd b/1 ..
86 ? in_b_1
86 ? in_b_1
87 ? ../2/in_b_2
87 ? ../2/in_b_2
88 ? ../in_b
88 ? ../in_b
89
89
90 $ hg status --cwd b/2
90 $ hg status --cwd b/2
91 ? a/1/in_a_1
91 ? a/1/in_a_1
92 ? a/in_a
92 ? a/in_a
93 ? b/1/in_b_1
93 ? b/1/in_b_1
94 ? b/2/in_b_2
94 ? b/2/in_b_2
95 ? b/in_b
95 ? b/in_b
96 ? in_root
96 ? in_root
97 $ hg status --cwd b/2 .
97 $ hg status --cwd b/2 .
98 ? in_b_2
98 ? in_b_2
99 $ hg status --cwd b/2 ..
99 $ hg status --cwd b/2 ..
100 ? ../1/in_b_1
100 ? ../1/in_b_1
101 ? in_b_2
101 ? in_b_2
102 ? ../in_b
102 ? ../in_b
103
103
104 combining patterns with root and patterns without a root works
104 combining patterns with root and patterns without a root works
105
105
106 $ hg st a/in_a re:.*b$
106 $ hg st a/in_a re:.*b$
107 ? a/in_a
107 ? a/in_a
108 ? b/in_b
108 ? b/in_b
109
109
110 tweaking defaults works
110 tweaking defaults works
111 $ hg status --cwd a --config ui.tweakdefaults=yes
111 $ hg status --cwd a --config ui.tweakdefaults=yes
112 ? 1/in_a_1
112 ? 1/in_a_1
113 ? in_a
113 ? in_a
114 ? ../b/1/in_b_1
114 ? ../b/1/in_b_1
115 ? ../b/2/in_b_2
115 ? ../b/2/in_b_2
116 ? ../b/in_b
116 ? ../b/in_b
117 ? ../in_root
117 ? ../in_root
118 $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes
118 $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes
119 ? a/1/in_a_1 (glob)
119 ? a/1/in_a_1 (glob)
120 ? a/in_a (glob)
120 ? a/in_a (glob)
121 ? b/1/in_b_1 (glob)
121 ? b/1/in_b_1 (glob)
122 ? b/2/in_b_2 (glob)
122 ? b/2/in_b_2 (glob)
123 ? b/in_b (glob)
123 ? b/in_b (glob)
124 ? in_root
124 ? in_root
125 $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes
125 $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes
126 ? 1/in_a_1
126 ? 1/in_a_1
127 ? in_a
127 ? in_a
128 ? ../b/1/in_b_1
128 ? ../b/1/in_b_1
129 ? ../b/2/in_b_2
129 ? ../b/2/in_b_2
130 ? ../b/in_b
130 ? ../b/in_b
131 ? ../in_root (glob)
131 ? ../in_root (glob)
132
132
133 relative paths can be requested
133 relative paths can be requested
134
134
135 $ hg status --cwd a --config ui.relative-paths=yes
135 $ hg status --cwd a --config ui.relative-paths=yes
136 ? 1/in_a_1
136 ? 1/in_a_1
137 ? in_a
137 ? in_a
138 ? ../b/1/in_b_1
138 ? ../b/1/in_b_1
139 ? ../b/2/in_b_2
139 ? ../b/2/in_b_2
140 ? ../b/in_b
140 ? ../b/in_b
141 ? ../in_root
141 ? ../in_root
142
142
143 $ hg status --cwd a . --config ui.relative-paths=legacy
143 $ hg status --cwd a . --config ui.relative-paths=legacy
144 ? 1/in_a_1
144 ? 1/in_a_1
145 ? in_a
145 ? in_a
146 $ hg status --cwd a . --config ui.relative-paths=no
146 $ hg status --cwd a . --config ui.relative-paths=no
147 ? a/1/in_a_1
147 ? a/1/in_a_1
148 ? a/in_a
148 ? a/in_a
149
149
150 commands.status.relative overrides ui.relative-paths
150 commands.status.relative overrides ui.relative-paths
151
151
152 $ cat >> $HGRCPATH <<EOF
152 $ cat >> $HGRCPATH <<EOF
153 > [ui]
153 > [ui]
154 > relative-paths = False
154 > relative-paths = False
155 > [commands]
155 > [commands]
156 > status.relative = True
156 > status.relative = True
157 > EOF
157 > EOF
158 $ hg status --cwd a
158 $ hg status --cwd a
159 ? 1/in_a_1
159 ? 1/in_a_1
160 ? in_a
160 ? in_a
161 ? ../b/1/in_b_1
161 ? ../b/1/in_b_1
162 ? ../b/2/in_b_2
162 ? ../b/2/in_b_2
163 ? ../b/in_b
163 ? ../b/in_b
164 ? ../in_root
164 ? ../in_root
165 $ HGPLAIN=1 hg status --cwd a
165 $ HGPLAIN=1 hg status --cwd a
166 ? a/1/in_a_1 (glob)
166 ? a/1/in_a_1 (glob)
167 ? a/in_a (glob)
167 ? a/in_a (glob)
168 ? b/1/in_b_1 (glob)
168 ? b/1/in_b_1 (glob)
169 ? b/2/in_b_2 (glob)
169 ? b/2/in_b_2 (glob)
170 ? b/in_b (glob)
170 ? b/in_b (glob)
171 ? in_root
171 ? in_root
172
172
173 if relative paths are explicitly off, tweakdefaults doesn't change it
173 if relative paths are explicitly off, tweakdefaults doesn't change it
174 $ cat >> $HGRCPATH <<EOF
174 $ cat >> $HGRCPATH <<EOF
175 > [commands]
175 > [commands]
176 > status.relative = False
176 > status.relative = False
177 > EOF
177 > EOF
178 $ hg status --cwd a --config ui.tweakdefaults=yes
178 $ hg status --cwd a --config ui.tweakdefaults=yes
179 ? a/1/in_a_1
179 ? a/1/in_a_1
180 ? a/in_a
180 ? a/in_a
181 ? b/1/in_b_1
181 ? b/1/in_b_1
182 ? b/2/in_b_2
182 ? b/2/in_b_2
183 ? b/in_b
183 ? b/in_b
184 ? in_root
184 ? in_root
185
185
186 $ cd ..
186 $ cd ..
187
187
188 $ hg init repo2
188 $ hg init repo2
189 $ cd repo2
189 $ cd repo2
190 $ touch modified removed deleted ignored
190 $ touch modified removed deleted ignored
191 $ echo "^ignored$" > .hgignore
191 $ echo "^ignored$" > .hgignore
192 $ hg ci -A -m 'initial checkin'
192 $ hg ci -A -m 'initial checkin'
193 adding .hgignore
193 adding .hgignore
194 adding deleted
194 adding deleted
195 adding modified
195 adding modified
196 adding removed
196 adding removed
197 $ touch modified added unknown ignored
197 $ touch modified added unknown ignored
198 $ hg add added
198 $ hg add added
199 $ hg remove removed
199 $ hg remove removed
200 $ rm deleted
200 $ rm deleted
201
201
202 hg status:
202 hg status:
203
203
204 $ hg status
204 $ hg status
205 A added
205 A added
206 R removed
206 R removed
207 ! deleted
207 ! deleted
208 ? unknown
208 ? unknown
209
209
210 hg status modified added removed deleted unknown never-existed ignored:
210 hg status modified added removed deleted unknown never-existed ignored:
211
211
212 $ hg status modified added removed deleted unknown never-existed ignored
212 $ hg status modified added removed deleted unknown never-existed ignored
213 never-existed: * (glob)
213 never-existed: * (glob)
214 A added
214 A added
215 R removed
215 R removed
216 ! deleted
216 ! deleted
217 ? unknown
217 ? unknown
218
218
219 $ hg copy modified copied
219 $ hg copy modified copied
220
220
221 hg status -C:
221 hg status -C:
222
222
223 $ hg status -C
223 $ hg status -C
224 A added
224 A added
225 A copied
225 A copied
226 modified
226 modified
227 R removed
227 R removed
228 ! deleted
228 ! deleted
229 ? unknown
229 ? unknown
230
230
231 hg status -A:
231 hg status -A:
232
232
233 $ hg status -A
233 $ hg status -A
234 A added
234 A added
235 A copied
235 A copied
236 modified
236 modified
237 R removed
237 R removed
238 ! deleted
238 ! deleted
239 ? unknown
239 ? unknown
240 I ignored
240 I ignored
241 C .hgignore
241 C .hgignore
242 C modified
242 C modified
243
243
244 $ hg status -A -T '{status} {path} {node|shortest}\n'
244 $ hg status -A -T '{status} {path} {node|shortest}\n'
245 A added ffff
245 A added ffff
246 A copied ffff
246 A copied ffff
247 R removed ffff
247 R removed ffff
248 ! deleted ffff
248 ! deleted ffff
249 ? unknown ffff
249 ? unknown ffff
250 I ignored ffff
250 I ignored ffff
251 C .hgignore ffff
251 C .hgignore ffff
252 C modified ffff
252 C modified ffff
253
253
254 $ hg status -A -Tjson
254 $ hg status -A -Tjson
255 [
255 [
256 {
256 {
257 "path": "added",
257 "path": "added",
258 "status": "A"
258 "status": "A"
259 },
259 },
260 {
260 {
261 "path": "copied",
261 "path": "copied",
262 "source": "modified",
262 "source": "modified",
263 "status": "A"
263 "status": "A"
264 },
264 },
265 {
265 {
266 "path": "removed",
266 "path": "removed",
267 "status": "R"
267 "status": "R"
268 },
268 },
269 {
269 {
270 "path": "deleted",
270 "path": "deleted",
271 "status": "!"
271 "status": "!"
272 },
272 },
273 {
273 {
274 "path": "unknown",
274 "path": "unknown",
275 "status": "?"
275 "status": "?"
276 },
276 },
277 {
277 {
278 "path": "ignored",
278 "path": "ignored",
279 "status": "I"
279 "status": "I"
280 },
280 },
281 {
281 {
282 "path": ".hgignore",
282 "path": ".hgignore",
283 "status": "C"
283 "status": "C"
284 },
284 },
285 {
285 {
286 "path": "modified",
286 "path": "modified",
287 "status": "C"
287 "status": "C"
288 }
288 }
289 ]
289 ]
290
290
291 $ hg status -A -Tpickle > pickle
291 $ hg status -A -Tpickle > pickle
292 >>> from __future__ import print_function
292 >>> from __future__ import print_function
293 >>> import pickle
293 >>> from mercurial.util import pickle
294 >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
294 >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
295 >>> for s, p in data: print("%s %s" % (s, p))
295 >>> for s, p in data: print("%s %s" % (s, p))
296 ! deleted
296 ! deleted
297 ? pickle
297 ? pickle
298 ? unknown
298 ? unknown
299 A added
299 A added
300 A copied
300 A copied
301 C .hgignore
301 C .hgignore
302 C modified
302 C modified
303 I ignored
303 I ignored
304 R removed
304 R removed
305 $ rm pickle
305 $ rm pickle
306
306
307 $ echo "^ignoreddir$" > .hgignore
307 $ echo "^ignoreddir$" > .hgignore
308 $ mkdir ignoreddir
308 $ mkdir ignoreddir
309 $ touch ignoreddir/file
309 $ touch ignoreddir/file
310
310
311 Test templater support:
311 Test templater support:
312
312
313 $ hg status -AT "[{status}]\t{if(source, '{source} -> ')}{path}\n"
313 $ hg status -AT "[{status}]\t{if(source, '{source} -> ')}{path}\n"
314 [M] .hgignore
314 [M] .hgignore
315 [A] added
315 [A] added
316 [A] modified -> copied
316 [A] modified -> copied
317 [R] removed
317 [R] removed
318 [!] deleted
318 [!] deleted
319 [?] ignored
319 [?] ignored
320 [?] unknown
320 [?] unknown
321 [I] ignoreddir/file
321 [I] ignoreddir/file
322 [C] modified
322 [C] modified
323 $ hg status -AT default
323 $ hg status -AT default
324 M .hgignore
324 M .hgignore
325 A added
325 A added
326 A copied
326 A copied
327 modified
327 modified
328 R removed
328 R removed
329 ! deleted
329 ! deleted
330 ? ignored
330 ? ignored
331 ? unknown
331 ? unknown
332 I ignoreddir/file
332 I ignoreddir/file
333 C modified
333 C modified
334 $ hg status -T compact
334 $ hg status -T compact
335 abort: "status" not in template map
335 abort: "status" not in template map
336 [255]
336 [255]
337
337
338 hg status ignoreddir/file:
338 hg status ignoreddir/file:
339
339
340 $ hg status ignoreddir/file
340 $ hg status ignoreddir/file
341
341
342 hg status -i ignoreddir/file:
342 hg status -i ignoreddir/file:
343
343
344 $ hg status -i ignoreddir/file
344 $ hg status -i ignoreddir/file
345 I ignoreddir/file
345 I ignoreddir/file
346 $ cd ..
346 $ cd ..
347
347
348 Check 'status -q' and some combinations
348 Check 'status -q' and some combinations
349
349
350 $ hg init repo3
350 $ hg init repo3
351 $ cd repo3
351 $ cd repo3
352 $ touch modified removed deleted ignored
352 $ touch modified removed deleted ignored
353 $ echo "^ignored$" > .hgignore
353 $ echo "^ignored$" > .hgignore
354 $ hg commit -A -m 'initial checkin'
354 $ hg commit -A -m 'initial checkin'
355 adding .hgignore
355 adding .hgignore
356 adding deleted
356 adding deleted
357 adding modified
357 adding modified
358 adding removed
358 adding removed
359 $ touch added unknown ignored
359 $ touch added unknown ignored
360 $ hg add added
360 $ hg add added
361 $ echo "test" >> modified
361 $ echo "test" >> modified
362 $ hg remove removed
362 $ hg remove removed
363 $ rm deleted
363 $ rm deleted
364 $ hg copy modified copied
364 $ hg copy modified copied
365
365
366 Specify working directory revision explicitly, that should be the same as
366 Specify working directory revision explicitly, that should be the same as
367 "hg status"
367 "hg status"
368
368
369 $ hg status --change "wdir()"
369 $ hg status --change "wdir()"
370 M modified
370 M modified
371 A added
371 A added
372 A copied
372 A copied
373 R removed
373 R removed
374 ! deleted
374 ! deleted
375 ? unknown
375 ? unknown
376
376
377 Run status with 2 different flags.
377 Run status with 2 different flags.
378 Check if result is the same or different.
378 Check if result is the same or different.
379 If result is not as expected, raise error
379 If result is not as expected, raise error
380
380
381 $ assert() {
381 $ assert() {
382 > hg status $1 > ../a
382 > hg status $1 > ../a
383 > hg status $2 > ../b
383 > hg status $2 > ../b
384 > if diff ../a ../b > /dev/null; then
384 > if diff ../a ../b > /dev/null; then
385 > out=0
385 > out=0
386 > else
386 > else
387 > out=1
387 > out=1
388 > fi
388 > fi
389 > if [ $3 -eq 0 ]; then
389 > if [ $3 -eq 0 ]; then
390 > df="same"
390 > df="same"
391 > else
391 > else
392 > df="different"
392 > df="different"
393 > fi
393 > fi
394 > if [ $out -ne $3 ]; then
394 > if [ $out -ne $3 ]; then
395 > echo "Error on $1 and $2, should be $df."
395 > echo "Error on $1 and $2, should be $df."
396 > fi
396 > fi
397 > }
397 > }
398
398
399 Assert flag1 flag2 [0-same | 1-different]
399 Assert flag1 flag2 [0-same | 1-different]
400
400
401 $ assert "-q" "-mard" 0
401 $ assert "-q" "-mard" 0
402 $ assert "-A" "-marduicC" 0
402 $ assert "-A" "-marduicC" 0
403 $ assert "-qA" "-mardcC" 0
403 $ assert "-qA" "-mardcC" 0
404 $ assert "-qAui" "-A" 0
404 $ assert "-qAui" "-A" 0
405 $ assert "-qAu" "-marducC" 0
405 $ assert "-qAu" "-marducC" 0
406 $ assert "-qAi" "-mardicC" 0
406 $ assert "-qAi" "-mardicC" 0
407 $ assert "-qu" "-u" 0
407 $ assert "-qu" "-u" 0
408 $ assert "-q" "-u" 1
408 $ assert "-q" "-u" 1
409 $ assert "-m" "-a" 1
409 $ assert "-m" "-a" 1
410 $ assert "-r" "-d" 1
410 $ assert "-r" "-d" 1
411 $ cd ..
411 $ cd ..
412
412
413 $ hg init repo4
413 $ hg init repo4
414 $ cd repo4
414 $ cd repo4
415 $ touch modified removed deleted
415 $ touch modified removed deleted
416 $ hg ci -q -A -m 'initial checkin'
416 $ hg ci -q -A -m 'initial checkin'
417 $ touch added unknown
417 $ touch added unknown
418 $ hg add added
418 $ hg add added
419 $ hg remove removed
419 $ hg remove removed
420 $ rm deleted
420 $ rm deleted
421 $ echo x > modified
421 $ echo x > modified
422 $ hg copy modified copied
422 $ hg copy modified copied
423 $ hg ci -m 'test checkin' -d "1000001 0"
423 $ hg ci -m 'test checkin' -d "1000001 0"
424 $ rm *
424 $ rm *
425 $ touch unrelated
425 $ touch unrelated
426 $ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
426 $ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
427
427
428 hg status --change 1:
428 hg status --change 1:
429
429
430 $ hg status --change 1
430 $ hg status --change 1
431 M modified
431 M modified
432 A added
432 A added
433 A copied
433 A copied
434 R removed
434 R removed
435
435
436 hg status --change 1 unrelated:
436 hg status --change 1 unrelated:
437
437
438 $ hg status --change 1 unrelated
438 $ hg status --change 1 unrelated
439
439
440 hg status -C --change 1 added modified copied removed deleted:
440 hg status -C --change 1 added modified copied removed deleted:
441
441
442 $ hg status -C --change 1 added modified copied removed deleted
442 $ hg status -C --change 1 added modified copied removed deleted
443 M modified
443 M modified
444 A added
444 A added
445 A copied
445 A copied
446 modified
446 modified
447 R removed
447 R removed
448
448
449 hg status -A --change 1 and revset:
449 hg status -A --change 1 and revset:
450
450
451 $ hg status -A --change '1|1'
451 $ hg status -A --change '1|1'
452 M modified
452 M modified
453 A added
453 A added
454 A copied
454 A copied
455 modified
455 modified
456 R removed
456 R removed
457 C deleted
457 C deleted
458
458
459 $ cd ..
459 $ cd ..
460
460
461 hg status with --rev and reverted changes:
461 hg status with --rev and reverted changes:
462
462
463 $ hg init reverted-changes-repo
463 $ hg init reverted-changes-repo
464 $ cd reverted-changes-repo
464 $ cd reverted-changes-repo
465 $ echo a > file
465 $ echo a > file
466 $ hg add file
466 $ hg add file
467 $ hg ci -m a
467 $ hg ci -m a
468 $ echo b > file
468 $ echo b > file
469 $ hg ci -m b
469 $ hg ci -m b
470
470
471 reverted file should appear clean
471 reverted file should appear clean
472
472
473 $ hg revert -r 0 .
473 $ hg revert -r 0 .
474 reverting file
474 reverting file
475 $ hg status -A --rev 0
475 $ hg status -A --rev 0
476 C file
476 C file
477
477
478 #if execbit
478 #if execbit
479 reverted file with changed flag should appear modified
479 reverted file with changed flag should appear modified
480
480
481 $ chmod +x file
481 $ chmod +x file
482 $ hg status -A --rev 0
482 $ hg status -A --rev 0
483 M file
483 M file
484
484
485 $ hg revert -r 0 .
485 $ hg revert -r 0 .
486 reverting file
486 reverting file
487
487
488 reverted and committed file with changed flag should appear modified
488 reverted and committed file with changed flag should appear modified
489
489
490 $ hg co -C .
490 $ hg co -C .
491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
492 $ chmod +x file
492 $ chmod +x file
493 $ hg ci -m 'change flag'
493 $ hg ci -m 'change flag'
494 $ hg status -A --rev 1 --rev 2
494 $ hg status -A --rev 1 --rev 2
495 M file
495 M file
496 $ hg diff -r 1 -r 2
496 $ hg diff -r 1 -r 2
497
497
498 #endif
498 #endif
499
499
500 $ cd ..
500 $ cd ..
501
501
502 hg status of binary file starting with '\1\n', a separator for metadata:
502 hg status of binary file starting with '\1\n', a separator for metadata:
503
503
504 $ hg init repo5
504 $ hg init repo5
505 $ cd repo5
505 $ cd repo5
506 >>> open("010a", r"wb").write(b"\1\nfoo") and None
506 >>> open("010a", r"wb").write(b"\1\nfoo") and None
507 $ hg ci -q -A -m 'initial checkin'
507 $ hg ci -q -A -m 'initial checkin'
508 $ hg status -A
508 $ hg status -A
509 C 010a
509 C 010a
510
510
511 >>> open("010a", r"wb").write(b"\1\nbar") and None
511 >>> open("010a", r"wb").write(b"\1\nbar") and None
512 $ hg status -A
512 $ hg status -A
513 M 010a
513 M 010a
514 $ hg ci -q -m 'modify 010a'
514 $ hg ci -q -m 'modify 010a'
515 $ hg status -A --rev 0:1
515 $ hg status -A --rev 0:1
516 M 010a
516 M 010a
517
517
518 $ touch empty
518 $ touch empty
519 $ hg ci -q -A -m 'add another file'
519 $ hg ci -q -A -m 'add another file'
520 $ hg status -A --rev 1:2 010a
520 $ hg status -A --rev 1:2 010a
521 C 010a
521 C 010a
522
522
523 $ cd ..
523 $ cd ..
524
524
525 test "hg status" with "directory pattern" which matches against files
525 test "hg status" with "directory pattern" which matches against files
526 only known on target revision.
526 only known on target revision.
527
527
528 $ hg init repo6
528 $ hg init repo6
529 $ cd repo6
529 $ cd repo6
530
530
531 $ echo a > a.txt
531 $ echo a > a.txt
532 $ hg add a.txt
532 $ hg add a.txt
533 $ hg commit -m '#0'
533 $ hg commit -m '#0'
534 $ mkdir -p 1/2/3/4/5
534 $ mkdir -p 1/2/3/4/5
535 $ echo b > 1/2/3/4/5/b.txt
535 $ echo b > 1/2/3/4/5/b.txt
536 $ hg add 1/2/3/4/5/b.txt
536 $ hg add 1/2/3/4/5/b.txt
537 $ hg commit -m '#1'
537 $ hg commit -m '#1'
538
538
539 $ hg update -C 0 > /dev/null
539 $ hg update -C 0 > /dev/null
540 $ hg status -A
540 $ hg status -A
541 C a.txt
541 C a.txt
542
542
543 the directory matching against specified pattern should be removed,
543 the directory matching against specified pattern should be removed,
544 because directory existence prevents 'dirstate.walk()' from showing
544 because directory existence prevents 'dirstate.walk()' from showing
545 warning message about such pattern.
545 warning message about such pattern.
546
546
547 $ test ! -d 1
547 $ test ! -d 1
548 $ hg status -A --rev 1 1/2/3/4/5/b.txt
548 $ hg status -A --rev 1 1/2/3/4/5/b.txt
549 R 1/2/3/4/5/b.txt
549 R 1/2/3/4/5/b.txt
550 $ hg status -A --rev 1 1/2/3/4/5
550 $ hg status -A --rev 1 1/2/3/4/5
551 R 1/2/3/4/5/b.txt
551 R 1/2/3/4/5/b.txt
552 $ hg status -A --rev 1 1/2/3
552 $ hg status -A --rev 1 1/2/3
553 R 1/2/3/4/5/b.txt
553 R 1/2/3/4/5/b.txt
554 $ hg status -A --rev 1 1
554 $ hg status -A --rev 1 1
555 R 1/2/3/4/5/b.txt
555 R 1/2/3/4/5/b.txt
556
556
557 $ hg status --config ui.formatdebug=True --rev 1 1
557 $ hg status --config ui.formatdebug=True --rev 1 1
558 status = [
558 status = [
559 {
559 {
560 'path': '1/2/3/4/5/b.txt',
560 'path': '1/2/3/4/5/b.txt',
561 'status': 'R'
561 'status': 'R'
562 },
562 },
563 ]
563 ]
564
564
565 #if windows
565 #if windows
566 $ hg --config ui.slash=false status -A --rev 1 1
566 $ hg --config ui.slash=false status -A --rev 1 1
567 R 1\2\3\4\5\b.txt
567 R 1\2\3\4\5\b.txt
568 #endif
568 #endif
569
569
570 $ cd ..
570 $ cd ..
571
571
572 Status after move overwriting a file (issue4458)
572 Status after move overwriting a file (issue4458)
573 =================================================
573 =================================================
574
574
575
575
576 $ hg init issue4458
576 $ hg init issue4458
577 $ cd issue4458
577 $ cd issue4458
578 $ echo a > a
578 $ echo a > a
579 $ echo b > b
579 $ echo b > b
580 $ hg commit -Am base
580 $ hg commit -Am base
581 adding a
581 adding a
582 adding b
582 adding b
583
583
584
584
585 with --force
585 with --force
586
586
587 $ hg mv b --force a
587 $ hg mv b --force a
588 $ hg st --copies
588 $ hg st --copies
589 M a
589 M a
590 b
590 b
591 R b
591 R b
592 $ hg revert --all
592 $ hg revert --all
593 reverting a
593 reverting a
594 undeleting b
594 undeleting b
595 $ rm *.orig
595 $ rm *.orig
596
596
597 without force
597 without force
598
598
599 $ hg rm a
599 $ hg rm a
600 $ hg st --copies
600 $ hg st --copies
601 R a
601 R a
602 $ hg mv b a
602 $ hg mv b a
603 $ hg st --copies
603 $ hg st --copies
604 M a
604 M a
605 b
605 b
606 R b
606 R b
607
607
608 using ui.statuscopies setting
608 using ui.statuscopies setting
609 $ hg st --config ui.statuscopies=true
609 $ hg st --config ui.statuscopies=true
610 M a
610 M a
611 b
611 b
612 R b
612 R b
613 $ hg st --config ui.statuscopies=false
613 $ hg st --config ui.statuscopies=false
614 M a
614 M a
615 R b
615 R b
616 $ hg st --config ui.tweakdefaults=yes
616 $ hg st --config ui.tweakdefaults=yes
617 M a
617 M a
618 b
618 b
619 R b
619 R b
620
620
621 using log status template (issue5155)
621 using log status template (issue5155)
622 $ hg log -Tstatus -r 'wdir()' -C
622 $ hg log -Tstatus -r 'wdir()' -C
623 changeset: 2147483647:ffffffffffff
623 changeset: 2147483647:ffffffffffff
624 parent: 0:8c55c58b4c0e
624 parent: 0:8c55c58b4c0e
625 user: test
625 user: test
626 date: * (glob)
626 date: * (glob)
627 files:
627 files:
628 M a
628 M a
629 b
629 b
630 R b
630 R b
631
631
632
632
633 Other "bug" highlight, the revision status does not report the copy information.
633 Other "bug" highlight, the revision status does not report the copy information.
634 This is buggy behavior.
634 This is buggy behavior.
635
635
636 $ hg commit -m 'blah'
636 $ hg commit -m 'blah'
637 $ hg st --copies --change .
637 $ hg st --copies --change .
638 M a
638 M a
639 R b
639 R b
640
640
641 using log status template, the copy information is displayed correctly.
641 using log status template, the copy information is displayed correctly.
642 $ hg log -Tstatus -r. -C
642 $ hg log -Tstatus -r. -C
643 changeset: 1:6685fde43d21
643 changeset: 1:6685fde43d21
644 tag: tip
644 tag: tip
645 user: test
645 user: test
646 date: * (glob)
646 date: * (glob)
647 summary: blah
647 summary: blah
648 files:
648 files:
649 M a
649 M a
650 b
650 b
651 R b
651 R b
652
652
653
653
654 $ cd ..
654 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now