annotate tests/test-help.out @ 9051:f8e25885d975

commands: wrapped docstrings at 78 characters We have always had a left margin of 4 characters -- probably just because that's how docstrings for top-level functions turn out by default, but it also looks nice in the built-in help. The docstrings were wrapped at 70 characters, which is the default for Emacs. However, this gives a right margin of 10 characters in a standard 80 character terminal. I've now wrapped the relevant docstrings at 78 characters, effectively killing the right margin. The asymmetric margins looked a bit odd and some of the text looked cramped with a right margin, so Dirkjan and I felt that it was best to remove it entirely. The two character gap was kept to have some space between the border of the terminal -- it will also make diffs involving the docstrings fit in a 80 character line.
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:54:30 +0200
parents b9a8b616521d
children 9261667e9b82
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
1 Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
2
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
3 basic commands:
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
4
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
5 add add the specified files on the next commit
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
6 annotate show changeset information by line for each file
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
7 clone make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
8 commit commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
9 diff diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
10 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
11 forget forget the specified files on the next commit
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
12 init create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
13 log show revision history of entire repository or files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
14 merge merge working directory with another revision
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
15 parents show the parents of the working directory or revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
16 pull pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
17 push push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
18 remove remove the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
19 serve export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
20 status show changed files in the working directory
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
21 update update working directory
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
22
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
23 use "hg help" for the full list of commands or "hg -v" for details
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
24 add add the specified files on the next commit
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
25 annotate show changeset information by line for each file
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
26 clone make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
27 commit commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
28 diff diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
29 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
30 forget forget the specified files on the next commit
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
31 init create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
32 log show revision history of entire repository or files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
33 merge merge working directory with another revision
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
34 parents show the parents of the working directory or revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
35 pull pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
36 push push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
37 remove remove the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
38 serve export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
39 status show changed files in the working directory
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
40 update update working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
41 Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
42
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
43 list of commands:
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
44
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
45 add add the specified files on the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
46 addremove add all new files, delete all missing files
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
47 annotate show changeset information by line for each file
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
48 archive create an unversioned archive of a repository revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
49 backout reverse effect of earlier changeset
5775
2dd202a6e15b bisect: make bisect a built-in command
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
50 bisect subdivision search of changesets
3502
8dc14d630b29 add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents: 3468
diff changeset
51 branch set or show the current branch name
8dc14d630b29 add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents: 3468
diff changeset
52 branches list repository named branches
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
53 bundle create a changegroup file
3914
283ee8971570 doc string fix: hg cat and manifest default to current parent revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3885
diff changeset
54 cat output the current or given revision of files
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
55 clone make a copy of an existing repository
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
56 commit commit the specified files or all outstanding changes
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
57 copy mark files as copied for the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
58 diff diff repository (or selected files)
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
59 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
60 forget forget the specified files on the next commit
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
61 grep search for a pattern in specified files and revisions
4655
120626e06409 update the output of test-help and test-globalopts
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4315
diff changeset
62 heads show current repository heads or show branch heads
7210
833d1250ce00 help: update help
Matt Mackall <mpm@selenic.com>
parents: 7197
diff changeset
63 help show help for a given topic or a help overview
4665
091c9e54d306 identify: accept a revision argument
Matt Mackall <mpm@selenic.com>
parents: 4655
diff changeset
64 identify identify the working copy or specified revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
65 import import an ordered set of patches
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
66 incoming show new changesets found in source
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
67 init create a new repository in the given directory
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
68 locate locate files matching specific patterns
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
69 log show revision history of entire repository or files
3914
283ee8971570 doc string fix: hg cat and manifest default to current parent revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3885
diff changeset
70 manifest output the current or given revision of the project manifest
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
71 merge merge working directory with another revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
72 outgoing show changesets not found in destination
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
73 parents show the parents of the working directory or revision
7707
64fd7f6d3b40 fix up tests for paths and urls help
Matt Mackall <mpm@selenic.com>
parents: 7679
diff changeset
74 paths show aliases for remote repositories
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
75 pull pull changes from the specified source
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
76 push push changes to the specified destination
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
77 recover roll back an interrupted transaction
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
78 remove remove the specified files on the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
79 rename rename files; equivalent of copy + remove
7530
3773e510d433 resolve: clarify and simplify help
Matt Mackall <mpm@selenic.com>
parents: 7387
diff changeset
80 resolve retry file merges from a merge or update
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
81 revert restore individual files or directories to an earlier state
5576
1c1ef561d541 doc: add repo/ to .hgignore and .hgtags
Matt Mackall <mpm@selenic.com>
parents: 4699
diff changeset
82 rollback roll back the last transaction
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
83 root print the root (top) of the current working directory
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
84 serve export the repository via HTTP
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
85 showconfig show combined config settings from all hgrc files
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
86 status show changed files in the working directory
6321
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 6201
diff changeset
87 tag add one or more tags for the current or given revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
88 tags list repository tags
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
89 tip show the tip revision
4699
a6b62584d0b2 unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 4665
diff changeset
90 unbundle apply one or more changegroup files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
91 update update working directory
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
92 verify verify the integrity of the repository
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
93 version output version and copyright information
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
94
7210
833d1250ce00 help: update help
Matt Mackall <mpm@selenic.com>
parents: 7197
diff changeset
95 additional help topics:
7197
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
96
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
97 dates Date Formats
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
98 patterns File Name Patterns
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
99 environment Environment Variables
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
100 revisions Specifying Single Revisions
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
101 multirevs Specifying Multiple Revisions
7387
7e9a15fa6c8f update help on git diffs
Matt Mackall <mpm@selenic.com>
parents: 7330
diff changeset
102 diffs Diff Formats
7679
eb98218db768 tests: fix up tests to cope with 6a0bc2dc9da6
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7628
diff changeset
103 templating Template Usage
7979
6b04f12d2831 commands, help: consistently write 'URL' in upper-case
Martin Geisler <mg@daimi.au.dk>
parents: 7974
diff changeset
104 urls URL Paths
8863
7b19c3c0172b help: adding a new help topic about extensions
Cédric Duval <cedricduval@free.fr>
parents: 8779
diff changeset
105 extensions Using additional features
7197
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
106
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
107 use "hg -v help" to show aliases and global options
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
108 add add the specified files on the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
109 addremove add all new files, delete all missing files
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
110 annotate show changeset information by line for each file
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
111 archive create an unversioned archive of a repository revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
112 backout reverse effect of earlier changeset
5775
2dd202a6e15b bisect: make bisect a built-in command
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
113 bisect subdivision search of changesets
3502
8dc14d630b29 add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents: 3468
diff changeset
114 branch set or show the current branch name
8dc14d630b29 add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents: 3468
diff changeset
115 branches list repository named branches
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
116 bundle create a changegroup file
3914
283ee8971570 doc string fix: hg cat and manifest default to current parent revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3885
diff changeset
117 cat output the current or given revision of files
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
118 clone make a copy of an existing repository
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
119 commit commit the specified files or all outstanding changes
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
120 copy mark files as copied for the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
121 diff diff repository (or selected files)
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
122 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
123 forget forget the specified files on the next commit
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
124 grep search for a pattern in specified files and revisions
4655
120626e06409 update the output of test-help and test-globalopts
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4315
diff changeset
125 heads show current repository heads or show branch heads
7210
833d1250ce00 help: update help
Matt Mackall <mpm@selenic.com>
parents: 7197
diff changeset
126 help show help for a given topic or a help overview
4665
091c9e54d306 identify: accept a revision argument
Matt Mackall <mpm@selenic.com>
parents: 4655
diff changeset
127 identify identify the working copy or specified revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
128 import import an ordered set of patches
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
129 incoming show new changesets found in source
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
130 init create a new repository in the given directory
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
131 locate locate files matching specific patterns
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
132 log show revision history of entire repository or files
3914
283ee8971570 doc string fix: hg cat and manifest default to current parent revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3885
diff changeset
133 manifest output the current or given revision of the project manifest
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
134 merge merge working directory with another revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
135 outgoing show changesets not found in destination
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
136 parents show the parents of the working directory or revision
7707
64fd7f6d3b40 fix up tests for paths and urls help
Matt Mackall <mpm@selenic.com>
parents: 7679
diff changeset
137 paths show aliases for remote repositories
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
138 pull pull changes from the specified source
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
139 push push changes to the specified destination
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
140 recover roll back an interrupted transaction
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
141 remove remove the specified files on the next commit
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
142 rename rename files; equivalent of copy + remove
7530
3773e510d433 resolve: clarify and simplify help
Matt Mackall <mpm@selenic.com>
parents: 7387
diff changeset
143 resolve retry file merges from a merge or update
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
144 revert restore individual files or directories to an earlier state
5576
1c1ef561d541 doc: add repo/ to .hgignore and .hgtags
Matt Mackall <mpm@selenic.com>
parents: 4699
diff changeset
145 rollback roll back the last transaction
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
146 root print the root (top) of the current working directory
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
147 serve export the repository via HTTP
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
148 showconfig show combined config settings from all hgrc files
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
149 status show changed files in the working directory
6321
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 6201
diff changeset
150 tag add one or more tags for the current or given revision
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
151 tags list repository tags
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
152 tip show the tip revision
4699
a6b62584d0b2 unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 4665
diff changeset
153 unbundle apply one or more changegroup files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
154 update update working directory
3268
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
155 verify verify the integrity of the repository
bb057b6ce3cf Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3200
diff changeset
156 version output version and copyright information
7197
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
157
7210
833d1250ce00 help: update help
Matt Mackall <mpm@selenic.com>
parents: 7197
diff changeset
158 additional help topics:
7197
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
159
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
160 dates Date Formats
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
161 patterns File Name Patterns
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
162 environment Environment Variables
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
163 revisions Specifying Single Revisions
f60730693efc help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6668
diff changeset
164 multirevs Specifying Multiple Revisions
7387
7e9a15fa6c8f update help on git diffs
Matt Mackall <mpm@selenic.com>
parents: 7330
diff changeset
165 diffs Diff Formats
7679
eb98218db768 tests: fix up tests to cope with 6a0bc2dc9da6
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7628
diff changeset
166 templating Template Usage
7979
6b04f12d2831 commands, help: consistently write 'URL' in upper-case
Martin Geisler <mg@daimi.au.dk>
parents: 7974
diff changeset
167 urls URL Paths
8863
7b19c3c0172b help: adding a new help topic about extensions
Cédric Duval <cedricduval@free.fr>
parents: 8779
diff changeset
168 extensions Using additional features
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
169 hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
170
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
171 add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
172
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
173 Schedule files to be version controlled and added to the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
174
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
175 The files will be added to the repository at the next commit. To undo an
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
176 add before that, see hg forget.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
177
7807
bd8f44638847 help: miscellaneous language fixes
timeless <timeless@gmail.com>
parents: 7707
diff changeset
178 If no names are given, add all files to the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
179
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
180 options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
181
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
182 -I --include include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
183 -X --exclude exclude names matching the given patterns
2418
99835097bca9 update test-help output after new options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2241
diff changeset
184 -n --dry-run do not perform actions, just print output
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
185
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
186 use "hg -v help add" to show global options
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
187 hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
188 hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
189
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
190 add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
191
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
192 Schedule files to be version controlled and added to the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
193
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
194 The files will be added to the repository at the next commit. To undo an
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
195 add before that, see hg forget.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
196
7807
bd8f44638847 help: miscellaneous language fixes
timeless <timeless@gmail.com>
parents: 7707
diff changeset
197 If no names are given, add all files to the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
198
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
199 options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
200
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
201 -I --include include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
202 -X --exclude exclude names matching the given patterns
2418
99835097bca9 update test-help output after new options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2241
diff changeset
203 -n --dry-run do not perform actions, just print output
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
204
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
205 use "hg -v help add" to show global options
3885
6081b4c68baf Corrected synopsis for many commands.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3829
diff changeset
206 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
207
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
208 diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
209
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
210 Show differences between revisions for the specified files.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
211
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
212 Differences between files are shown using the unified diff format.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
213
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
214 NOTE: diff may generate unexpected results for merges, as it will default
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
215 to comparing against the working directory's first parent changeset if no
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
216 revisions are specified.
3829
531c116b2028 Add doc notes about revert and hg status vs diff
Matt Mackall <mpm@selenic.com>
parents: 3502
diff changeset
217
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
218 When two revision arguments are given, then changes are shown between
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
219 those revisions. If only one revision is specified then that revision is
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
220 compared to the working directory, and, when no revisions are specified,
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
221 the working directory files are compared to its parent.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
222
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
223 Without the -a/--text option, diff will avoid generating diffs of files it
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
224 detects as binary. With -a, diff will generate a diff anyway, probably
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
225 with undesirable results.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
226
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
227 Use the -g/--git option to generate diffs in the git extended diff format.
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
228 For more information, read 'hg help diffs'.
7307
56380212d630 help: commands supporting --git point to the gitdiffs topic (issue1352)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7293
diff changeset
229
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
230 options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
231
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
232 -r --rev revision
7628
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents: 7530
diff changeset
233 -c --change change made by revision
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
234 -a --text treat all files as text
2907
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents: 2661
diff changeset
235 -g --git use git extended diff format
3200
367a009c2acb Remove single character equivalent of --nodates (was -D)
Stephen Darnell <stephen@darnell.plus.com>
parents: 3199
diff changeset
236 --nodates don't include dates in diff headers
6668
034f444902d9 mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents: 6518
diff changeset
237 -p --show-function show which function each change is in
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
238 -w --ignore-all-space ignore white space when comparing lines
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
239 -b --ignore-space-change ignore changes in the amount of white space
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
240 -B --ignore-blank-lines ignore changes whose lines are all blank
6467
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents: 6321
diff changeset
241 -U --unified number of lines of context to show
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
242 -I --include include names matching the given patterns
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
243 -X --exclude exclude names matching the given patterns
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
244
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
245 use "hg -v help diff" to show global options
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
246 hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
247
5783
28d9f8cd02f2 Move aliases section in help below synopsis (issue362)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5775
diff changeset
248 aliases: st
28d9f8cd02f2 Move aliases section in help below synopsis (issue362)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5775
diff changeset
249
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
250 show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
251
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
252 Show status of files in the repository. If names are given, only files
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
253 that match are shown. Files that are clean or ignored or the source of a
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
254 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
255 -C/--copies or -A/--all are given. Unless options described with "show
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
256 only ..." are given, the options -mardu are used.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
257
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
258 Option -q/--quiet hides untracked (unknown and ignored) files unless
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
259 explicitly requested with -u/--unknown or -i/--ignored.
6200
acc40572da5b 'hg status -q' output skips non-tracked files.
Zoran Bosnjak <zoran.bosnjak@via.si>
parents: 6042
diff changeset
260
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
261 NOTE: status may appear to disagree with diff if permissions have changed
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
262 or a merge has occurred. The standard diff format does not report
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
263 permission changes and diff only reports changes relative to one merge
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
264 parent.
3829
531c116b2028 Add doc notes about revert and hg status vs diff
Matt Mackall <mpm@selenic.com>
parents: 3502
diff changeset
265
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
266 If one revision is given, it is used as the base revision. If two
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8902
diff changeset
267 revisions are given, the differences between them are shown.
3468
5155fa27f514 Update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3268
diff changeset
268
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
269 The codes used to show the status of files are:
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
270 M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
271 A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
272 R = removed
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
273 C = clean
8040
545fb915fe16 commands: more informative description of "!" files in status
Martin Geisler <mg@lazybytes.net>
parents: 8033
diff changeset
274 ! = missing (deleted by non-hg command, but still tracked)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
275 ? = not tracked
5998
5d91f6e6f841 Clarify help for hg status and make it consistent.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5783
diff changeset
276 I = ignored
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
277 = origin of the previous file listed as A (added)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
278
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
279 options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
280
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
281 -A --all show status of all files
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
282 -m --modified show only modified files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
283 -a --added show only added files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
284 -r --removed show only removed files
1620
6c61646fee5e Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1568
diff changeset
285 -d --deleted show only deleted (but tracked) files
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
286 -c --clean show only files without changes
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
287 -u --unknown show only unknown (not tracked) files
4156
30857b5779f8 Fix help text for hg status -i
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4014
diff changeset
288 -i --ignored show only ignored files
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
289 -n --no-status hide status prefix
2640
02b6fa7bbfbf fix tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2580
diff changeset
290 -C --copies show source of copied files
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
291 -0 --print0 end filenames with NUL, for use with xargs
3468
5155fa27f514 Update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3268
diff changeset
292 --rev show difference from revision
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
293 -I --include include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
294 -X --exclude exclude names matching the given patterns
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
295
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
296 use "hg -v help status" to show global options
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
297 hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
298
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
299 show changed files in the working directory
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
300 hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
301 Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
302
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
303 basic commands:
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
304
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
305 add add the specified files on the next commit
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
306 annotate show changeset information by line for each file
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
307 clone make a copy of an existing repository
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
308 commit commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
309 diff diff repository (or selected files)
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
310 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
311 forget forget the specified files on the next commit
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
312 init create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
313 log show revision history of entire repository or files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
314 merge merge working directory with another revision
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
315 parents show the parents of the working directory or revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
316 pull pull changes from the specified source
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
317 push push changes to the specified destination
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
318 remove remove the specified files on the next commit
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
319 serve export the repository via HTTP
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
320 status show changed files in the working directory
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
321 update update working directory
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
322
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
323 use "hg help" for the full list of commands or "hg -v" for details
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
324 hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
325 Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
326
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
327 basic commands:
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
328
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
329 add add the specified files on the next commit
8779
708938509732 Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents: 8040
diff changeset
330 annotate show changeset information by line for each file
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
331 clone make a copy of an existing repository
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
332 commit commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
333 diff diff repository (or selected files)
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
334 export dump the header and diffs for one or more changesets
8902
b9a8b616521d Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents: 8863
diff changeset
335 forget forget the specified files on the next commit
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
336 init create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
337 log show revision history of entire repository or files
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
338 merge merge working directory with another revision
8026
683d8ebcf434 expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8018
diff changeset
339 parents show the parents of the working directory or revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
340 pull pull changes from the specified source
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
341 push push changes to the specified destination
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
342 remove remove the specified files on the next commit
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
343 serve export the repository via HTTP
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
344 status show changed files in the working directory
4014
509342f95564 various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3919
diff changeset
345 update update working directory
4315
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
346
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4156
diff changeset
347 use "hg help" for the full list of commands or "hg -v" for details