Mercurial > hg
annotate tests/test-help.out @ 9607:8e0e0d854b60
commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.
Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 19 Oct 2009 14:37:37 +0200 |
parents | 220d39af2e57 |
children | 69f8ac71ded1 |
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 | 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 |
9603 | 21 summary summarize working directory state |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
22 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
|
23 |
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
|
24 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
|
25 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
|
26 annotate show changeset information by line for each file |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
27 clone make a copy of an existing repository |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
28 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
|
29 diff diff repository (or selected files) |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
30 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
|
31 forget forget the specified files on the next commit |
908 | 32 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
|
33 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
|
34 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
|
35 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
|
36 pull pull changes from the specified source |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
37 push push changes to the specified destination |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
38 remove remove the specified files on the next commit |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
39 serve export the repository via HTTP |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
40 status show changed files in the working directory |
9603 | 41 summary summarize working directory state |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
42 update update working directory |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
43 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
44 |
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
|
45 list of commands: |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
46 |
3268
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
47 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
|
48 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
|
49 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
|
50 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
|
51 backout reverse effect of earlier changeset |
5775
2dd202a6e15b
bisect: make bisect a built-in command
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
52 bisect subdivision search of changesets |
3502
8dc14d630b29
add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents:
3468
diff
changeset
|
53 branch set or show the current branch name |
8dc14d630b29
add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents:
3468
diff
changeset
|
54 branches list repository named branches |
3268
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
55 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
|
56 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
|
57 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
|
58 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
|
59 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
|
60 diff diff repository (or selected files) |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
61 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
|
62 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
|
63 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
|
64 heads show current repository heads or show branch heads |
7210 | 65 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
|
66 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
|
67 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
|
68 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
|
69 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
|
70 locate locate files matching specific patterns |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
71 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
|
72 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
|
73 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
|
74 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
|
75 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
|
76 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
|
77 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
|
78 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
|
79 recover roll back an interrupted transaction |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
80 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
|
81 rename rename files; equivalent of copy + remove |
7530
3773e510d433
resolve: clarify and simplify help
Matt Mackall <mpm@selenic.com>
parents:
7387
diff
changeset
|
82 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
|
83 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
|
84 rollback roll back the last transaction |
8026
683d8ebcf434
expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
8018
diff
changeset
|
85 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
|
86 serve export the repository via HTTP |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
87 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
|
88 status show changed files in the working directory |
9603 | 89 summary summarize working directory state |
6321
55ba3bc5b8fd
tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents:
6201
diff
changeset
|
90 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
|
91 tags list repository tags |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
92 tip show the tip revision |
4699
a6b62584d0b2
unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4665
diff
changeset
|
93 unbundle apply one or more changegroup files |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
94 update update working directory |
3268
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
95 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
|
96 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
|
97 |
7210 | 98 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
|
99 |
f60730693efc
help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6668
diff
changeset
|
100 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
|
101 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
|
102 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
|
103 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
|
104 multirevs Specifying Multiple Revisions |
7387 | 105 diffs Diff Formats |
7679
eb98218db768
tests: fix up tests to cope with 6a0bc2dc9da6
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
106 templating Template Usage |
7979
6b04f12d2831
commands, help: consistently write 'URL' in upper-case
Martin Geisler <mg@daimi.au.dk>
parents:
7974
diff
changeset
|
107 urls URL Paths |
8863
7b19c3c0172b
help: adding a new help topic about extensions
Cédric Duval <cedricduval@free.fr>
parents:
8779
diff
changeset
|
108 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
|
109 |
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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 backout reverse effect of earlier changeset |
5775
2dd202a6e15b
bisect: make bisect a built-in command
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
116 bisect subdivision search of changesets |
3502
8dc14d630b29
add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents:
3468
diff
changeset
|
117 branch set or show the current branch name |
8dc14d630b29
add branch and branches commands
Matt Mackall <mpm@selenic.com>
parents:
3468
diff
changeset
|
118 branches list repository named branches |
3268
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
119 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
|
120 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
|
121 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
|
122 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
|
123 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
|
124 diff diff repository (or selected files) |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
125 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
|
126 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
|
127 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
|
128 heads show current repository heads or show branch heads |
7210 | 129 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
|
130 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
|
131 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
|
132 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
|
133 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
|
134 locate locate files matching specific patterns |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
135 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
|
136 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
|
137 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
|
138 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
|
139 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
|
140 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
|
141 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
|
142 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
|
143 recover roll back an interrupted transaction |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
144 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
|
145 rename rename files; equivalent of copy + remove |
7530
3773e510d433
resolve: clarify and simplify help
Matt Mackall <mpm@selenic.com>
parents:
7387
diff
changeset
|
146 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
|
147 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
|
148 rollback roll back the last transaction |
8026
683d8ebcf434
expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
8018
diff
changeset
|
149 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
|
150 serve export the repository via HTTP |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
151 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
|
152 status show changed files in the working directory |
9603 | 153 summary summarize working directory state |
6321
55ba3bc5b8fd
tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents:
6201
diff
changeset
|
154 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
|
155 tags list repository tags |
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
156 tip show the tip revision |
4699
a6b62584d0b2
unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4665
diff
changeset
|
157 unbundle apply one or more changegroup files |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
158 update update working directory |
3268
bb057b6ce3cf
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3200
diff
changeset
|
159 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
|
160 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
|
161 |
7210 | 162 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
|
163 |
f60730693efc
help: show extension commands in short list, separate extension list in help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6668
diff
changeset
|
164 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
|
165 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
|
166 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
|
167 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
|
168 multirevs Specifying Multiple Revisions |
7387 | 169 diffs Diff Formats |
7679
eb98218db768
tests: fix up tests to cope with 6a0bc2dc9da6
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
170 templating Template Usage |
7979
6b04f12d2831
commands, help: consistently write 'URL' in upper-case
Martin Geisler <mg@daimi.au.dk>
parents:
7974
diff
changeset
|
171 urls URL Paths |
8863
7b19c3c0172b
help: adding a new help topic about extensions
Cédric Duval <cedricduval@free.fr>
parents:
8779
diff
changeset
|
172 extensions Using additional features |
914 | 173 hg add [OPTION]... [FILE]... |
736
1e84f1014f33
Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
174 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
175 add the specified files on the next commit |
331 | 176 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
177 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
|
178 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
179 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
|
180 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
|
181 |
7807
bd8f44638847
help: miscellaneous language fixes
timeless <timeless@gmail.com>
parents:
7707
diff
changeset
|
182 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
|
183 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
184 options: |
736
1e84f1014f33
Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
185 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
186 -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
|
187 -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
|
188 -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
|
189 |
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
|
190 use "hg -v help add" to show global options |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
191 hg add: option --skjdfks not recognized |
914 | 192 hg add [OPTION]... [FILE]... |
596 | 193 |
194 add the specified files on the next commit | |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
195 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
196 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
|
197 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
198 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
|
199 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
|
200 |
7807
bd8f44638847
help: miscellaneous language fixes
timeless <timeless@gmail.com>
parents:
7707
diff
changeset
|
201 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
|
202 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
203 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
204 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
205 -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
|
206 -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
|
207 -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
|
208 |
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
|
209 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
|
210 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... |
331 | 211 |
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1515
diff
changeset
|
212 diff repository (or selected files) |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
213 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
214 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
|
215 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
216 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
|
217 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
218 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
|
219 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
|
220 revisions are specified. |
3829
531c116b2028
Add doc notes about revert and hg status vs diff
Matt Mackall <mpm@selenic.com>
parents:
3502
diff
changeset
|
221 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
222 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
|
223 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
|
224 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
|
225 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
|
226 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
227 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
|
228 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
|
229 with undesirable results. |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
230 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
231 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
|
232 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
|
233 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
234 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
235 |
2580
a20a1bb0c396
diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents:
2553
diff
changeset
|
236 -r --rev revision |
7628
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
7530
diff
changeset
|
237 -c --change change made by revision |
2580
a20a1bb0c396
diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents:
2553
diff
changeset
|
238 -a --text treat all files as text |
2907 | 239 -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
|
240 --nodates don't include dates in diff headers |
6668
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
6518
diff
changeset
|
241 -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
|
242 -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
|
243 -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
|
244 -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
|
245 -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
|
246 -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
|
247 -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
|
248 |
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
|
249 use "hg -v help diff" to show global options |
914 | 250 hg status [OPTION]... [FILE]... |
331 | 251 |
5783
28d9f8cd02f2
Move aliases section in help below synopsis (issue362)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5775
diff
changeset
|
252 aliases: st |
28d9f8cd02f2
Move aliases section in help below synopsis (issue362)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5775
diff
changeset
|
253 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
254 show changed files in the working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
255 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
256 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
|
257 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
|
258 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
|
259 -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
|
260 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
|
261 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
262 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
|
263 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
|
264 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
265 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
|
266 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
|
267 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
|
268 parent. |
3829
531c116b2028
Add doc notes about revert and hg status vs diff
Matt Mackall <mpm@selenic.com>
parents:
3502
diff
changeset
|
269 |
9051
f8e25885d975
commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8902
diff
changeset
|
270 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
|
271 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
|
272 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
273 The codes used to show the status of files are: |
9157
9261667e9b82
commands: use minirst parser when displaying help
Martin Geisler <mg@lazybytes.net>
parents:
9051
diff
changeset
|
274 |
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
275 M = modified |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
276 A = added |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
277 R = removed |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
278 C = clean |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
279 ! = missing (deleted by non-hg command, but still tracked) |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
280 ? = not tracked |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
281 I = ignored |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
282 = origin of the previous file listed as A (added) |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
283 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
284 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
285 |
2661
5c10b7ed3411
status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2640
diff
changeset
|
286 -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
|
287 -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
|
288 -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
|
289 -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
|
290 -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
|
291 -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
|
292 -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
|
293 -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
|
294 -n --no-status hide status prefix |
2640 | 295 -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
|
296 -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
|
297 --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
|
298 -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
|
299 -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
|
300 |
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
|
301 use "hg -v help status" to show global options |
914 | 302 hg status [OPTION]... [FILE]... |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
303 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
304 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
|
305 hg: unknown command 'foo' |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
306 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
307 |
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
|
308 basic commands: |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
309 |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
310 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 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
|
316 forget forget the specified files on the next commit |
908 | 317 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
|
318 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
|
319 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
|
320 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
|
321 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
|
322 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
|
323 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
|
324 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
|
325 status show changed files in the working directory |
9603 | 326 summary summarize working directory state |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
327 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
|
328 |
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
|
329 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
|
330 hg: unknown command 'skjdfks' |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
331 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
332 |
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
|
333 basic commands: |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
334 |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 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
|
339 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
|
340 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
|
341 forget forget the specified files on the next commit |
908 | 342 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
|
343 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
|
344 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
|
345 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
|
346 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
|
347 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
|
348 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
|
349 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
|
350 status show changed files in the working directory |
9603 | 351 summary summarize working directory state |
4014
509342f95564
various doc fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3919
diff
changeset
|
352 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
|
353 |
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
|
354 use "hg help" for the full list of commands or "hg -v" for details |