##// END OF EJS Templates
"C" status code considered harmful, so changed to "=" (issue899)...
Thomas Arendsen Hein -
r5762:c2a21fe6 default
parent child Browse files
Show More
@@ -2363,7 +2363,7 b' def status(ui, repo, *pats, **opts):'
2363 M = modified
2363 M = modified
2364 A = added
2364 A = added
2365 R = removed
2365 R = removed
2366 C = clean
2366 = = clean
2367 ! = deleted, but still tracked
2367 ! = deleted, but still tracked
2368 ? = not tracked
2368 ? = not tracked
2369 I = ignored (not shown by default)
2369 I = ignored (not shown by default)
@@ -2388,7 +2388,7 b' def status(ui, repo, *pats, **opts):'
2388 ('unknown', '?', unknown),
2388 ('unknown', '?', unknown),
2389 ('ignored', 'I', ignored))
2389 ('ignored', 'I', ignored))
2390
2390
2391 explicit_changetypes = changetypes + (('clean', 'C', clean),)
2391 explicit_changetypes = changetypes + (('clean', '=', clean),)
2392
2392
2393 end = opts['print0'] and '\0' or '\n'
2393 end = opts['print0'] and '\0' or '\n'
2394
2394
@@ -10,4 +10,4 b' added 1 changesets with 1 changes to 1 f'
10 (run 'hg heads' to see heads, 'hg merge' to merge)
10 (run 'hg heads' to see heads, 'hg merge' to merge)
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit)
12 (branch merge, don't forget to commit)
13 C b
13 = b
@@ -7,4 +7,4 b''
7 *** [alias] recursive: circular dependency on recursive
7 *** [alias] recursive: circular dependency on recursive
8 adding foo
8 adding foo
9 % with opts
9 % with opts
10 C foo
10 = foo
@@ -12,7 +12,7 b' A bar'
12 bar has not been committed yet, so no copy data will be stored for foo.
12 bar has not been committed yet, so no copy data will be stored for foo.
13 A foo
13 A foo
14 # dry-run; should show that foo is clean
14 # dry-run; should show that foo is clean
15 C foo
15 = foo
16 # should show copy
16 # should show copy
17 A bar
17 A bar
18 foo
18 foo
@@ -41,7 +41,7 b' bar renamed from foo:dd12c926cf165e3eb4c'
41 A baz
41 A baz
42 bar
42 bar
43 # foo was clean:
43 # foo was clean:
44 C foo
44 = foo
45 # but it's considered modified after a copy --after --force
45 # but it's considered modified after a copy --after --force
46 M foo
46 M foo
47 bar
47 bar
@@ -227,7 +227,7 b' show changed files in the working direct'
227 M = modified
227 M = modified
228 A = added
228 A = added
229 R = removed
229 R = removed
230 C = clean
230 = = clean
231 ! = deleted, but still tracked
231 ! = deleted, but still tracked
232 ? = not tracked
232 ? = not tracked
233 I = ignored (not shown by default)
233 I = ignored (not shown by default)
@@ -32,8 +32,8 b' A b'
32 R a
32 R a
33 R b/b
33 R b/b
34 % commit
34 % commit
35 C a/a
35 = a/a
36 C b
36 = b
37 % long directory replaced with file
37 % long directory replaced with file
38 adding d/d/d
38 adding d/d/d
39 % should fail - would corrupt dirstate
39 % should fail - would corrupt dirstate
@@ -42,8 +42,8 b" abort: directory 'd' already in dirstate"
42 % should succeed - shadow removed
42 % should succeed - shadow removed
43 % update should work at least with clean workdir
43 % update should work at least with clean workdir
44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
45 C a
45 = a
46 C b/b
46 = b/b
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
48 C a/a
48 = a/a
49 C b
49 = b
@@ -7,7 +7,7 b' 1 files updated, 0 files merged, 0 files'
7 (branch merge, don't forget to commit)
7 (branch merge, don't forget to commit)
8 status:
8 status:
9 M file2
9 M file2
10 C file1
10 = file1
11 file1:
11 file1:
12 1
12 1
13 changed
13 changed
@@ -23,7 +23,7 b' use (c)hanged version or leave (d)eleted'
23 (branch merge, don't forget to commit)
23 (branch merge, don't forget to commit)
24 status:
24 status:
25 file2: No such file or directory
25 file2: No such file or directory
26 C file1
26 = file1
27 file1:
27 file1:
28 1
28 1
29 changed
29 changed
@@ -57,7 +57,7 b' use (c)hanged version or leave (d)eleted'
57 failed
57 failed
58 status:
58 status:
59 file2: No such file or directory
59 file2: No such file or directory
60 C file1
60 = file1
61 file1:
61 file1:
62 1
62 1
63 changed
63 changed
@@ -16,4 +16,4 b' summary: add foo'
16 % bar should be gone; other unknown/ignored files should still be around
16 % bar should be gone; other unknown/ignored files should still be around
17 ? untracked-file
17 ? untracked-file
18 I .hgignore
18 I .hgignore
19 C foo
19 = foo
@@ -369,7 +369,7 b' new file mode 100644'
369 +bar
369 +bar
370 3 barney (foo)
370 3 barney (foo)
371 % refresh omitting an added file
371 % refresh omitting an added file
372 C newfile
372 = newfile
373 A newfile
373 A newfile
374 Now at: bar
374 Now at: bar
375 % create a git patch
375 % create a git patch
@@ -7,11 +7,11 b' r 0 0 bar'
7 % status
7 % status
8 A baz
8 A baz
9 R bar
9 R bar
10 C foo
10 = foo
11 % state dump
11 % state dump
12 n 666 -1 bar
12 n 666 -1 bar
13 n 666 -1 foo
13 n 666 -1 foo
14 % status
14 % status
15 ! bar
15 ! bar
16 ? baz
16 ? baz
17 C foo
17 = foo
@@ -32,7 +32,7 b' M b'
32 a
32 a
33 M b2
33 M b2
34 R a
34 R a
35 C c2
35 = c2
36 blahblah
36 blahblah
37 rev offset length base linkrev nodeid p1 p2
37 rev offset length base linkrev nodeid p1 p2
38 0 0 67 0 1 dc51707dfc98 000000000000 000000000000
38 0 0 67 0 1 dc51707dfc98 000000000000 000000000000
@@ -22,7 +22,7 b' 0 files updated, 2 files merged, 0 files'
22 --------------
22 --------------
23 M b
23 M b
24 a
24 a
25 C a
25 = a
26 --------------
26 --------------
27
27
28 --------------
28 --------------
@@ -126,7 +126,7 b' 1 files updated, 1 files merged, 0 files'
126 (branch merge, don't forget to commit)
126 (branch merge, don't forget to commit)
127 --------------
127 --------------
128 M b
128 M b
129 C a
129 = a
130 --------------
130 --------------
131
131
132 --------------
132 --------------
@@ -147,8 +147,8 b' my rev@ac809aeed39a+ other rev@97c705ade'
147 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
147 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
148 (branch merge, don't forget to commit)
148 (branch merge, don't forget to commit)
149 --------------
149 --------------
150 C a
150 = a
151 C b
151 = b
152 --------------
152 --------------
153
153
154 --------------
154 --------------
@@ -194,7 +194,7 b' my rev@ecf3cb2a4219+ other rev@97c705ade'
194 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
194 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
195 (branch merge, don't forget to commit)
195 (branch merge, don't forget to commit)
196 --------------
196 --------------
197 C b
197 = b
198 --------------
198 --------------
199
199
200 --------------
200 --------------
@@ -244,7 +244,7 b' 1 files updated, 1 files merged, 0 files'
244 (branch merge, don't forget to commit)
244 (branch merge, don't forget to commit)
245 --------------
245 --------------
246 M c
246 M c
247 C b
247 = b
248 --------------
248 --------------
249
249
250 --------------
250 --------------
@@ -264,7 +264,7 b' 0 files updated, 2 files merged, 0 files'
264 (branch merge, don't forget to commit)
264 (branch merge, don't forget to commit)
265 --------------
265 --------------
266 M b
266 M b
267 C a
267 = a
268 --------------
268 --------------
269
269
270 --------------
270 --------------
@@ -370,7 +370,7 b' 0 files updated, 2 files merged, 0 files'
370 (branch merge, don't forget to commit)
370 (branch merge, don't forget to commit)
371 --------------
371 --------------
372 M b
372 M b
373 C a
373 = a
374 --------------
374 --------------
375
375
376 --------------
376 --------------
@@ -412,7 +412,7 b' 0 files updated, 2 files merged, 0 files'
412 (branch merge, don't forget to commit)
412 (branch merge, don't forget to commit)
413 --------------
413 --------------
414 M b
414 M b
415 C a
415 = a
416 --------------
416 --------------
417
417
418 --------------
418 --------------
@@ -116,5 +116,5 b' R removed'
116 ! deleted
116 ! deleted
117 ? unknown
117 ? unknown
118 I ignored
118 I ignored
119 C .hgignore
119 = .hgignore
120 C modified
120 = modified
General Comments 0
You need to be logged in to leave comments. Login now