Clarify help for hg status and make it consistent.
--- a/mercurial/commands.py Fri Feb 01 13:31:46 2008 -0800
+++ b/mercurial/commands.py Sat Feb 02 14:49:31 2008 +0100
@@ -2441,8 +2441,10 @@
"""show changed files in the working directory
Show status of files in the repository. If names are given, only
- files that match are shown. Files that are clean or ignored, are
- not listed unless -c (clean), -i (ignored) or -A is given.
+ files that match are shown. Files that are clean or ignored or
+ source of a copy/move operation, are not listed unless -c (clean),
+ -i (ignored), -C (copies) or -A is given. Unless options described
+ with "show only ..." are given, the options -mardu are used.
NOTE: status may appear to disagree with diff if permissions have
changed or a merge has occurred. The standard diff format does not
@@ -2459,7 +2461,7 @@
C = clean
! = deleted, but still tracked
? = not tracked
- I = ignored (not shown by default)
+ I = ignored
= the previous added file was copied from here
"""
--- a/tests/test-help.out Fri Feb 01 13:31:46 2008 -0800
+++ b/tests/test-help.out Sat Feb 02 14:49:31 2008 +0100
@@ -216,8 +216,10 @@
show changed files in the working directory
Show status of files in the repository. If names are given, only
- files that match are shown. Files that are clean or ignored, are
- not listed unless -c (clean), -i (ignored) or -A is given.
+ files that match are shown. Files that are clean or ignored or
+ source of a copy/move operation, are not listed unless -c (clean),
+ -i (ignored), -C (copies) or -A is given. Unless options described
+ with "show only ..." are given, the options -mardu are used.
NOTE: status may appear to disagree with diff if permissions have
changed or a merge has occurred. The standard diff format does not
@@ -234,7 +236,7 @@
C = clean
! = deleted, but still tracked
? = not tracked
- I = ignored (not shown by default)
+ I = ignored
= the previous added file was copied from here
options: