"C" status code considered harmful, so changed to "=" (issue899)

C means conflict in other SCMs, and = is more intuitive anyway.

mercurial/commands.py

@@ -2363,7 +2363,7 b' def status(ui, repo, *pats, **opts):'
     M = modified
     A = added
     R = removed
-    C = clean
+    = = clean
     ! = deleted, but still tracked
     ? = not tracked
     I = ignored (not shown by default)
@@ -2388,7 +2388,7 b' def status(ui, repo, *pats, **opts):'
                    ('unknown', '?', unknown),
                    ('ignored', 'I', ignored))
 
-    explicit_changetypes = changetypes + (('clean', 'C', clean),)
+    explicit_changetypes = changetypes + (('clean', '=', clean),)
 
     end = opts['print0'] and '\0' or '\n'
 

tests/test-586.out

@@ -10,4 +10,4 b' added 1 changesets with 1 changes to 1 f'
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-C b
+= b

tests/test-alias.out

@@ -7,4 +7,4 b''
 *** [alias] recursive: circular dependency on recursive
 adding foo
 % with opts
-C foo
+= foo

tests/test-copy2.out

@@ -12,7 +12,7 b' A bar'
 bar has not been committed yet, so no copy data will be stored for foo.
 A foo
 # dry-run; should show that foo is clean
-C foo
+= foo
 # should show copy
 A bar
   foo
@@ -41,7 +41,7 b' bar renamed from foo:dd12c926cf165e3eb4c'
 A baz
   bar
 # foo was clean:
-C foo
+= foo
 # but it's considered modified after a copy --after --force
 M foo
   bar

tests/test-help.out

@@ -227,7 +227,7 b' show changed files in the working direct'
     M = modified
     A = added
     R = removed
-    C = clean
+    = = clean
     ! = deleted, but still tracked
     ? = not tracked
     I = ignored (not shown by default)

tests/test-issue660.out

@@ -32,8 +32,8 b' A b'
 R a
 R b/b
 % commit
-C a/a
-C b
+= a/a
+= b
 % long directory replaced with file
 adding d/d/d
 % should fail - would corrupt dirstate
@@ -42,8 +42,8 b" abort: directory 'd' already in dirstate"
 % should succeed - shadow removed
 % update should work at least with clean workdir
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-C a
-C b/b
+= a
+= b/b
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-C a/a
-C b
+= a/a
+= b

tests/test-merge-prompt.out

@@ -7,7 +7,7 b' 1 files updated, 0 files merged, 0 files'
 (branch merge, don't forget to commit)
 status:
 M file2
-C file1
+= file1
 file1:
 1
 changed
@@ -23,7 +23,7 b' use (c)hanged version or leave (d)eleted'
 (branch merge, don't forget to commit)
 status:
 file2: No such file or directory
-C file1
+= file1
 file1:
 1
 changed
@@ -57,7 +57,7 b' use (c)hanged version or leave (d)eleted'
 failed
 status:
 file2: No such file or directory
-C file1
+= file1
 file1:
 1
 changed

tests/test-mq-qpush-fail.out

@@ -16,4 +16,4 b' summary: add foo'
 % bar should be gone; other unknown/ignored files should still be around
 ? untracked-file
 I .hgignore
-C foo
+= foo

tests/test-mq.out

@@ -369,7 +369,7 b' new file mode 100644'
 +bar
 3 barney (foo)
 % refresh omitting an added file
-C newfile
+= newfile
 A newfile
 Now at: bar
 % create a git patch

tests/test-rebuildstate.out

@@ -7,11 +7,11 b' r 0 0 bar'
 % status
 A baz
 R bar
-C foo
+= foo
 % state dump
 n 666         -1 bar
 n 666         -1 foo
 % status
 ! bar
 ? baz
-C foo
+= foo

tests/test-rename-merge1.out

@@ -32,7 +32,7 b' M b'
   a
 M b2
 R a
-C c2
+= c2
 blahblah
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      67      0       1 dc51707dfc98 000000000000 000000000000

tests/test-rename-merge2.out

@@ -22,7 +22,7 b' 0 files updated, 2 files merged, 0 files'
 --------------
 M b
   a
-C a
+= a
 --------------
 
 --------------
@@ -126,7 +126,7 b' 1 files updated, 1 files merged, 0 files'
 (branch merge, don't forget to commit)
 --------------
 M b
-C a
+= a
 --------------
 
 --------------
@@ -147,8 +147,8 b' my rev@ac809aeed39a+ other rev@97c705ade'
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
-C a
-C b
+= a
+= b
 --------------
 
 --------------
@@ -194,7 +194,7 b' my rev@ecf3cb2a4219+ other rev@97c705ade'
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
-C b
+= b
 --------------
 
 --------------
@@ -244,7 +244,7 b' 1 files updated, 1 files merged, 0 files'
 (branch merge, don't forget to commit)
 --------------
 M c
-C b
+= b
 --------------
 
 --------------
@@ -264,7 +264,7 b' 0 files updated, 2 files merged, 0 files'
 (branch merge, don't forget to commit)
 --------------
 M b
-C a
+= a
 --------------
 
 --------------
@@ -370,7 +370,7 b' 0 files updated, 2 files merged, 0 files'
 (branch merge, don't forget to commit)
 --------------
 M b
-C a
+= a
 --------------
 
 --------------
@@ -412,7 +412,7 b' 0 files updated, 2 files merged, 0 files'
 (branch merge, don't forget to commit)
 --------------
 M b
-C a
+= a
 --------------
 
 --------------

tests/test-status.out

@@ -116,5 +116,5 b' R removed'
 ! deleted
 ? unknown
 I ignored
-C .hgignore
-C modified
+= .hgignore
+= modified