comparison mercurial/commands.py @ 5998:5d91f6e6f841

Clarify help for hg status and make it consistent.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 02 Feb 2008 14:49:31 +0100
parents a445388aa554
children d1fe1a4eb2b7
comparison
equal deleted inserted replaced
5997:637d4c089834 5998:5d91f6e6f841
2439 2439
2440 def status(ui, repo, *pats, **opts): 2440 def status(ui, repo, *pats, **opts):
2441 """show changed files in the working directory 2441 """show changed files in the working directory
2442 2442
2443 Show status of files in the repository. If names are given, only 2443 Show status of files in the repository. If names are given, only
2444 files that match are shown. Files that are clean or ignored, are 2444 files that match are shown. Files that are clean or ignored or
2445 not listed unless -c (clean), -i (ignored) or -A is given. 2445 source of a copy/move operation, are not listed unless -c (clean),
2446 -i (ignored), -C (copies) or -A is given. Unless options described
2447 with "show only ..." are given, the options -mardu are used.
2446 2448
2447 NOTE: status may appear to disagree with diff if permissions have 2449 NOTE: status may appear to disagree with diff if permissions have
2448 changed or a merge has occurred. The standard diff format does not 2450 changed or a merge has occurred. The standard diff format does not
2449 report permission changes and diff only reports changes relative 2451 report permission changes and diff only reports changes relative
2450 to one merge parent. 2452 to one merge parent.
2457 A = added 2459 A = added
2458 R = removed 2460 R = removed
2459 C = clean 2461 C = clean
2460 ! = deleted, but still tracked 2462 ! = deleted, but still tracked
2461 ? = not tracked 2463 ? = not tracked
2462 I = ignored (not shown by default) 2464 I = ignored
2463 = the previous added file was copied from here 2465 = the previous added file was copied from here
2464 """ 2466 """
2465 2467
2466 all = opts['all'] 2468 all = opts['all']
2467 node1, node2 = cmdutil.revpair(repo, opts.get('rev')) 2469 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))