Backed out changeset
c2a21fe60994
Unfortunately, this breaks backward compatibility.
--- a/mercurial/commands.py Sun Dec 30 17:45:26 2007 +0100
+++ b/mercurial/commands.py Mon Dec 31 17:47:02 2007 -0600
@@ -2363,7 +2363,7 @@
M = modified
A = added
R = removed
- = = clean
+ C = clean
! = deleted, but still tracked
? = not tracked
I = ignored (not shown by default)
@@ -2388,7 +2388,7 @@
('unknown', '?', unknown),
('ignored', 'I', ignored))
- explicit_changetypes = changetypes + (('clean', '=', clean),)
+ explicit_changetypes = changetypes + (('clean', 'C', clean),)
end = opts['print0'] and '\0' or '\n'
--- a/tests/test-586.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-586.out Mon Dec 31 17:47:02 2007 -0600
@@ -10,4 +10,4 @@
(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)
-= b
+C b
--- a/tests/test-alias.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-alias.out Mon Dec 31 17:47:02 2007 -0600
@@ -7,4 +7,4 @@
*** [alias] recursive: circular dependency on recursive
adding foo
% with opts
-= foo
+C foo
--- a/tests/test-copy2.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-copy2.out Mon Dec 31 17:47:02 2007 -0600
@@ -12,7 +12,7 @@
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
-= foo
+C foo
# should show copy
A bar
foo
@@ -41,7 +41,7 @@
A baz
bar
# foo was clean:
-= foo
+C foo
# but it's considered modified after a copy --after --force
M foo
bar
--- a/tests/test-help.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-help.out Mon Dec 31 17:47:02 2007 -0600
@@ -227,7 +227,7 @@
M = modified
A = added
R = removed
- = = clean
+ C = clean
! = deleted, but still tracked
? = not tracked
I = ignored (not shown by default)
--- a/tests/test-issue660.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-issue660.out Mon Dec 31 17:47:02 2007 -0600
@@ -32,8 +32,8 @@
R a
R b/b
% commit
-= a/a
-= b
+C a/a
+C b
% long directory replaced with file
adding d/d/d
% should fail - would corrupt dirstate
@@ -42,8 +42,8 @@
% should succeed - shadow removed
% update should work at least with clean workdir
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-= a
-= b/b
+C a
+C b/b
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-= a/a
-= b
+C a/a
+C b
--- a/tests/test-merge-prompt.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-merge-prompt.out Mon Dec 31 17:47:02 2007 -0600
@@ -7,7 +7,7 @@
(branch merge, don't forget to commit)
status:
M file2
-= file1
+C file1
file1:
1
changed
@@ -23,7 +23,7 @@
(branch merge, don't forget to commit)
status:
file2: No such file or directory
-= file1
+C file1
file1:
1
changed
@@ -57,7 +57,7 @@
failed
status:
file2: No such file or directory
-= file1
+C file1
file1:
1
changed
--- a/tests/test-mq-qpush-fail.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-mq-qpush-fail.out Mon Dec 31 17:47:02 2007 -0600
@@ -16,4 +16,4 @@
% bar should be gone; other unknown/ignored files should still be around
? untracked-file
I .hgignore
-= foo
+C foo
--- a/tests/test-mq.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-mq.out Mon Dec 31 17:47:02 2007 -0600
@@ -369,7 +369,7 @@
+bar
3 barney (foo)
% refresh omitting an added file
-= newfile
+C newfile
A newfile
Now at: bar
% create a git patch
--- a/tests/test-rebuildstate.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-rebuildstate.out Mon Dec 31 17:47:02 2007 -0600
@@ -7,11 +7,11 @@
% status
A baz
R bar
-= foo
+C foo
% state dump
n 666 -1 bar
n 666 -1 foo
% status
! bar
? baz
-= foo
+C foo
--- a/tests/test-rename-merge1.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-rename-merge1.out Mon Dec 31 17:47:02 2007 -0600
@@ -32,7 +32,7 @@
a
M b2
R a
-= c2
+C c2
blahblah
rev offset length base linkrev nodeid p1 p2
0 0 67 0 1 dc51707dfc98 000000000000 000000000000
--- a/tests/test-rename-merge2.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-rename-merge2.out Mon Dec 31 17:47:02 2007 -0600
@@ -22,7 +22,7 @@
--------------
M b
a
-= a
+C a
--------------
--------------
@@ -126,7 +126,7 @@
(branch merge, don't forget to commit)
--------------
M b
-= a
+C a
--------------
--------------
@@ -147,8 +147,8 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
-= a
-= b
+C a
+C b
--------------
--------------
@@ -194,7 +194,7 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
-= b
+C b
--------------
--------------
@@ -244,7 +244,7 @@
(branch merge, don't forget to commit)
--------------
M c
-= b
+C b
--------------
--------------
@@ -264,7 +264,7 @@
(branch merge, don't forget to commit)
--------------
M b
-= a
+C a
--------------
--------------
@@ -370,7 +370,7 @@
(branch merge, don't forget to commit)
--------------
M b
-= a
+C a
--------------
--------------
@@ -412,7 +412,7 @@
(branch merge, don't forget to commit)
--------------
M b
-= a
+C a
--------------
--------------
--- a/tests/test-status.out Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-status.out Mon Dec 31 17:47:02 2007 -0600
@@ -116,5 +116,5 @@
! deleted
? unknown
I ignored
-= .hgignore
-= modified
+C .hgignore
+C modified