Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-help.out @ 1564:34579a67fa71
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
author | Benoit Boissinot <bboissin@gmail.com> |
---|---|
date | Thu, 01 Dec 2005 10:48:29 -0600 |
parents | 3bd6d27cb81c |
children | 1d7d0c07e8f3 |
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 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
3 basic commands (use "hg help" for the full list or option "-v" for details): |
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 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
6 annotate show changeset information per file line |
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 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
9 diff diff working directory (or selected files) |
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 |
908 | 11 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
|
12 log show revision history of entire repository or files |
1475
d791c335fb7b
Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents:
1437
diff
changeset
|
13 parents show the parents of the working dir or revision |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
14 pull pull changes from the specified source |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
15 push push changes to the specified destination |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
16 remove remove the specified files on the next commit |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
17 revert revert modified files or dirs back to their unmodified states |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
18 serve export the repository via HTTP |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
19 status show changed files in the working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
20 update update or merge working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
21 add add the specified files on the next commit |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
22 annotate show changeset information per file line |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
23 clone make a copy of an existing repository |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
24 commit commit the specified files or all outstanding changes |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
25 diff diff working directory (or selected files) |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
26 export dump the header and diffs for one or more changesets |
908 | 27 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
|
28 log show revision history of entire repository or files |
1475
d791c335fb7b
Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents:
1437
diff
changeset
|
29 parents show the parents of the working dir or revision |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
30 pull pull changes from the specified source |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
31 push push changes to the specified destination |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
32 remove remove the specified files on the next commit |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
33 revert revert modified files or dirs back to their unmodified states |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
34 serve export the repository via HTTP |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
35 status show changed files in the working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
36 update update or merge working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
37 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
38 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
39 list of commands (use "hg help -v" to show aliases and global options): |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
40 |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
41 add add the specified files on the next commit |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
42 addremove add all new files, delete all missing files |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
43 annotate show changeset information per file line |
1223 | 44 bundle create a changegroup file |
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
45 cat output the latest or given revisions of files |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
46 clone make a copy of an existing repository |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
47 commit commit the specified files or all outstanding changes |
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1223
diff
changeset
|
48 copy mark files as copied for the next commit |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
49 diff diff working directory (or selected files) |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
50 export dump the header and diffs for one or more changesets |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
51 forget don't add the specified files on the next commit |
1060 | 52 grep search for a pattern in specified files and revisions |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
53 heads show current repository heads |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
54 help show help for a given command or all commands |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
55 identify print information about the working copy |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
56 import import an ordered set of patches |
930 | 57 incoming show new changesets found in source |
908 | 58 init create a new repository in the given directory |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
59 locate locate files matching specific patterns |
1034
8dbbea5bc844
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1017
diff
changeset
|
60 log show revision history of entire repository or files |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
61 manifest output the latest or given revision of the project manifest |
925 | 62 outgoing show changesets not found in destination |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
63 parents show the parents of the working dir or revision |
925 | 64 paths show definition of symbolic path names |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
65 pull pull changes from the specified source |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
66 push push changes to the specified destination |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
67 rawcommit raw commit interface |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
68 recover roll back an interrupted transaction |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
69 remove remove the specified files on the next commit |
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
70 rename rename files; equivalent of copy + remove |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
71 revert revert modified files or dirs back to their unmodified states |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
72 root print the root (top) of the current working dir |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
73 serve export the repository via HTTP |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
74 status show changed files in the working directory |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
75 tag add a tag for the current tip or a given revision |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
76 tags list repository tags |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
77 tip show the tip revision |
1223 | 78 unbundle apply a changegroup file |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
79 undo undo the last commit or pull |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
80 update update or merge working directory |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
81 verify verify the integrity of the repository |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
82 version output version and copyright information |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
83 add add the specified files on the next commit |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
84 addremove add all new files, delete all missing files |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
85 annotate show changeset information per file line |
1223 | 86 bundle create a changegroup file |
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
87 cat output the latest or given revisions of files |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
88 clone make a copy of an existing repository |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
89 commit commit the specified files or all outstanding changes |
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1223
diff
changeset
|
90 copy mark files as copied for the next commit |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
91 diff diff working directory (or selected files) |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
92 export dump the header and diffs for one or more changesets |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
93 forget don't add the specified files on the next commit |
1060 | 94 grep search for a pattern in specified files and revisions |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
95 heads show current repository heads |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
96 help show help for a given command or all commands |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
97 identify print information about the working copy |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
98 import import an ordered set of patches |
930 | 99 incoming show new changesets found in source |
908 | 100 init create a new repository in the given directory |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
101 locate locate files matching specific patterns |
1034
8dbbea5bc844
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1017
diff
changeset
|
102 log show revision history of entire repository or files |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
103 manifest output the latest or given revision of the project manifest |
925 | 104 outgoing show changesets not found in destination |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
105 parents show the parents of the working dir or revision |
925 | 106 paths show definition of symbolic path names |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
107 pull pull changes from the specified source |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
108 push push changes to the specified destination |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
109 rawcommit raw commit interface |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
110 recover roll back an interrupted transaction |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
111 remove remove the specified files on the next commit |
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
112 rename rename files; equivalent of copy + remove |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
113 revert revert modified files or dirs back to their unmodified states |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
114 root print the root (top) of the current working dir |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
115 serve export the repository via HTTP |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
116 status show changed files in the working directory |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
117 tag add a tag for the current tip or a given revision |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
118 tags list repository tags |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
119 tip show the tip revision |
1223 | 120 unbundle apply a changegroup file |
847
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
121 undo undo the last commit or pull |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
122 update update or merge working directory |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
123 verify verify the integrity of the repository |
f1555f48f884
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents:
814
diff
changeset
|
124 version output version and copyright information |
914 | 125 hg add [OPTION]... [FILE]... |
736
1e84f1014f33
Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
126 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
127 add the specified files on the next commit |
331 | 128 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
129 Schedule files to be version controlled and added to the repository. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
130 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
131 The files will be added to the repository at the next commit. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
132 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
133 If no names are given, add all files in the current directory and |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
134 its subdirectories. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
135 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
136 options: |
736
1e84f1014f33
Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
137 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
138 -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
|
139 -X --exclude exclude names matching the given patterns |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
140 hg add: option --skjdfks not recognized |
914 | 141 hg add [OPTION]... [FILE]... |
596 | 142 |
143 add the specified files on the next commit | |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
144 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
145 Schedule files to be version controlled and added to the repository. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
146 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
147 The files will be added to the repository at the next commit. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
148 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
149 If no names are given, add all files in the current directory and |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
150 its subdirectories. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
151 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
152 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
153 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
154 -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
|
155 -X --exclude exclude names matching the given patterns |
1055 | 156 hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]... |
331 | 157 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
158 diff working directory (or selected files) |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
159 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
160 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
|
161 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
162 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
|
163 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
164 When two revision arguments are given, then changes are shown |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
165 between those revisions. If only one revision is specified then |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
166 that revision is compared to the working directory, and, when no |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
167 revisions are specified, the working directory files are compared |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
168 to its parent. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
169 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
170 Without the -a option, diff will avoid generating diffs of files |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
171 it detects as binary. With -a, diff will generate a diff anyway, |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
172 probably with undesirable results. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
173 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
174 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
175 |
1052
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
176 -r --rev revision |
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
177 -a --text treat all files as text |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
178 -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
|
179 -X --exclude exclude names matching the given patterns |
914 | 180 hg status [OPTION]... [FILE]... |
331 | 181 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
182 show changed files in the working directory |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
183 |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
184 Show changed files in the working directory. If no names are |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
185 given, all files are shown. Otherwise, only files matching the |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
186 given names are shown. |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
187 |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
188 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
|
189 M = modified |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
190 A = added |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
191 R = removed |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
192 ? = not tracked |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
193 |
1515
3bd6d27cb81c
Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents:
1475
diff
changeset
|
194 aliases: st |
3bd6d27cb81c
Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents:
1475
diff
changeset
|
195 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
196 options: |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
197 |
1107
a9c45e537f77
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1086
diff
changeset
|
198 -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
|
199 -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
|
200 -r --removed show only removed files |
a9c45e537f77
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1086
diff
changeset
|
201 -u --unknown show only unknown (not tracked) files |
a9c45e537f77
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1086
diff
changeset
|
202 -n --no-status hide status prefix |
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
203 -0 --print0 end filenames with NUL, for use with xargs |
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1254
diff
changeset
|
204 -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
|
205 -X --exclude exclude names matching the given patterns |
914 | 206 hg status [OPTION]... [FILE]... |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
207 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
208 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
|
209 hg: unknown command 'foo' |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
210 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
211 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
212 basic commands (use "hg help" for the full list or option "-v" for details): |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
213 |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
214 add add 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
|
215 annotate show changeset information per file line |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
216 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
|
217 commit commit the specified files or all outstanding changes |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
218 diff diff working directory (or selected files) |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
219 export dump the header and diffs for one or more changesets |
908 | 220 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
|
221 log show revision history of entire repository or files |
1475
d791c335fb7b
Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents:
1437
diff
changeset
|
222 parents show the parents of the working dir or revision |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
223 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
|
224 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
|
225 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
|
226 revert revert modified files or dirs back to their unmodified states |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
227 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
|
228 status show changed files in the working directory |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
229 update update or merge working directory |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
230 hg: unknown command 'skjdfks' |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
231 Mercurial Distributed SCM |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
232 |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
233 basic commands (use "hg help" for the full list or option "-v" for details): |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
234 |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
235 add add 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
|
236 annotate show changeset information per file line |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
237 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
|
238 commit commit the specified files or all outstanding changes |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
239 diff diff working directory (or selected files) |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
240 export dump the header and diffs for one or more changesets |
908 | 241 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
|
242 log show revision history of entire repository or files |
1475
d791c335fb7b
Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents:
1437
diff
changeset
|
243 parents show the parents of the working dir or revision |
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
244 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
|
245 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
|
246 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
|
247 revert revert modified files or dirs back to their unmodified states |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
248 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
|
249 status show changed files in the working directory |
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
847
diff
changeset
|
250 update update or merge working directory |