Show More
@@ -1,878 +1,1272 b'' | |||||
1 | Short help: |
|
1 | Short help: | |
2 |
|
2 | |||
3 | $ hg |
|
3 | $ hg | |
4 | Mercurial Distributed SCM |
|
4 | Mercurial Distributed SCM | |
5 |
|
5 | |||
6 | basic commands: |
|
6 | basic commands: | |
7 |
|
7 | |||
8 | add add the specified files on the next commit |
|
8 | add add the specified files on the next commit | |
9 | annotate show changeset information by line for each file |
|
9 | annotate show changeset information by line for each file | |
10 | clone make a copy of an existing repository |
|
10 | clone make a copy of an existing repository | |
11 | commit commit the specified files or all outstanding changes |
|
11 | commit commit the specified files or all outstanding changes | |
12 | diff diff repository (or selected files) |
|
12 | diff diff repository (or selected files) | |
13 | export dump the header and diffs for one or more changesets |
|
13 | export dump the header and diffs for one or more changesets | |
14 | forget forget the specified files on the next commit |
|
14 | forget forget the specified files on the next commit | |
15 | init create a new repository in the given directory |
|
15 | init create a new repository in the given directory | |
16 | log show revision history of entire repository or files |
|
16 | log show revision history of entire repository or files | |
17 | merge merge working directory with another revision |
|
17 | merge merge working directory with another revision | |
18 | pull pull changes from the specified source |
|
18 | pull pull changes from the specified source | |
19 | push push changes to the specified destination |
|
19 | push push changes to the specified destination | |
20 | remove remove the specified files on the next commit |
|
20 | remove remove the specified files on the next commit | |
21 | serve start stand-alone webserver |
|
21 | serve start stand-alone webserver | |
22 | status show changed files in the working directory |
|
22 | status show changed files in the working directory | |
23 | summary summarize working directory state |
|
23 | summary summarize working directory state | |
24 | update update working directory (or switch revisions) |
|
24 | update update working directory (or switch revisions) | |
25 |
|
25 | |||
26 | use "hg help" for the full list of commands or "hg -v" for details |
|
26 | use "hg help" for the full list of commands or "hg -v" for details | |
27 |
|
27 | |||
28 | $ hg -q |
|
28 | $ hg -q | |
29 | add add the specified files on the next commit |
|
29 | add add the specified files on the next commit | |
30 | annotate show changeset information by line for each file |
|
30 | annotate show changeset information by line for each file | |
31 | clone make a copy of an existing repository |
|
31 | clone make a copy of an existing repository | |
32 | commit commit the specified files or all outstanding changes |
|
32 | commit commit the specified files or all outstanding changes | |
33 | diff diff repository (or selected files) |
|
33 | diff diff repository (or selected files) | |
34 | export dump the header and diffs for one or more changesets |
|
34 | export dump the header and diffs for one or more changesets | |
35 | forget forget the specified files on the next commit |
|
35 | forget forget the specified files on the next commit | |
36 | init create a new repository in the given directory |
|
36 | init create a new repository in the given directory | |
37 | log show revision history of entire repository or files |
|
37 | log show revision history of entire repository or files | |
38 | merge merge working directory with another revision |
|
38 | merge merge working directory with another revision | |
39 | pull pull changes from the specified source |
|
39 | pull pull changes from the specified source | |
40 | push push changes to the specified destination |
|
40 | push push changes to the specified destination | |
41 | remove remove the specified files on the next commit |
|
41 | remove remove the specified files on the next commit | |
42 | serve start stand-alone webserver |
|
42 | serve start stand-alone webserver | |
43 | status show changed files in the working directory |
|
43 | status show changed files in the working directory | |
44 | summary summarize working directory state |
|
44 | summary summarize working directory state | |
45 | update update working directory (or switch revisions) |
|
45 | update update working directory (or switch revisions) | |
46 |
|
46 | |||
47 | $ hg help |
|
47 | $ hg help | |
48 | Mercurial Distributed SCM |
|
48 | Mercurial Distributed SCM | |
49 |
|
49 | |||
50 | list of commands: |
|
50 | list of commands: | |
51 |
|
51 | |||
52 | add add the specified files on the next commit |
|
52 | add add the specified files on the next commit | |
53 | addremove add all new files, delete all missing files |
|
53 | addremove add all new files, delete all missing files | |
54 | annotate show changeset information by line for each file |
|
54 | annotate show changeset information by line for each file | |
55 | archive create an unversioned archive of a repository revision |
|
55 | archive create an unversioned archive of a repository revision | |
56 | backout reverse effect of earlier changeset |
|
56 | backout reverse effect of earlier changeset | |
57 | bisect subdivision search of changesets |
|
57 | bisect subdivision search of changesets | |
58 | bookmarks track a line of development with movable markers |
|
58 | bookmarks track a line of development with movable markers | |
59 | branch set or show the current branch name |
|
59 | branch set or show the current branch name | |
60 | branches list repository named branches |
|
60 | branches list repository named branches | |
61 | bundle create a changegroup file |
|
61 | bundle create a changegroup file | |
62 | cat output the current or given revision of files |
|
62 | cat output the current or given revision of files | |
63 | clone make a copy of an existing repository |
|
63 | clone make a copy of an existing repository | |
64 | commit commit the specified files or all outstanding changes |
|
64 | commit commit the specified files or all outstanding changes | |
65 | copy mark files as copied for the next commit |
|
65 | copy mark files as copied for the next commit | |
66 | diff diff repository (or selected files) |
|
66 | diff diff repository (or selected files) | |
67 | export dump the header and diffs for one or more changesets |
|
67 | export dump the header and diffs for one or more changesets | |
68 | forget forget the specified files on the next commit |
|
68 | forget forget the specified files on the next commit | |
69 | graft copy changes from other branches onto the current branch |
|
69 | graft copy changes from other branches onto the current branch | |
70 | grep search for a pattern in specified files and revisions |
|
70 | grep search for a pattern in specified files and revisions | |
71 | heads show current repository heads or show branch heads |
|
71 | heads show current repository heads or show branch heads | |
72 | help show help for a given topic or a help overview |
|
72 | help show help for a given topic or a help overview | |
73 | identify identify the working copy or specified revision |
|
73 | identify identify the working copy or specified revision | |
74 | import import an ordered set of patches |
|
74 | import import an ordered set of patches | |
75 | incoming show new changesets found in source |
|
75 | incoming show new changesets found in source | |
76 | init create a new repository in the given directory |
|
76 | init create a new repository in the given directory | |
77 | locate locate files matching specific patterns |
|
77 | locate locate files matching specific patterns | |
78 | log show revision history of entire repository or files |
|
78 | log show revision history of entire repository or files | |
79 | manifest output the current or given revision of the project manifest |
|
79 | manifest output the current or given revision of the project manifest | |
80 | merge merge working directory with another revision |
|
80 | merge merge working directory with another revision | |
81 | outgoing show changesets not found in the destination |
|
81 | outgoing show changesets not found in the destination | |
82 | parents show the parents of the working directory or revision |
|
82 | parents show the parents of the working directory or revision | |
83 | paths show aliases for remote repositories |
|
83 | paths show aliases for remote repositories | |
84 | phase set or show the current phase name |
|
84 | phase set or show the current phase name | |
85 | pull pull changes from the specified source |
|
85 | pull pull changes from the specified source | |
86 | push push changes to the specified destination |
|
86 | push push changes to the specified destination | |
87 | recover roll back an interrupted transaction |
|
87 | recover roll back an interrupted transaction | |
88 | remove remove the specified files on the next commit |
|
88 | remove remove the specified files on the next commit | |
89 | rename rename files; equivalent of copy + remove |
|
89 | rename rename files; equivalent of copy + remove | |
90 | resolve redo merges or set/view the merge status of files |
|
90 | resolve redo merges or set/view the merge status of files | |
91 | revert restore files to their checkout state |
|
91 | revert restore files to their checkout state | |
92 | rollback roll back the last transaction (dangerous) |
|
92 | rollback roll back the last transaction (dangerous) | |
93 | root print the root (top) of the current working directory |
|
93 | root print the root (top) of the current working directory | |
94 | serve start stand-alone webserver |
|
94 | serve start stand-alone webserver | |
95 | showconfig show combined config settings from all hgrc files |
|
95 | showconfig show combined config settings from all hgrc files | |
96 | status show changed files in the working directory |
|
96 | status show changed files in the working directory | |
97 | summary summarize working directory state |
|
97 | summary summarize working directory state | |
98 | tag add one or more tags for the current or given revision |
|
98 | tag add one or more tags for the current or given revision | |
99 | tags list repository tags |
|
99 | tags list repository tags | |
100 | tip show the tip revision |
|
100 | tip show the tip revision | |
101 | unbundle apply one or more changegroup files |
|
101 | unbundle apply one or more changegroup files | |
102 | update update working directory (or switch revisions) |
|
102 | update update working directory (or switch revisions) | |
103 | verify verify the integrity of the repository |
|
103 | verify verify the integrity of the repository | |
104 | version output version and copyright information |
|
104 | version output version and copyright information | |
105 |
|
105 | |||
106 | additional help topics: |
|
106 | additional help topics: | |
107 |
|
107 | |||
108 | config Configuration Files |
|
108 | config Configuration Files | |
109 | dates Date Formats |
|
109 | dates Date Formats | |
110 | diffs Diff Formats |
|
110 | diffs Diff Formats | |
111 | environment Environment Variables |
|
111 | environment Environment Variables | |
112 | extensions Using Additional Features |
|
112 | extensions Using Additional Features | |
113 | filesets Specifying File Sets |
|
113 | filesets Specifying File Sets | |
114 | glossary Glossary |
|
114 | glossary Glossary | |
115 | hgignore Syntax for Mercurial Ignore Files |
|
115 | hgignore Syntax for Mercurial Ignore Files | |
116 | hgweb Configuring hgweb |
|
116 | hgweb Configuring hgweb | |
117 | merge-tools Merge Tools |
|
117 | merge-tools Merge Tools | |
118 | multirevs Specifying Multiple Revisions |
|
118 | multirevs Specifying Multiple Revisions | |
119 | patterns File Name Patterns |
|
119 | patterns File Name Patterns | |
120 | phases Working with Phases |
|
120 | phases Working with Phases | |
121 | revisions Specifying Single Revisions |
|
121 | revisions Specifying Single Revisions | |
122 | revsets Specifying Revision Sets |
|
122 | revsets Specifying Revision Sets | |
123 | subrepos Subrepositories |
|
123 | subrepos Subrepositories | |
124 | templating Template Usage |
|
124 | templating Template Usage | |
125 | urls URL Paths |
|
125 | urls URL Paths | |
126 |
|
126 | |||
127 | use "hg -v help" to show builtin aliases and global options |
|
127 | use "hg -v help" to show builtin aliases and global options | |
128 |
|
128 | |||
129 | $ hg -q help |
|
129 | $ hg -q help | |
130 | add add the specified files on the next commit |
|
130 | add add the specified files on the next commit | |
131 | addremove add all new files, delete all missing files |
|
131 | addremove add all new files, delete all missing files | |
132 | annotate show changeset information by line for each file |
|
132 | annotate show changeset information by line for each file | |
133 | archive create an unversioned archive of a repository revision |
|
133 | archive create an unversioned archive of a repository revision | |
134 | backout reverse effect of earlier changeset |
|
134 | backout reverse effect of earlier changeset | |
135 | bisect subdivision search of changesets |
|
135 | bisect subdivision search of changesets | |
136 | bookmarks track a line of development with movable markers |
|
136 | bookmarks track a line of development with movable markers | |
137 | branch set or show the current branch name |
|
137 | branch set or show the current branch name | |
138 | branches list repository named branches |
|
138 | branches list repository named branches | |
139 | bundle create a changegroup file |
|
139 | bundle create a changegroup file | |
140 | cat output the current or given revision of files |
|
140 | cat output the current or given revision of files | |
141 | clone make a copy of an existing repository |
|
141 | clone make a copy of an existing repository | |
142 | commit commit the specified files or all outstanding changes |
|
142 | commit commit the specified files or all outstanding changes | |
143 | copy mark files as copied for the next commit |
|
143 | copy mark files as copied for the next commit | |
144 | diff diff repository (or selected files) |
|
144 | diff diff repository (or selected files) | |
145 | export dump the header and diffs for one or more changesets |
|
145 | export dump the header and diffs for one or more changesets | |
146 | forget forget the specified files on the next commit |
|
146 | forget forget the specified files on the next commit | |
147 | graft copy changes from other branches onto the current branch |
|
147 | graft copy changes from other branches onto the current branch | |
148 | grep search for a pattern in specified files and revisions |
|
148 | grep search for a pattern in specified files and revisions | |
149 | heads show current repository heads or show branch heads |
|
149 | heads show current repository heads or show branch heads | |
150 | help show help for a given topic or a help overview |
|
150 | help show help for a given topic or a help overview | |
151 | identify identify the working copy or specified revision |
|
151 | identify identify the working copy or specified revision | |
152 | import import an ordered set of patches |
|
152 | import import an ordered set of patches | |
153 | incoming show new changesets found in source |
|
153 | incoming show new changesets found in source | |
154 | init create a new repository in the given directory |
|
154 | init create a new repository in the given directory | |
155 | locate locate files matching specific patterns |
|
155 | locate locate files matching specific patterns | |
156 | log show revision history of entire repository or files |
|
156 | log show revision history of entire repository or files | |
157 | manifest output the current or given revision of the project manifest |
|
157 | manifest output the current or given revision of the project manifest | |
158 | merge merge working directory with another revision |
|
158 | merge merge working directory with another revision | |
159 | outgoing show changesets not found in the destination |
|
159 | outgoing show changesets not found in the destination | |
160 | parents show the parents of the working directory or revision |
|
160 | parents show the parents of the working directory or revision | |
161 | paths show aliases for remote repositories |
|
161 | paths show aliases for remote repositories | |
162 | phase set or show the current phase name |
|
162 | phase set or show the current phase name | |
163 | pull pull changes from the specified source |
|
163 | pull pull changes from the specified source | |
164 | push push changes to the specified destination |
|
164 | push push changes to the specified destination | |
165 | recover roll back an interrupted transaction |
|
165 | recover roll back an interrupted transaction | |
166 | remove remove the specified files on the next commit |
|
166 | remove remove the specified files on the next commit | |
167 | rename rename files; equivalent of copy + remove |
|
167 | rename rename files; equivalent of copy + remove | |
168 | resolve redo merges or set/view the merge status of files |
|
168 | resolve redo merges or set/view the merge status of files | |
169 | revert restore files to their checkout state |
|
169 | revert restore files to their checkout state | |
170 | rollback roll back the last transaction (dangerous) |
|
170 | rollback roll back the last transaction (dangerous) | |
171 | root print the root (top) of the current working directory |
|
171 | root print the root (top) of the current working directory | |
172 | serve start stand-alone webserver |
|
172 | serve start stand-alone webserver | |
173 | showconfig show combined config settings from all hgrc files |
|
173 | showconfig show combined config settings from all hgrc files | |
174 | status show changed files in the working directory |
|
174 | status show changed files in the working directory | |
175 | summary summarize working directory state |
|
175 | summary summarize working directory state | |
176 | tag add one or more tags for the current or given revision |
|
176 | tag add one or more tags for the current or given revision | |
177 | tags list repository tags |
|
177 | tags list repository tags | |
178 | tip show the tip revision |
|
178 | tip show the tip revision | |
179 | unbundle apply one or more changegroup files |
|
179 | unbundle apply one or more changegroup files | |
180 | update update working directory (or switch revisions) |
|
180 | update update working directory (or switch revisions) | |
181 | verify verify the integrity of the repository |
|
181 | verify verify the integrity of the repository | |
182 | version output version and copyright information |
|
182 | version output version and copyright information | |
183 |
|
183 | |||
184 | additional help topics: |
|
184 | additional help topics: | |
185 |
|
185 | |||
186 | config Configuration Files |
|
186 | config Configuration Files | |
187 | dates Date Formats |
|
187 | dates Date Formats | |
188 | diffs Diff Formats |
|
188 | diffs Diff Formats | |
189 | environment Environment Variables |
|
189 | environment Environment Variables | |
190 | extensions Using Additional Features |
|
190 | extensions Using Additional Features | |
191 | filesets Specifying File Sets |
|
191 | filesets Specifying File Sets | |
192 | glossary Glossary |
|
192 | glossary Glossary | |
193 | hgignore Syntax for Mercurial Ignore Files |
|
193 | hgignore Syntax for Mercurial Ignore Files | |
194 | hgweb Configuring hgweb |
|
194 | hgweb Configuring hgweb | |
195 | merge-tools Merge Tools |
|
195 | merge-tools Merge Tools | |
196 | multirevs Specifying Multiple Revisions |
|
196 | multirevs Specifying Multiple Revisions | |
197 | patterns File Name Patterns |
|
197 | patterns File Name Patterns | |
198 | phases Working with Phases |
|
198 | phases Working with Phases | |
199 | revisions Specifying Single Revisions |
|
199 | revisions Specifying Single Revisions | |
200 | revsets Specifying Revision Sets |
|
200 | revsets Specifying Revision Sets | |
201 | subrepos Subrepositories |
|
201 | subrepos Subrepositories | |
202 | templating Template Usage |
|
202 | templating Template Usage | |
203 | urls URL Paths |
|
203 | urls URL Paths | |
204 |
|
204 | |||
205 | Test short command list with verbose option |
|
205 | Test short command list with verbose option | |
206 |
|
206 | |||
207 | $ hg -v help shortlist |
|
207 | $ hg -v help shortlist | |
208 | Mercurial Distributed SCM |
|
208 | Mercurial Distributed SCM | |
209 |
|
209 | |||
210 | basic commands: |
|
210 | basic commands: | |
211 |
|
211 | |||
212 | add add the specified files on the next commit |
|
212 | add add the specified files on the next commit | |
213 | annotate, blame |
|
213 | annotate, blame | |
214 | show changeset information by line for each file |
|
214 | show changeset information by line for each file | |
215 | clone make a copy of an existing repository |
|
215 | clone make a copy of an existing repository | |
216 | commit, ci commit the specified files or all outstanding changes |
|
216 | commit, ci commit the specified files or all outstanding changes | |
217 | diff diff repository (or selected files) |
|
217 | diff diff repository (or selected files) | |
218 | export dump the header and diffs for one or more changesets |
|
218 | export dump the header and diffs for one or more changesets | |
219 | forget forget the specified files on the next commit |
|
219 | forget forget the specified files on the next commit | |
220 | init create a new repository in the given directory |
|
220 | init create a new repository in the given directory | |
221 | log, history show revision history of entire repository or files |
|
221 | log, history show revision history of entire repository or files | |
222 | merge merge working directory with another revision |
|
222 | merge merge working directory with another revision | |
223 | pull pull changes from the specified source |
|
223 | pull pull changes from the specified source | |
224 | push push changes to the specified destination |
|
224 | push push changes to the specified destination | |
225 | remove, rm remove the specified files on the next commit |
|
225 | remove, rm remove the specified files on the next commit | |
226 | serve start stand-alone webserver |
|
226 | serve start stand-alone webserver | |
227 | status, st show changed files in the working directory |
|
227 | status, st show changed files in the working directory | |
228 | summary, sum summarize working directory state |
|
228 | summary, sum summarize working directory state | |
229 | update, up, checkout, co |
|
229 | update, up, checkout, co | |
230 | update working directory (or switch revisions) |
|
230 | update working directory (or switch revisions) | |
231 |
|
231 | |||
232 | global options: |
|
232 | global options: | |
233 |
|
233 | |||
234 | -R --repository REPO repository root directory or name of overlay bundle |
|
234 | -R --repository REPO repository root directory or name of overlay bundle | |
235 | file |
|
235 | file | |
236 | --cwd DIR change working directory |
|
236 | --cwd DIR change working directory | |
237 | -y --noninteractive do not prompt, automatically pick the first choice for |
|
237 | -y --noninteractive do not prompt, automatically pick the first choice for | |
238 | all prompts |
|
238 | all prompts | |
239 | -q --quiet suppress output |
|
239 | -q --quiet suppress output | |
240 | -v --verbose enable additional output |
|
240 | -v --verbose enable additional output | |
241 | --config CONFIG [+] set/override config option (use 'section.name=value') |
|
241 | --config CONFIG [+] set/override config option (use 'section.name=value') | |
242 | --debug enable debugging output |
|
242 | --debug enable debugging output | |
243 | --debugger start debugger |
|
243 | --debugger start debugger | |
244 | --encoding ENCODE set the charset encoding (default: ascii) |
|
244 | --encoding ENCODE set the charset encoding (default: ascii) | |
245 | --encodingmode MODE set the charset encoding mode (default: strict) |
|
245 | --encodingmode MODE set the charset encoding mode (default: strict) | |
246 | --traceback always print a traceback on exception |
|
246 | --traceback always print a traceback on exception | |
247 | --time time how long the command takes |
|
247 | --time time how long the command takes | |
248 | --profile print command execution profile |
|
248 | --profile print command execution profile | |
249 | --version output version information and exit |
|
249 | --version output version information and exit | |
250 | -h --help display help and exit |
|
250 | -h --help display help and exit | |
251 | --hidden consider hidden changesets |
|
251 | --hidden consider hidden changesets | |
252 |
|
252 | |||
253 | [+] marked option can be specified multiple times |
|
253 | [+] marked option can be specified multiple times | |
254 |
|
254 | |||
255 | use "hg help" for the full list of commands |
|
255 | use "hg help" for the full list of commands | |
256 |
|
256 | |||
257 | $ hg add -h |
|
257 | $ hg add -h | |
258 | hg add [OPTION]... [FILE]... |
|
258 | hg add [OPTION]... [FILE]... | |
259 |
|
259 | |||
260 | add the specified files on the next commit |
|
260 | add the specified files on the next commit | |
261 |
|
261 | |||
262 | Schedule files to be version controlled and added to the repository. |
|
262 | Schedule files to be version controlled and added to the repository. | |
263 |
|
263 | |||
264 | The files will be added to the repository at the next commit. To undo an |
|
264 | The files will be added to the repository at the next commit. To undo an | |
265 | add before that, see "hg forget". |
|
265 | add before that, see "hg forget". | |
266 |
|
266 | |||
267 | If no names are given, add all files to the repository. |
|
267 | If no names are given, add all files to the repository. | |
268 |
|
268 | |||
269 | Returns 0 if all files are successfully added. |
|
269 | Returns 0 if all files are successfully added. | |
270 |
|
270 | |||
271 | options: |
|
271 | options: | |
272 |
|
272 | |||
273 | -I --include PATTERN [+] include names matching the given patterns |
|
273 | -I --include PATTERN [+] include names matching the given patterns | |
274 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
274 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
275 | -S --subrepos recurse into subrepositories |
|
275 | -S --subrepos recurse into subrepositories | |
276 | -n --dry-run do not perform actions, just print output |
|
276 | -n --dry-run do not perform actions, just print output | |
277 |
|
277 | |||
278 | [+] marked option can be specified multiple times |
|
278 | [+] marked option can be specified multiple times | |
279 |
|
279 | |||
280 | use "hg -v help add" to show more complete help and the global options |
|
280 | use "hg -v help add" to show more complete help and the global options | |
281 |
|
281 | |||
282 | Verbose help for add |
|
282 | Verbose help for add | |
283 |
|
283 | |||
284 | $ hg add -hv |
|
284 | $ hg add -hv | |
285 | hg add [OPTION]... [FILE]... |
|
285 | hg add [OPTION]... [FILE]... | |
286 |
|
286 | |||
287 | add the specified files on the next commit |
|
287 | add the specified files on the next commit | |
288 |
|
288 | |||
289 | Schedule files to be version controlled and added to the repository. |
|
289 | Schedule files to be version controlled and added to the repository. | |
290 |
|
290 | |||
291 | The files will be added to the repository at the next commit. To undo an |
|
291 | The files will be added to the repository at the next commit. To undo an | |
292 | add before that, see "hg forget". |
|
292 | add before that, see "hg forget". | |
293 |
|
293 | |||
294 | If no names are given, add all files to the repository. |
|
294 | If no names are given, add all files to the repository. | |
295 |
|
295 | |||
296 | An example showing how new (unknown) files are added automatically by "hg |
|
296 | An example showing how new (unknown) files are added automatically by "hg | |
297 | add": |
|
297 | add": | |
298 |
|
298 | |||
299 | $ ls |
|
299 | $ ls | |
300 | foo.c |
|
300 | foo.c | |
301 | $ hg status |
|
301 | $ hg status | |
302 | ? foo.c |
|
302 | ? foo.c | |
303 | $ hg add |
|
303 | $ hg add | |
304 | adding foo.c |
|
304 | adding foo.c | |
305 | $ hg status |
|
305 | $ hg status | |
306 | A foo.c |
|
306 | A foo.c | |
307 |
|
307 | |||
308 | Returns 0 if all files are successfully added. |
|
308 | Returns 0 if all files are successfully added. | |
309 |
|
309 | |||
310 | options: |
|
310 | options: | |
311 |
|
311 | |||
312 | -I --include PATTERN [+] include names matching the given patterns |
|
312 | -I --include PATTERN [+] include names matching the given patterns | |
313 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
313 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
314 | -S --subrepos recurse into subrepositories |
|
314 | -S --subrepos recurse into subrepositories | |
315 | -n --dry-run do not perform actions, just print output |
|
315 | -n --dry-run do not perform actions, just print output | |
316 |
|
316 | |||
317 | [+] marked option can be specified multiple times |
|
317 | [+] marked option can be specified multiple times | |
318 |
|
318 | |||
319 | global options: |
|
319 | global options: | |
320 |
|
320 | |||
321 | -R --repository REPO repository root directory or name of overlay bundle |
|
321 | -R --repository REPO repository root directory or name of overlay bundle | |
322 | file |
|
322 | file | |
323 | --cwd DIR change working directory |
|
323 | --cwd DIR change working directory | |
324 | -y --noninteractive do not prompt, automatically pick the first choice for |
|
324 | -y --noninteractive do not prompt, automatically pick the first choice for | |
325 | all prompts |
|
325 | all prompts | |
326 | -q --quiet suppress output |
|
326 | -q --quiet suppress output | |
327 | -v --verbose enable additional output |
|
327 | -v --verbose enable additional output | |
328 | --config CONFIG [+] set/override config option (use 'section.name=value') |
|
328 | --config CONFIG [+] set/override config option (use 'section.name=value') | |
329 | --debug enable debugging output |
|
329 | --debug enable debugging output | |
330 | --debugger start debugger |
|
330 | --debugger start debugger | |
331 | --encoding ENCODE set the charset encoding (default: ascii) |
|
331 | --encoding ENCODE set the charset encoding (default: ascii) | |
332 | --encodingmode MODE set the charset encoding mode (default: strict) |
|
332 | --encodingmode MODE set the charset encoding mode (default: strict) | |
333 | --traceback always print a traceback on exception |
|
333 | --traceback always print a traceback on exception | |
334 | --time time how long the command takes |
|
334 | --time time how long the command takes | |
335 | --profile print command execution profile |
|
335 | --profile print command execution profile | |
336 | --version output version information and exit |
|
336 | --version output version information and exit | |
337 | -h --help display help and exit |
|
337 | -h --help display help and exit | |
338 | --hidden consider hidden changesets |
|
338 | --hidden consider hidden changesets | |
339 |
|
339 | |||
340 | [+] marked option can be specified multiple times |
|
340 | [+] marked option can be specified multiple times | |
341 |
|
341 | |||
342 | Test help option with version option |
|
342 | Test help option with version option | |
343 |
|
343 | |||
344 | $ hg add -h --version |
|
344 | $ hg add -h --version | |
345 | Mercurial Distributed SCM (version *) (glob) |
|
345 | Mercurial Distributed SCM (version *) (glob) | |
346 | (see http://mercurial.selenic.com for more information) |
|
346 | (see http://mercurial.selenic.com for more information) | |
347 |
|
347 | |||
348 | Copyright (C) 2005-2012 Matt Mackall and others |
|
348 | Copyright (C) 2005-2012 Matt Mackall and others | |
349 | This is free software; see the source for copying conditions. There is NO |
|
349 | This is free software; see the source for copying conditions. There is NO | |
350 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
350 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
351 |
|
351 | |||
352 | $ hg add --skjdfks |
|
352 | $ hg add --skjdfks | |
353 | hg add: option --skjdfks not recognized |
|
353 | hg add: option --skjdfks not recognized | |
354 | hg add [OPTION]... [FILE]... |
|
354 | hg add [OPTION]... [FILE]... | |
355 |
|
355 | |||
356 | add the specified files on the next commit |
|
356 | add the specified files on the next commit | |
357 |
|
357 | |||
358 | options: |
|
358 | options: | |
359 |
|
359 | |||
360 | -I --include PATTERN [+] include names matching the given patterns |
|
360 | -I --include PATTERN [+] include names matching the given patterns | |
361 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
361 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
362 | -S --subrepos recurse into subrepositories |
|
362 | -S --subrepos recurse into subrepositories | |
363 | -n --dry-run do not perform actions, just print output |
|
363 | -n --dry-run do not perform actions, just print output | |
364 |
|
364 | |||
365 | [+] marked option can be specified multiple times |
|
365 | [+] marked option can be specified multiple times | |
366 |
|
366 | |||
367 | use "hg help add" to show the full help text |
|
367 | use "hg help add" to show the full help text | |
368 | [255] |
|
368 | [255] | |
369 |
|
369 | |||
370 | Test ambiguous command help |
|
370 | Test ambiguous command help | |
371 |
|
371 | |||
372 | $ hg help ad |
|
372 | $ hg help ad | |
373 | list of commands: |
|
373 | list of commands: | |
374 |
|
374 | |||
375 | add add the specified files on the next commit |
|
375 | add add the specified files on the next commit | |
376 | addremove add all new files, delete all missing files |
|
376 | addremove add all new files, delete all missing files | |
377 |
|
377 | |||
378 | use "hg -v help ad" to show builtin aliases and global options |
|
378 | use "hg -v help ad" to show builtin aliases and global options | |
379 |
|
379 | |||
380 | Test command without options |
|
380 | Test command without options | |
381 |
|
381 | |||
382 | $ hg help verify |
|
382 | $ hg help verify | |
383 | hg verify |
|
383 | hg verify | |
384 |
|
384 | |||
385 | verify the integrity of the repository |
|
385 | verify the integrity of the repository | |
386 |
|
386 | |||
387 | Verify the integrity of the current repository. |
|
387 | Verify the integrity of the current repository. | |
388 |
|
388 | |||
389 | This will perform an extensive check of the repository's integrity, |
|
389 | This will perform an extensive check of the repository's integrity, | |
390 | validating the hashes and checksums of each entry in the changelog, |
|
390 | validating the hashes and checksums of each entry in the changelog, | |
391 | manifest, and tracked files, as well as the integrity of their crosslinks |
|
391 | manifest, and tracked files, as well as the integrity of their crosslinks | |
392 | and indices. |
|
392 | and indices. | |
393 |
|
393 | |||
394 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption for more |
|
394 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption for more | |
395 | information about recovery from corruption of the repository. |
|
395 | information about recovery from corruption of the repository. | |
396 |
|
396 | |||
397 | Returns 0 on success, 1 if errors are encountered. |
|
397 | Returns 0 on success, 1 if errors are encountered. | |
398 |
|
398 | |||
399 | use "hg -v help verify" to show the global options |
|
399 | use "hg -v help verify" to show the global options | |
400 |
|
400 | |||
401 | $ hg help diff |
|
401 | $ hg help diff | |
402 | hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... |
|
402 | hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... | |
403 |
|
403 | |||
404 | diff repository (or selected files) |
|
404 | diff repository (or selected files) | |
405 |
|
405 | |||
406 | Show differences between revisions for the specified files. |
|
406 | Show differences between revisions for the specified files. | |
407 |
|
407 | |||
408 | Differences between files are shown using the unified diff format. |
|
408 | Differences between files are shown using the unified diff format. | |
409 |
|
409 | |||
410 | Note: |
|
410 | Note: | |
411 | diff may generate unexpected results for merges, as it will default to |
|
411 | diff may generate unexpected results for merges, as it will default to | |
412 | comparing against the working directory's first parent changeset if no |
|
412 | comparing against the working directory's first parent changeset if no | |
413 | revisions are specified. |
|
413 | revisions are specified. | |
414 |
|
414 | |||
415 | When two revision arguments are given, then changes are shown between |
|
415 | When two revision arguments are given, then changes are shown between | |
416 | those revisions. If only one revision is specified then that revision is |
|
416 | those revisions. If only one revision is specified then that revision is | |
417 | compared to the working directory, and, when no revisions are specified, |
|
417 | compared to the working directory, and, when no revisions are specified, | |
418 | the working directory files are compared to its parent. |
|
418 | the working directory files are compared to its parent. | |
419 |
|
419 | |||
420 | Alternatively you can specify -c/--change with a revision to see the |
|
420 | Alternatively you can specify -c/--change with a revision to see the | |
421 | changes in that changeset relative to its first parent. |
|
421 | changes in that changeset relative to its first parent. | |
422 |
|
422 | |||
423 | Without the -a/--text option, diff will avoid generating diffs of files it |
|
423 | Without the -a/--text option, diff will avoid generating diffs of files it | |
424 | detects as binary. With -a, diff will generate a diff anyway, probably |
|
424 | detects as binary. With -a, diff will generate a diff anyway, probably | |
425 | with undesirable results. |
|
425 | with undesirable results. | |
426 |
|
426 | |||
427 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
427 | Use the -g/--git option to generate diffs in the git extended diff format. | |
428 | For more information, read "hg help diffs". |
|
428 | For more information, read "hg help diffs". | |
429 |
|
429 | |||
430 | Returns 0 on success. |
|
430 | Returns 0 on success. | |
431 |
|
431 | |||
432 | options: |
|
432 | options: | |
433 |
|
433 | |||
434 | -r --rev REV [+] revision |
|
434 | -r --rev REV [+] revision | |
435 | -c --change REV change made by revision |
|
435 | -c --change REV change made by revision | |
436 | -a --text treat all files as text |
|
436 | -a --text treat all files as text | |
437 | -g --git use git extended diff format |
|
437 | -g --git use git extended diff format | |
438 | --nodates omit dates from diff headers |
|
438 | --nodates omit dates from diff headers | |
439 | -p --show-function show which function each change is in |
|
439 | -p --show-function show which function each change is in | |
440 | --reverse produce a diff that undoes the changes |
|
440 | --reverse produce a diff that undoes the changes | |
441 | -w --ignore-all-space ignore white space when comparing lines |
|
441 | -w --ignore-all-space ignore white space when comparing lines | |
442 | -b --ignore-space-change ignore changes in the amount of white space |
|
442 | -b --ignore-space-change ignore changes in the amount of white space | |
443 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
443 | -B --ignore-blank-lines ignore changes whose lines are all blank | |
444 | -U --unified NUM number of lines of context to show |
|
444 | -U --unified NUM number of lines of context to show | |
445 | --stat output diffstat-style summary of changes |
|
445 | --stat output diffstat-style summary of changes | |
446 | -I --include PATTERN [+] include names matching the given patterns |
|
446 | -I --include PATTERN [+] include names matching the given patterns | |
447 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
447 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
448 | -S --subrepos recurse into subrepositories |
|
448 | -S --subrepos recurse into subrepositories | |
449 |
|
449 | |||
450 | [+] marked option can be specified multiple times |
|
450 | [+] marked option can be specified multiple times | |
451 |
|
451 | |||
452 | use "hg -v help diff" to show more complete help and the global options |
|
452 | use "hg -v help diff" to show more complete help and the global options | |
453 |
|
453 | |||
454 | $ hg help status |
|
454 | $ hg help status | |
455 | hg status [OPTION]... [FILE]... |
|
455 | hg status [OPTION]... [FILE]... | |
456 |
|
456 | |||
457 | aliases: st |
|
457 | aliases: st | |
458 |
|
458 | |||
459 | show changed files in the working directory |
|
459 | show changed files in the working directory | |
460 |
|
460 | |||
461 | Show status of files in the repository. If names are given, only files |
|
461 | Show status of files in the repository. If names are given, only files | |
462 | that match are shown. Files that are clean or ignored or the source of a |
|
462 | that match are shown. Files that are clean or ignored or the source of a | |
463 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, |
|
463 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, | |
464 | -C/--copies or -A/--all are given. Unless options described with "show |
|
464 | -C/--copies or -A/--all are given. Unless options described with "show | |
465 | only ..." are given, the options -mardu are used. |
|
465 | only ..." are given, the options -mardu are used. | |
466 |
|
466 | |||
467 | Option -q/--quiet hides untracked (unknown and ignored) files unless |
|
467 | Option -q/--quiet hides untracked (unknown and ignored) files unless | |
468 | explicitly requested with -u/--unknown or -i/--ignored. |
|
468 | explicitly requested with -u/--unknown or -i/--ignored. | |
469 |
|
469 | |||
470 | Note: |
|
470 | Note: | |
471 | status may appear to disagree with diff if permissions have changed or |
|
471 | status may appear to disagree with diff if permissions have changed or | |
472 | a merge has occurred. The standard diff format does not report |
|
472 | a merge has occurred. The standard diff format does not report | |
473 | permission changes and diff only reports changes relative to one merge |
|
473 | permission changes and diff only reports changes relative to one merge | |
474 | parent. |
|
474 | parent. | |
475 |
|
475 | |||
476 | If one revision is given, it is used as the base revision. If two |
|
476 | If one revision is given, it is used as the base revision. If two | |
477 | revisions are given, the differences between them are shown. The --change |
|
477 | revisions are given, the differences between them are shown. The --change | |
478 | option can also be used as a shortcut to list the changed files of a |
|
478 | option can also be used as a shortcut to list the changed files of a | |
479 | revision from its first parent. |
|
479 | revision from its first parent. | |
480 |
|
480 | |||
481 | The codes used to show the status of files are: |
|
481 | The codes used to show the status of files are: | |
482 |
|
482 | |||
483 | M = modified |
|
483 | M = modified | |
484 | A = added |
|
484 | A = added | |
485 | R = removed |
|
485 | R = removed | |
486 | C = clean |
|
486 | C = clean | |
487 | ! = missing (deleted by non-hg command, but still tracked) |
|
487 | ! = missing (deleted by non-hg command, but still tracked) | |
488 | ? = not tracked |
|
488 | ? = not tracked | |
489 | I = ignored |
|
489 | I = ignored | |
490 | = origin of the previous file listed as A (added) |
|
490 | = origin of the previous file listed as A (added) | |
491 |
|
491 | |||
492 | Returns 0 on success. |
|
492 | Returns 0 on success. | |
493 |
|
493 | |||
494 | options: |
|
494 | options: | |
495 |
|
495 | |||
496 | -A --all show status of all files |
|
496 | -A --all show status of all files | |
497 | -m --modified show only modified files |
|
497 | -m --modified show only modified files | |
498 | -a --added show only added files |
|
498 | -a --added show only added files | |
499 | -r --removed show only removed files |
|
499 | -r --removed show only removed files | |
500 | -d --deleted show only deleted (but tracked) files |
|
500 | -d --deleted show only deleted (but tracked) files | |
501 | -c --clean show only files without changes |
|
501 | -c --clean show only files without changes | |
502 | -u --unknown show only unknown (not tracked) files |
|
502 | -u --unknown show only unknown (not tracked) files | |
503 | -i --ignored show only ignored files |
|
503 | -i --ignored show only ignored files | |
504 | -n --no-status hide status prefix |
|
504 | -n --no-status hide status prefix | |
505 | -C --copies show source of copied files |
|
505 | -C --copies show source of copied files | |
506 | -0 --print0 end filenames with NUL, for use with xargs |
|
506 | -0 --print0 end filenames with NUL, for use with xargs | |
507 | --rev REV [+] show difference from revision |
|
507 | --rev REV [+] show difference from revision | |
508 | --change REV list the changed files of a revision |
|
508 | --change REV list the changed files of a revision | |
509 | -I --include PATTERN [+] include names matching the given patterns |
|
509 | -I --include PATTERN [+] include names matching the given patterns | |
510 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
510 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
511 | -S --subrepos recurse into subrepositories |
|
511 | -S --subrepos recurse into subrepositories | |
512 |
|
512 | |||
513 | [+] marked option can be specified multiple times |
|
513 | [+] marked option can be specified multiple times | |
514 |
|
514 | |||
515 | use "hg -v help status" to show more complete help and the global options |
|
515 | use "hg -v help status" to show more complete help and the global options | |
516 |
|
516 | |||
517 | $ hg -q help status |
|
517 | $ hg -q help status | |
518 | hg status [OPTION]... [FILE]... |
|
518 | hg status [OPTION]... [FILE]... | |
519 |
|
519 | |||
520 | show changed files in the working directory |
|
520 | show changed files in the working directory | |
521 |
|
521 | |||
522 | $ hg help foo |
|
522 | $ hg help foo | |
523 | hg: unknown command 'foo' |
|
523 | hg: unknown command 'foo' | |
524 | Mercurial Distributed SCM |
|
524 | Mercurial Distributed SCM | |
525 |
|
525 | |||
526 | basic commands: |
|
526 | basic commands: | |
527 |
|
527 | |||
528 | add add the specified files on the next commit |
|
528 | add add the specified files on the next commit | |
529 | annotate show changeset information by line for each file |
|
529 | annotate show changeset information by line for each file | |
530 | clone make a copy of an existing repository |
|
530 | clone make a copy of an existing repository | |
531 | commit commit the specified files or all outstanding changes |
|
531 | commit commit the specified files or all outstanding changes | |
532 | diff diff repository (or selected files) |
|
532 | diff diff repository (or selected files) | |
533 | export dump the header and diffs for one or more changesets |
|
533 | export dump the header and diffs for one or more changesets | |
534 | forget forget the specified files on the next commit |
|
534 | forget forget the specified files on the next commit | |
535 | init create a new repository in the given directory |
|
535 | init create a new repository in the given directory | |
536 | log show revision history of entire repository or files |
|
536 | log show revision history of entire repository or files | |
537 | merge merge working directory with another revision |
|
537 | merge merge working directory with another revision | |
538 | pull pull changes from the specified source |
|
538 | pull pull changes from the specified source | |
539 | push push changes to the specified destination |
|
539 | push push changes to the specified destination | |
540 | remove remove the specified files on the next commit |
|
540 | remove remove the specified files on the next commit | |
541 | serve start stand-alone webserver |
|
541 | serve start stand-alone webserver | |
542 | status show changed files in the working directory |
|
542 | status show changed files in the working directory | |
543 | summary summarize working directory state |
|
543 | summary summarize working directory state | |
544 | update update working directory (or switch revisions) |
|
544 | update update working directory (or switch revisions) | |
545 |
|
545 | |||
546 | use "hg help" for the full list of commands or "hg -v" for details |
|
546 | use "hg help" for the full list of commands or "hg -v" for details | |
547 | [255] |
|
547 | [255] | |
548 |
|
548 | |||
549 | $ hg skjdfks |
|
549 | $ hg skjdfks | |
550 | hg: unknown command 'skjdfks' |
|
550 | hg: unknown command 'skjdfks' | |
551 | Mercurial Distributed SCM |
|
551 | Mercurial Distributed SCM | |
552 |
|
552 | |||
553 | basic commands: |
|
553 | basic commands: | |
554 |
|
554 | |||
555 | add add the specified files on the next commit |
|
555 | add add the specified files on the next commit | |
556 | annotate show changeset information by line for each file |
|
556 | annotate show changeset information by line for each file | |
557 | clone make a copy of an existing repository |
|
557 | clone make a copy of an existing repository | |
558 | commit commit the specified files or all outstanding changes |
|
558 | commit commit the specified files or all outstanding changes | |
559 | diff diff repository (or selected files) |
|
559 | diff diff repository (or selected files) | |
560 | export dump the header and diffs for one or more changesets |
|
560 | export dump the header and diffs for one or more changesets | |
561 | forget forget the specified files on the next commit |
|
561 | forget forget the specified files on the next commit | |
562 | init create a new repository in the given directory |
|
562 | init create a new repository in the given directory | |
563 | log show revision history of entire repository or files |
|
563 | log show revision history of entire repository or files | |
564 | merge merge working directory with another revision |
|
564 | merge merge working directory with another revision | |
565 | pull pull changes from the specified source |
|
565 | pull pull changes from the specified source | |
566 | push push changes to the specified destination |
|
566 | push push changes to the specified destination | |
567 | remove remove the specified files on the next commit |
|
567 | remove remove the specified files on the next commit | |
568 | serve start stand-alone webserver |
|
568 | serve start stand-alone webserver | |
569 | status show changed files in the working directory |
|
569 | status show changed files in the working directory | |
570 | summary summarize working directory state |
|
570 | summary summarize working directory state | |
571 | update update working directory (or switch revisions) |
|
571 | update update working directory (or switch revisions) | |
572 |
|
572 | |||
573 | use "hg help" for the full list of commands or "hg -v" for details |
|
573 | use "hg help" for the full list of commands or "hg -v" for details | |
574 | [255] |
|
574 | [255] | |
575 |
|
575 | |||
576 | $ cat > helpext.py <<EOF |
|
576 | $ cat > helpext.py <<EOF | |
577 | > import os |
|
577 | > import os | |
578 | > from mercurial import commands |
|
578 | > from mercurial import commands | |
579 | > |
|
579 | > | |
580 | > def nohelp(ui, *args, **kwargs): |
|
580 | > def nohelp(ui, *args, **kwargs): | |
581 | > pass |
|
581 | > pass | |
582 | > |
|
582 | > | |
583 | > cmdtable = { |
|
583 | > cmdtable = { | |
584 | > "nohelp": (nohelp, [], "hg nohelp"), |
|
584 | > "nohelp": (nohelp, [], "hg nohelp"), | |
585 | > } |
|
585 | > } | |
586 | > |
|
586 | > | |
587 | > commands.norepo += ' nohelp' |
|
587 | > commands.norepo += ' nohelp' | |
588 | > EOF |
|
588 | > EOF | |
589 | $ echo '[extensions]' >> $HGRCPATH |
|
589 | $ echo '[extensions]' >> $HGRCPATH | |
590 | $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH |
|
590 | $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH | |
591 |
|
591 | |||
592 | Test command with no help text |
|
592 | Test command with no help text | |
593 |
|
593 | |||
594 | $ hg help nohelp |
|
594 | $ hg help nohelp | |
595 | hg nohelp |
|
595 | hg nohelp | |
596 |
|
596 | |||
597 | (no help text available) |
|
597 | (no help text available) | |
598 |
|
598 | |||
599 | use "hg -v help nohelp" to show the global options |
|
599 | use "hg -v help nohelp" to show the global options | |
600 |
|
600 | |||
601 | $ hg help -k nohelp |
|
601 | $ hg help -k nohelp | |
602 | Commands: |
|
602 | Commands: | |
603 |
|
603 | |||
604 | nohelp hg nohelp |
|
604 | nohelp hg nohelp | |
605 |
|
605 | |||
606 | Extension Commands: |
|
606 | Extension Commands: | |
607 |
|
607 | |||
608 | nohelp (no help text available) |
|
608 | nohelp (no help text available) | |
609 |
|
609 | |||
610 | Test that default list of commands omits extension commands |
|
610 | Test that default list of commands omits extension commands | |
611 |
|
611 | |||
612 | $ hg help |
|
612 | $ hg help | |
613 | Mercurial Distributed SCM |
|
613 | Mercurial Distributed SCM | |
614 |
|
614 | |||
615 | list of commands: |
|
615 | list of commands: | |
616 |
|
616 | |||
617 | add add the specified files on the next commit |
|
617 | add add the specified files on the next commit | |
618 | addremove add all new files, delete all missing files |
|
618 | addremove add all new files, delete all missing files | |
619 | annotate show changeset information by line for each file |
|
619 | annotate show changeset information by line for each file | |
620 | archive create an unversioned archive of a repository revision |
|
620 | archive create an unversioned archive of a repository revision | |
621 | backout reverse effect of earlier changeset |
|
621 | backout reverse effect of earlier changeset | |
622 | bisect subdivision search of changesets |
|
622 | bisect subdivision search of changesets | |
623 | bookmarks track a line of development with movable markers |
|
623 | bookmarks track a line of development with movable markers | |
624 | branch set or show the current branch name |
|
624 | branch set or show the current branch name | |
625 | branches list repository named branches |
|
625 | branches list repository named branches | |
626 | bundle create a changegroup file |
|
626 | bundle create a changegroup file | |
627 | cat output the current or given revision of files |
|
627 | cat output the current or given revision of files | |
628 | clone make a copy of an existing repository |
|
628 | clone make a copy of an existing repository | |
629 | commit commit the specified files or all outstanding changes |
|
629 | commit commit the specified files or all outstanding changes | |
630 | copy mark files as copied for the next commit |
|
630 | copy mark files as copied for the next commit | |
631 | diff diff repository (or selected files) |
|
631 | diff diff repository (or selected files) | |
632 | export dump the header and diffs for one or more changesets |
|
632 | export dump the header and diffs for one or more changesets | |
633 | forget forget the specified files on the next commit |
|
633 | forget forget the specified files on the next commit | |
634 | graft copy changes from other branches onto the current branch |
|
634 | graft copy changes from other branches onto the current branch | |
635 | grep search for a pattern in specified files and revisions |
|
635 | grep search for a pattern in specified files and revisions | |
636 | heads show current repository heads or show branch heads |
|
636 | heads show current repository heads or show branch heads | |
637 | help show help for a given topic or a help overview |
|
637 | help show help for a given topic or a help overview | |
638 | identify identify the working copy or specified revision |
|
638 | identify identify the working copy or specified revision | |
639 | import import an ordered set of patches |
|
639 | import import an ordered set of patches | |
640 | incoming show new changesets found in source |
|
640 | incoming show new changesets found in source | |
641 | init create a new repository in the given directory |
|
641 | init create a new repository in the given directory | |
642 | locate locate files matching specific patterns |
|
642 | locate locate files matching specific patterns | |
643 | log show revision history of entire repository or files |
|
643 | log show revision history of entire repository or files | |
644 | manifest output the current or given revision of the project manifest |
|
644 | manifest output the current or given revision of the project manifest | |
645 | merge merge working directory with another revision |
|
645 | merge merge working directory with another revision | |
646 | outgoing show changesets not found in the destination |
|
646 | outgoing show changesets not found in the destination | |
647 | parents show the parents of the working directory or revision |
|
647 | parents show the parents of the working directory or revision | |
648 | paths show aliases for remote repositories |
|
648 | paths show aliases for remote repositories | |
649 | phase set or show the current phase name |
|
649 | phase set or show the current phase name | |
650 | pull pull changes from the specified source |
|
650 | pull pull changes from the specified source | |
651 | push push changes to the specified destination |
|
651 | push push changes to the specified destination | |
652 | recover roll back an interrupted transaction |
|
652 | recover roll back an interrupted transaction | |
653 | remove remove the specified files on the next commit |
|
653 | remove remove the specified files on the next commit | |
654 | rename rename files; equivalent of copy + remove |
|
654 | rename rename files; equivalent of copy + remove | |
655 | resolve redo merges or set/view the merge status of files |
|
655 | resolve redo merges or set/view the merge status of files | |
656 | revert restore files to their checkout state |
|
656 | revert restore files to their checkout state | |
657 | rollback roll back the last transaction (dangerous) |
|
657 | rollback roll back the last transaction (dangerous) | |
658 | root print the root (top) of the current working directory |
|
658 | root print the root (top) of the current working directory | |
659 | serve start stand-alone webserver |
|
659 | serve start stand-alone webserver | |
660 | showconfig show combined config settings from all hgrc files |
|
660 | showconfig show combined config settings from all hgrc files | |
661 | status show changed files in the working directory |
|
661 | status show changed files in the working directory | |
662 | summary summarize working directory state |
|
662 | summary summarize working directory state | |
663 | tag add one or more tags for the current or given revision |
|
663 | tag add one or more tags for the current or given revision | |
664 | tags list repository tags |
|
664 | tags list repository tags | |
665 | tip show the tip revision |
|
665 | tip show the tip revision | |
666 | unbundle apply one or more changegroup files |
|
666 | unbundle apply one or more changegroup files | |
667 | update update working directory (or switch revisions) |
|
667 | update update working directory (or switch revisions) | |
668 | verify verify the integrity of the repository |
|
668 | verify verify the integrity of the repository | |
669 | version output version and copyright information |
|
669 | version output version and copyright information | |
670 |
|
670 | |||
671 | enabled extensions: |
|
671 | enabled extensions: | |
672 |
|
672 | |||
673 | helpext (no help text available) |
|
673 | helpext (no help text available) | |
674 |
|
674 | |||
675 | additional help topics: |
|
675 | additional help topics: | |
676 |
|
676 | |||
677 | config Configuration Files |
|
677 | config Configuration Files | |
678 | dates Date Formats |
|
678 | dates Date Formats | |
679 | diffs Diff Formats |
|
679 | diffs Diff Formats | |
680 | environment Environment Variables |
|
680 | environment Environment Variables | |
681 | extensions Using Additional Features |
|
681 | extensions Using Additional Features | |
682 | filesets Specifying File Sets |
|
682 | filesets Specifying File Sets | |
683 | glossary Glossary |
|
683 | glossary Glossary | |
684 | hgignore Syntax for Mercurial Ignore Files |
|
684 | hgignore Syntax for Mercurial Ignore Files | |
685 | hgweb Configuring hgweb |
|
685 | hgweb Configuring hgweb | |
686 | merge-tools Merge Tools |
|
686 | merge-tools Merge Tools | |
687 | multirevs Specifying Multiple Revisions |
|
687 | multirevs Specifying Multiple Revisions | |
688 | patterns File Name Patterns |
|
688 | patterns File Name Patterns | |
689 | phases Working with Phases |
|
689 | phases Working with Phases | |
690 | revisions Specifying Single Revisions |
|
690 | revisions Specifying Single Revisions | |
691 | revsets Specifying Revision Sets |
|
691 | revsets Specifying Revision Sets | |
692 | subrepos Subrepositories |
|
692 | subrepos Subrepositories | |
693 | templating Template Usage |
|
693 | templating Template Usage | |
694 | urls URL Paths |
|
694 | urls URL Paths | |
695 |
|
695 | |||
696 | use "hg -v help" to show builtin aliases and global options |
|
696 | use "hg -v help" to show builtin aliases and global options | |
697 |
|
697 | |||
698 |
|
698 | |||
699 |
|
699 | |||
700 | Test list of commands with command with no help text |
|
700 | Test list of commands with command with no help text | |
701 |
|
701 | |||
702 | $ hg help helpext |
|
702 | $ hg help helpext | |
703 | helpext extension - no help text available |
|
703 | helpext extension - no help text available | |
704 |
|
704 | |||
705 | list of commands: |
|
705 | list of commands: | |
706 |
|
706 | |||
707 | nohelp (no help text available) |
|
707 | nohelp (no help text available) | |
708 |
|
708 | |||
709 | use "hg -v help helpext" to show builtin aliases and global options |
|
709 | use "hg -v help helpext" to show builtin aliases and global options | |
710 |
|
710 | |||
711 | Test a help topic |
|
711 | Test a help topic | |
712 |
|
712 | |||
713 | $ hg help revs |
|
713 | $ hg help revs | |
714 | Specifying Single Revisions |
|
714 | Specifying Single Revisions | |
715 |
|
715 | |||
716 | Mercurial supports several ways to specify individual revisions. |
|
716 | Mercurial supports several ways to specify individual revisions. | |
717 |
|
717 | |||
718 | A plain integer is treated as a revision number. Negative integers are |
|
718 | A plain integer is treated as a revision number. Negative integers are | |
719 | treated as sequential offsets from the tip, with -1 denoting the tip, -2 |
|
719 | treated as sequential offsets from the tip, with -1 denoting the tip, -2 | |
720 | denoting the revision prior to the tip, and so forth. |
|
720 | denoting the revision prior to the tip, and so forth. | |
721 |
|
721 | |||
722 | A 40-digit hexadecimal string is treated as a unique revision identifier. |
|
722 | A 40-digit hexadecimal string is treated as a unique revision identifier. | |
723 |
|
723 | |||
724 | A hexadecimal string less than 40 characters long is treated as a unique |
|
724 | A hexadecimal string less than 40 characters long is treated as a unique | |
725 | revision identifier and is referred to as a short-form identifier. A |
|
725 | revision identifier and is referred to as a short-form identifier. A | |
726 | short-form identifier is only valid if it is the prefix of exactly one |
|
726 | short-form identifier is only valid if it is the prefix of exactly one | |
727 | full-length identifier. |
|
727 | full-length identifier. | |
728 |
|
728 | |||
729 | Any other string is treated as a bookmark, tag, or branch name. A bookmark |
|
729 | Any other string is treated as a bookmark, tag, or branch name. A bookmark | |
730 | is a movable pointer to a revision. A tag is a permanent name associated |
|
730 | is a movable pointer to a revision. A tag is a permanent name associated | |
731 | with a revision. A branch name denotes the tipmost revision of that |
|
731 | with a revision. A branch name denotes the tipmost revision of that | |
732 | branch. Bookmark, tag, and branch names must not contain the ":" |
|
732 | branch. Bookmark, tag, and branch names must not contain the ":" | |
733 | character. |
|
733 | character. | |
734 |
|
734 | |||
735 | The reserved name "tip" always identifies the most recent revision. |
|
735 | The reserved name "tip" always identifies the most recent revision. | |
736 |
|
736 | |||
737 | The reserved name "null" indicates the null revision. This is the revision |
|
737 | The reserved name "null" indicates the null revision. This is the revision | |
738 | of an empty repository, and the parent of revision 0. |
|
738 | of an empty repository, and the parent of revision 0. | |
739 |
|
739 | |||
740 | The reserved name "." indicates the working directory parent. If no |
|
740 | The reserved name "." indicates the working directory parent. If no | |
741 | working directory is checked out, it is equivalent to null. If an |
|
741 | working directory is checked out, it is equivalent to null. If an | |
742 | uncommitted merge is in progress, "." is the revision of the first parent. |
|
742 | uncommitted merge is in progress, "." is the revision of the first parent. | |
743 |
|
743 | |||
744 | Test templating help |
|
744 | Test templating help | |
745 |
|
745 | |||
746 | $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) ' |
|
746 | $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) ' | |
747 | desc String. The text of the changeset description. |
|
747 | desc String. The text of the changeset description. | |
748 | diffstat String. Statistics of changes with the following format: |
|
748 | diffstat String. Statistics of changes with the following format: | |
749 | firstline Any text. Returns the first line of text. |
|
749 | firstline Any text. Returns the first line of text. | |
750 | nonempty Any text. Returns '(none)' if the string is empty. |
|
750 | nonempty Any text. Returns '(none)' if the string is empty. | |
751 |
|
751 | |||
752 | Test help hooks |
|
752 | Test help hooks | |
753 |
|
753 | |||
754 | $ cat > helphook1.py <<EOF |
|
754 | $ cat > helphook1.py <<EOF | |
755 | > from mercurial import help |
|
755 | > from mercurial import help | |
756 | > |
|
756 | > | |
757 | > def rewrite(topic, doc): |
|
757 | > def rewrite(topic, doc): | |
758 | > return doc + '\nhelphook1\n' |
|
758 | > return doc + '\nhelphook1\n' | |
759 | > |
|
759 | > | |
760 | > def extsetup(ui): |
|
760 | > def extsetup(ui): | |
761 | > help.addtopichook('revsets', rewrite) |
|
761 | > help.addtopichook('revsets', rewrite) | |
762 | > EOF |
|
762 | > EOF | |
763 | $ cat > helphook2.py <<EOF |
|
763 | $ cat > helphook2.py <<EOF | |
764 | > from mercurial import help |
|
764 | > from mercurial import help | |
765 | > |
|
765 | > | |
766 | > def rewrite(topic, doc): |
|
766 | > def rewrite(topic, doc): | |
767 | > return doc + '\nhelphook2\n' |
|
767 | > return doc + '\nhelphook2\n' | |
768 | > |
|
768 | > | |
769 | > def extsetup(ui): |
|
769 | > def extsetup(ui): | |
770 | > help.addtopichook('revsets', rewrite) |
|
770 | > help.addtopichook('revsets', rewrite) | |
771 | > EOF |
|
771 | > EOF | |
772 | $ echo '[extensions]' >> $HGRCPATH |
|
772 | $ echo '[extensions]' >> $HGRCPATH | |
773 | $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH |
|
773 | $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH | |
774 | $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH |
|
774 | $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH | |
775 | $ hg help revsets | grep helphook |
|
775 | $ hg help revsets | grep helphook | |
776 | helphook1 |
|
776 | helphook1 | |
777 | helphook2 |
|
777 | helphook2 | |
778 |
|
778 | |||
779 | Test keyword search help |
|
779 | Test keyword search help | |
780 |
|
780 | |||
781 | $ hg help -k clone |
|
781 | $ hg help -k clone | |
782 | Topics: |
|
782 | Topics: | |
783 |
|
783 | |||
784 | config Configuration Files |
|
784 | config Configuration Files | |
785 | extensions Using Additional Features |
|
785 | extensions Using Additional Features | |
786 | glossary Glossary |
|
786 | glossary Glossary | |
787 | phases Working with Phases |
|
787 | phases Working with Phases | |
788 | subrepos Subrepositories |
|
788 | subrepos Subrepositories | |
789 | urls URL Paths |
|
789 | urls URL Paths | |
790 |
|
790 | |||
791 | Commands: |
|
791 | Commands: | |
792 |
|
792 | |||
793 | bookmarks track a line of development with movable markers |
|
793 | bookmarks track a line of development with movable markers | |
794 | clone make a copy of an existing repository |
|
794 | clone make a copy of an existing repository | |
795 | paths show aliases for remote repositories |
|
795 | paths show aliases for remote repositories | |
796 | update update working directory (or switch revisions) |
|
796 | update update working directory (or switch revisions) | |
797 |
|
797 | |||
798 | Extensions: |
|
798 | Extensions: | |
799 |
|
799 | |||
800 | relink recreates hardlinks between repository clones |
|
800 | relink recreates hardlinks between repository clones | |
801 |
|
801 | |||
802 | Extension Commands: |
|
802 | Extension Commands: | |
803 |
|
803 | |||
804 | qclone clone main and patch repository at same time |
|
804 | qclone clone main and patch repository at same time | |
805 |
|
805 | |||
806 | Test omit indicating for help |
|
806 | Test omit indicating for help | |
807 |
|
807 | |||
808 | $ cat > addverboseitems.py <<EOF |
|
808 | $ cat > addverboseitems.py <<EOF | |
809 | > '''extension to test omit indicating. |
|
809 | > '''extension to test omit indicating. | |
810 | > |
|
810 | > | |
811 | > This paragraph is never omitted (for extension) |
|
811 | > This paragraph is never omitted (for extension) | |
812 | > |
|
812 | > | |
813 | > .. container:: verbose |
|
813 | > .. container:: verbose | |
814 | > |
|
814 | > | |
815 | > This paragraph is omitted, |
|
815 | > This paragraph is omitted, | |
816 | > if :hg:\`help\` is invoked witout \`\`-v\`\` (for extension) |
|
816 | > if :hg:\`help\` is invoked witout \`\`-v\`\` (for extension) | |
817 | > |
|
817 | > | |
818 | > This paragraph is never omitted, too (for extension) |
|
818 | > This paragraph is never omitted, too (for extension) | |
819 | > ''' |
|
819 | > ''' | |
820 | > |
|
820 | > | |
821 | > from mercurial import help, commands |
|
821 | > from mercurial import help, commands | |
822 | > testtopic = """This paragraph is never omitted (for topic). |
|
822 | > testtopic = """This paragraph is never omitted (for topic). | |
823 | > |
|
823 | > | |
824 | > .. container:: verbose |
|
824 | > .. container:: verbose | |
825 | > |
|
825 | > | |
826 | > This paragraph is omitted, |
|
826 | > This paragraph is omitted, | |
827 | > if :hg:\`help\` is invoked witout \`\`-v\`\` (for topic) |
|
827 | > if :hg:\`help\` is invoked witout \`\`-v\`\` (for topic) | |
828 | > |
|
828 | > | |
829 | > This paragraph is never omitted, too (for topic) |
|
829 | > This paragraph is never omitted, too (for topic) | |
830 | > """ |
|
830 | > """ | |
831 | > def extsetup(ui): |
|
831 | > def extsetup(ui): | |
832 | > help.helptable.append((["topic-containing-verbose"], |
|
832 | > help.helptable.append((["topic-containing-verbose"], | |
833 | > "This is the topic to test omit indicating.", |
|
833 | > "This is the topic to test omit indicating.", | |
834 | > lambda : testtopic)) |
|
834 | > lambda : testtopic)) | |
835 | > EOF |
|
835 | > EOF | |
836 | $ echo '[extensions]' >> $HGRCPATH |
|
836 | $ echo '[extensions]' >> $HGRCPATH | |
837 | $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH |
|
837 | $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH | |
838 | $ hg help addverboseitems |
|
838 | $ hg help addverboseitems | |
839 | addverboseitems extension - extension to test omit indicating. |
|
839 | addverboseitems extension - extension to test omit indicating. | |
840 |
|
840 | |||
841 | This paragraph is never omitted (for extension) |
|
841 | This paragraph is never omitted (for extension) | |
842 |
|
842 | |||
843 | This paragraph is never omitted, too (for extension) |
|
843 | This paragraph is never omitted, too (for extension) | |
844 |
|
844 | |||
845 | use "hg help -v addverboseitems" to show more complete help |
|
845 | use "hg help -v addverboseitems" to show more complete help | |
846 |
|
846 | |||
847 | no commands defined |
|
847 | no commands defined | |
848 | $ hg help -v addverboseitems |
|
848 | $ hg help -v addverboseitems | |
849 | addverboseitems extension - extension to test omit indicating. |
|
849 | addverboseitems extension - extension to test omit indicating. | |
850 |
|
850 | |||
851 | This paragraph is never omitted (for extension) |
|
851 | This paragraph is never omitted (for extension) | |
852 |
|
852 | |||
853 | This paragraph is omitted, if "hg help" is invoked witout "-v" (for extension) |
|
853 | This paragraph is omitted, if "hg help" is invoked witout "-v" (for extension) | |
854 |
|
854 | |||
855 | This paragraph is never omitted, too (for extension) |
|
855 | This paragraph is never omitted, too (for extension) | |
856 |
|
856 | |||
857 | no commands defined |
|
857 | no commands defined | |
858 | $ hg help topic-containing-verbose |
|
858 | $ hg help topic-containing-verbose | |
859 | This is the topic to test omit indicating. |
|
859 | This is the topic to test omit indicating. | |
860 |
|
860 | |||
861 | This paragraph is never omitted (for topic). |
|
861 | This paragraph is never omitted (for topic). | |
862 |
|
862 | |||
863 | This paragraph is never omitted, too (for topic) |
|
863 | This paragraph is never omitted, too (for topic) | |
864 |
|
864 | |||
865 | use "hg help -v topic-containing-verbose" to show more complete help |
|
865 | use "hg help -v topic-containing-verbose" to show more complete help | |
866 | $ hg help -v topic-containing-verbose |
|
866 | $ hg help -v topic-containing-verbose | |
867 | This is the topic to test omit indicating. |
|
867 | This is the topic to test omit indicating. | |
868 |
|
868 | |||
869 | This paragraph is never omitted (for topic). |
|
869 | This paragraph is never omitted (for topic). | |
870 |
|
870 | |||
871 | This paragraph is omitted, if "hg help" is invoked witout "-v" (for topic) |
|
871 | This paragraph is omitted, if "hg help" is invoked witout "-v" (for topic) | |
872 |
|
872 | |||
873 | This paragraph is never omitted, too (for topic) |
|
873 | This paragraph is never omitted, too (for topic) | |
874 |
|
874 | |||
875 | Test usage of section marks in help documents |
|
875 | Test usage of section marks in help documents | |
876 |
|
876 | |||
877 | $ cd "$TESTDIR"/../doc |
|
877 | $ cd "$TESTDIR"/../doc | |
878 | $ python check-seclevel.py |
|
878 | $ python check-seclevel.py | |
|
879 | $ cd $TESTTMP | |||
|
880 | ||||
|
881 | #if serve | |||
|
882 | ||||
|
883 | Test the help pages in hgweb. | |||
|
884 | ||||
|
885 | Dish up an empty repo; serve it cold. | |||
|
886 | ||||
|
887 | $ hg init "$TESTTMP/test" | |||
|
888 | $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid | |||
|
889 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
890 | ||||
|
891 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help" | |||
|
892 | 200 Script output follows | |||
|
893 | ||||
|
894 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
|
895 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |||
|
896 | <head> | |||
|
897 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |||
|
898 | <meta name="robots" content="index, nofollow" /> | |||
|
899 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |||
|
900 | <script type="text/javascript" src="/static/mercurial.js"></script> | |||
|
901 | ||||
|
902 | <title>Help: Index</title> | |||
|
903 | </head> | |||
|
904 | <body> | |||
|
905 | ||||
|
906 | <div class="container"> | |||
|
907 | <div class="menu"> | |||
|
908 | <div class="logo"> | |||
|
909 | <a href="http://mercurial.selenic.com/"> | |||
|
910 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |||
|
911 | </div> | |||
|
912 | <ul> | |||
|
913 | <li><a href="/shortlog">log</a></li> | |||
|
914 | <li><a href="/graph">graph</a></li> | |||
|
915 | <li><a href="/tags">tags</a></li> | |||
|
916 | <li><a href="/bookmarks">bookmarks</a></li> | |||
|
917 | <li><a href="/branches">branches</a></li> | |||
|
918 | </ul> | |||
|
919 | <ul> | |||
|
920 | <li class="active">help</li> | |||
|
921 | </ul> | |||
|
922 | </div> | |||
|
923 | ||||
|
924 | <div class="main"> | |||
|
925 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |||
|
926 | <form class="search" action="/log"> | |||
|
927 | ||||
|
928 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |||
|
929 | <div id="hint">find changesets by author, revision, | |||
|
930 | files, or words in the commit message</div> | |||
|
931 | </form> | |||
|
932 | <table class="bigtable"> | |||
|
933 | <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr> | |||
|
934 | <tr><td><a href="/help/config">config</a></td><td>Configuration Files</td></tr><tr><td><a href="/help/dates">dates</a></td><td>Date Formats</td></tr><tr><td><a href="/help/diffs">diffs</a></td><td>Diff Formats</td></tr><tr><td><a href="/help/environment">environment</a></td><td>Environment Variables</td></tr><tr><td><a href="/help/extensions">extensions</a></td><td>Using Additional Features</td></tr><tr><td><a href="/help/filesets">filesets</a></td><td>Specifying File Sets</td></tr><tr><td><a href="/help/glossary">glossary</a></td><td>Glossary</td></tr><tr><td><a href="/help/hgignore">hgignore</a></td><td>Syntax for Mercurial Ignore Files</td></tr><tr><td><a href="/help/hgweb">hgweb</a></td><td>Configuring hgweb</td></tr><tr><td><a href="/help/merge-tools">merge-tools</a></td><td>Merge Tools</td></tr><tr><td><a href="/help/multirevs">multirevs</a></td><td>Specifying Multiple Revisions</td></tr><tr><td><a href="/help/patterns">patterns</a></td><td>File Name Patterns</td></tr><tr><td><a href="/help/phases">phases</a></td><td>Working with Phases</td></tr><tr><td><a href="/help/revisions">revisions</a></td><td>Specifying Single Revisions</td></tr><tr><td><a href="/help/revsets">revsets</a></td><td>Specifying Revision Sets</td></tr><tr><td><a href="/help/subrepos">subrepos</a></td><td>Subrepositories</td></tr><tr><td><a href="/help/templating">templating</a></td><td>Template Usage</td></tr><tr><td><a href="/help/urls">urls</a></td><td>URL Paths</td></tr><tr><td><a href="/help/topic-containing-verbose">topic-containing-verbose</a></td><td>This is the topic to test omit indicating.</td></tr> | |||
|
935 | ||||
|
936 | <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr> | |||
|
937 | <tr><td><a href="/help/add">add</a></td><td>add the specified files on the next commit</td></tr><tr><td><a href="/help/annotate">annotate</a></td><td>show changeset information by line for each file</td></tr><tr><td><a href="/help/clone">clone</a></td><td>make a copy of an existing repository</td></tr><tr><td><a href="/help/commit">commit</a></td><td>commit the specified files or all outstanding changes</td></tr><tr><td><a href="/help/diff">diff</a></td><td>diff repository (or selected files)</td></tr><tr><td><a href="/help/export">export</a></td><td>dump the header and diffs for one or more changesets</td></tr><tr><td><a href="/help/forget">forget</a></td><td>forget the specified files on the next commit</td></tr><tr><td><a href="/help/init">init</a></td><td>create a new repository in the given directory</td></tr><tr><td><a href="/help/log">log</a></td><td>show revision history of entire repository or files</td></tr><tr><td><a href="/help/merge">merge</a></td><td>merge working directory with another revision</td></tr><tr><td><a href="/help/pull">pull</a></td><td>pull changes from the specified source</td></tr><tr><td><a href="/help/push">push</a></td><td>push changes to the specified destination</td></tr><tr><td><a href="/help/remove">remove</a></td><td>remove the specified files on the next commit</td></tr><tr><td><a href="/help/serve">serve</a></td><td>start stand-alone webserver</td></tr><tr><td><a href="/help/status">status</a></td><td>show changed files in the working directory</td></tr><tr><td><a href="/help/summary">summary</a></td><td>summarize working directory state</td></tr><tr><td><a href="/help/update">update</a></td><td>update working directory (or switch revisions)</td></tr> | |||
|
938 | ||||
|
939 | <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr> | |||
|
940 | <tr><td><a href="/help/addremove">addremove</a></td><td>add all new files, delete all missing files</td></tr><tr><td><a href="/help/archive">archive</a></td><td>create an unversioned archive of a repository revision</td></tr><tr><td><a href="/help/backout">backout</a></td><td>reverse effect of earlier changeset</td></tr><tr><td><a href="/help/bisect">bisect</a></td><td>subdivision search of changesets</td></tr><tr><td><a href="/help/bookmarks">bookmarks</a></td><td>track a line of development with movable markers</td></tr><tr><td><a href="/help/branch">branch</a></td><td>set or show the current branch name</td></tr><tr><td><a href="/help/branches">branches</a></td><td>list repository named branches</td></tr><tr><td><a href="/help/bundle">bundle</a></td><td>create a changegroup file</td></tr><tr><td><a href="/help/cat">cat</a></td><td>output the current or given revision of files</td></tr><tr><td><a href="/help/copy">copy</a></td><td>mark files as copied for the next commit</td></tr><tr><td><a href="/help/graft">graft</a></td><td>copy changes from other branches onto the current branch</td></tr><tr><td><a href="/help/grep">grep</a></td><td>search for a pattern in specified files and revisions</td></tr><tr><td><a href="/help/heads">heads</a></td><td>show current repository heads or show branch heads</td></tr><tr><td><a href="/help/help">help</a></td><td>show help for a given topic or a help overview</td></tr><tr><td><a href="/help/identify">identify</a></td><td>identify the working copy or specified revision</td></tr><tr><td><a href="/help/import">import</a></td><td>import an ordered set of patches</td></tr><tr><td><a href="/help/incoming">incoming</a></td><td>show new changesets found in source</td></tr><tr><td><a href="/help/locate">locate</a></td><td>locate files matching specific patterns</td></tr><tr><td><a href="/help/manifest">manifest</a></td><td>output the current or given revision of the project manifest</td></tr><tr><td><a href="/help/nohelp">nohelp</a></td><td>(no help text available)</td></tr><tr><td><a href="/help/outgoing">outgoing</a></td><td>show changesets not found in the destination</td></tr><tr><td><a href="/help/parents">parents</a></td><td>show the parents of the working directory or revision</td></tr><tr><td><a href="/help/paths">paths</a></td><td>show aliases for remote repositories</td></tr><tr><td><a href="/help/phase">phase</a></td><td>set or show the current phase name</td></tr><tr><td><a href="/help/recover">recover</a></td><td>roll back an interrupted transaction</td></tr><tr><td><a href="/help/rename">rename</a></td><td>rename files; equivalent of copy + remove</td></tr><tr><td><a href="/help/resolve">resolve</a></td><td>redo merges or set/view the merge status of files</td></tr><tr><td><a href="/help/revert">revert</a></td><td>restore files to their checkout state</td></tr><tr><td><a href="/help/rollback">rollback</a></td><td>roll back the last transaction (dangerous)</td></tr><tr><td><a href="/help/root">root</a></td><td>print the root (top) of the current working directory</td></tr><tr><td><a href="/help/showconfig">showconfig</a></td><td>show combined config settings from all hgrc files</td></tr><tr><td><a href="/help/tag">tag</a></td><td>add one or more tags for the current or given revision</td></tr><tr><td><a href="/help/tags">tags</a></td><td>list repository tags</td></tr><tr><td><a href="/help/tip">tip</a></td><td>show the tip revision</td></tr><tr><td><a href="/help/unbundle">unbundle</a></td><td>apply one or more changegroup files</td></tr><tr><td><a href="/help/verify">verify</a></td><td>verify the integrity of the repository</td></tr><tr><td><a href="/help/version">version</a></td><td>output version and copyright information</td></tr> | |||
|
941 | </table> | |||
|
942 | </div> | |||
|
943 | </div> | |||
|
944 | ||||
|
945 | <script type="text/javascript">process_dates()</script> | |||
|
946 | ||||
|
947 | ||||
|
948 | </body> | |||
|
949 | </html> | |||
|
950 | ||||
|
951 | ||||
|
952 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/add" | |||
|
953 | 200 Script output follows | |||
|
954 | ||||
|
955 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
|
956 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |||
|
957 | <head> | |||
|
958 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |||
|
959 | <meta name="robots" content="index, nofollow" /> | |||
|
960 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |||
|
961 | <script type="text/javascript" src="/static/mercurial.js"></script> | |||
|
962 | ||||
|
963 | <title>Help: add</title> | |||
|
964 | </head> | |||
|
965 | <body> | |||
|
966 | ||||
|
967 | <div class="container"> | |||
|
968 | <div class="menu"> | |||
|
969 | <div class="logo"> | |||
|
970 | <a href="http://mercurial.selenic.com/"> | |||
|
971 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |||
|
972 | </div> | |||
|
973 | <ul> | |||
|
974 | <li><a href="/shortlog">log</a></li> | |||
|
975 | <li><a href="/graph">graph</a></li> | |||
|
976 | <li><a href="/tags">tags</a></li> | |||
|
977 | <li><a href="/bookmarks">bookmarks</a></li> | |||
|
978 | <li><a href="/branches">branches</a></li> | |||
|
979 | </ul> | |||
|
980 | <ul> | |||
|
981 | <li class="active"><a href="/help">help</a></li> | |||
|
982 | </ul> | |||
|
983 | </div> | |||
|
984 | ||||
|
985 | <div class="main"> | |||
|
986 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |||
|
987 | <h3>Help: add</h3> | |||
|
988 | ||||
|
989 | <form class="search" action="/log"> | |||
|
990 | ||||
|
991 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |||
|
992 | <div id="hint">find changesets by author, revision, | |||
|
993 | files, or words in the commit message</div> | |||
|
994 | </form> | |||
|
995 | <pre> | |||
|
996 | hg add [OPTION]... [FILE]... | |||
|
997 | ||||
|
998 | add the specified files on the next commit | |||
|
999 | ||||
|
1000 | Schedule files to be version controlled and added to the repository. | |||
|
1001 | ||||
|
1002 | The files will be added to the repository at the next commit. To undo an | |||
|
1003 | add before that, see "hg forget". | |||
|
1004 | ||||
|
1005 | If no names are given, add all files to the repository. | |||
|
1006 | ||||
|
1007 | An example showing how new (unknown) files are added automatically by "hg | |||
|
1008 | add": | |||
|
1009 | ||||
|
1010 | $ ls | |||
|
1011 | foo.c | |||
|
1012 | $ hg status | |||
|
1013 | ? foo.c | |||
|
1014 | $ hg add | |||
|
1015 | adding foo.c | |||
|
1016 | $ hg status | |||
|
1017 | A foo.c | |||
|
1018 | ||||
|
1019 | Returns 0 if all files are successfully added. | |||
|
1020 | ||||
|
1021 | options: | |||
|
1022 | ||||
|
1023 | -I --include PATTERN [+] include names matching the given patterns | |||
|
1024 | -X --exclude PATTERN [+] exclude names matching the given patterns | |||
|
1025 | -S --subrepos recurse into subrepositories | |||
|
1026 | -n --dry-run do not perform actions, just print output | |||
|
1027 | ||||
|
1028 | [+] marked option can be specified multiple times | |||
|
1029 | ||||
|
1030 | global options: | |||
|
1031 | ||||
|
1032 | -R --repository REPO repository root directory or name of overlay bundle | |||
|
1033 | file | |||
|
1034 | --cwd DIR change working directory | |||
|
1035 | -y --noninteractive do not prompt, automatically pick the first choice for | |||
|
1036 | all prompts | |||
|
1037 | -q --quiet suppress output | |||
|
1038 | -v --verbose enable additional output | |||
|
1039 | --config CONFIG [+] set/override config option (use 'section.name=value') | |||
|
1040 | --debug enable debugging output | |||
|
1041 | --debugger start debugger | |||
|
1042 | --encoding ENCODE set the charset encoding (default: ascii) | |||
|
1043 | --encodingmode MODE set the charset encoding mode (default: strict) | |||
|
1044 | --traceback always print a traceback on exception | |||
|
1045 | --time time how long the command takes | |||
|
1046 | --profile print command execution profile | |||
|
1047 | --version output version information and exit | |||
|
1048 | -h --help display help and exit | |||
|
1049 | --hidden consider hidden changesets | |||
|
1050 | ||||
|
1051 | [+] marked option can be specified multiple times | |||
|
1052 | ||||
|
1053 | </pre> | |||
|
1054 | </div> | |||
|
1055 | </div> | |||
|
1056 | ||||
|
1057 | <script type="text/javascript">process_dates()</script> | |||
|
1058 | ||||
|
1059 | ||||
|
1060 | </body> | |||
|
1061 | </html> | |||
|
1062 | ||||
|
1063 | ||||
|
1064 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/remove" | |||
|
1065 | 200 Script output follows | |||
|
1066 | ||||
|
1067 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
|
1068 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |||
|
1069 | <head> | |||
|
1070 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |||
|
1071 | <meta name="robots" content="index, nofollow" /> | |||
|
1072 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |||
|
1073 | <script type="text/javascript" src="/static/mercurial.js"></script> | |||
|
1074 | ||||
|
1075 | <title>Help: remove</title> | |||
|
1076 | </head> | |||
|
1077 | <body> | |||
|
1078 | ||||
|
1079 | <div class="container"> | |||
|
1080 | <div class="menu"> | |||
|
1081 | <div class="logo"> | |||
|
1082 | <a href="http://mercurial.selenic.com/"> | |||
|
1083 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |||
|
1084 | </div> | |||
|
1085 | <ul> | |||
|
1086 | <li><a href="/shortlog">log</a></li> | |||
|
1087 | <li><a href="/graph">graph</a></li> | |||
|
1088 | <li><a href="/tags">tags</a></li> | |||
|
1089 | <li><a href="/bookmarks">bookmarks</a></li> | |||
|
1090 | <li><a href="/branches">branches</a></li> | |||
|
1091 | </ul> | |||
|
1092 | <ul> | |||
|
1093 | <li class="active"><a href="/help">help</a></li> | |||
|
1094 | </ul> | |||
|
1095 | </div> | |||
|
1096 | ||||
|
1097 | <div class="main"> | |||
|
1098 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |||
|
1099 | <h3>Help: remove</h3> | |||
|
1100 | ||||
|
1101 | <form class="search" action="/log"> | |||
|
1102 | ||||
|
1103 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |||
|
1104 | <div id="hint">find changesets by author, revision, | |||
|
1105 | files, or words in the commit message</div> | |||
|
1106 | </form> | |||
|
1107 | <pre> | |||
|
1108 | hg remove [OPTION]... FILE... | |||
|
1109 | ||||
|
1110 | aliases: rm | |||
|
1111 | ||||
|
1112 | remove the specified files on the next commit | |||
|
1113 | ||||
|
1114 | Schedule the indicated files for removal from the current branch. | |||
|
1115 | ||||
|
1116 | This command schedules the files to be removed at the next commit. To undo | |||
|
1117 | a remove before that, see "hg revert". To undo added files, see "hg | |||
|
1118 | forget". | |||
|
1119 | ||||
|
1120 | -A/--after can be used to remove only files that have already been | |||
|
1121 | deleted, -f/--force can be used to force deletion, and -Af can be used to | |||
|
1122 | remove files from the next revision without deleting them from the working | |||
|
1123 | directory. | |||
|
1124 | ||||
|
1125 | The following table details the behavior of remove for different file | |||
|
1126 | states (columns) and option combinations (rows). The file states are Added | |||
|
1127 | [A], Clean [C], Modified [M] and Missing [!] (as reported by "hg status"). | |||
|
1128 | The actions are Warn, Remove (from branch) and Delete (from disk): | |||
|
1129 | ||||
|
1130 | A C M ! | |||
|
1131 | -------------- | |||
|
1132 | none W RD W R | |||
|
1133 | -f R RD RD R | |||
|
1134 | -A W W W R | |||
|
1135 | -Af R R R R | |||
|
1136 | ||||
|
1137 | Note that remove never deletes files in Added [A] state from the working | |||
|
1138 | directory, not even if option --force is specified. | |||
|
1139 | ||||
|
1140 | Returns 0 on success, 1 if any warnings encountered. | |||
|
1141 | ||||
|
1142 | options: | |||
|
1143 | ||||
|
1144 | -A --after record delete for missing files | |||
|
1145 | -f --force remove (and delete) file even if added or modified | |||
|
1146 | -I --include PATTERN [+] include names matching the given patterns | |||
|
1147 | -X --exclude PATTERN [+] exclude names matching the given patterns | |||
|
1148 | ||||
|
1149 | [+] marked option can be specified multiple times | |||
|
1150 | ||||
|
1151 | global options: | |||
|
1152 | ||||
|
1153 | -R --repository REPO repository root directory or name of overlay bundle | |||
|
1154 | file | |||
|
1155 | --cwd DIR change working directory | |||
|
1156 | -y --noninteractive do not prompt, automatically pick the first choice for | |||
|
1157 | all prompts | |||
|
1158 | -q --quiet suppress output | |||
|
1159 | -v --verbose enable additional output | |||
|
1160 | --config CONFIG [+] set/override config option (use 'section.name=value') | |||
|
1161 | --debug enable debugging output | |||
|
1162 | --debugger start debugger | |||
|
1163 | --encoding ENCODE set the charset encoding (default: ascii) | |||
|
1164 | --encodingmode MODE set the charset encoding mode (default: strict) | |||
|
1165 | --traceback always print a traceback on exception | |||
|
1166 | --time time how long the command takes | |||
|
1167 | --profile print command execution profile | |||
|
1168 | --version output version information and exit | |||
|
1169 | -h --help display help and exit | |||
|
1170 | --hidden consider hidden changesets | |||
|
1171 | ||||
|
1172 | [+] marked option can be specified multiple times | |||
|
1173 | ||||
|
1174 | </pre> | |||
|
1175 | </div> | |||
|
1176 | </div> | |||
|
1177 | ||||
|
1178 | <script type="text/javascript">process_dates()</script> | |||
|
1179 | ||||
|
1180 | ||||
|
1181 | </body> | |||
|
1182 | </html> | |||
|
1183 | ||||
|
1184 | ||||
|
1185 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/revisions" | |||
|
1186 | 200 Script output follows | |||
|
1187 | ||||
|
1188 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
|
1189 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |||
|
1190 | <head> | |||
|
1191 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |||
|
1192 | <meta name="robots" content="index, nofollow" /> | |||
|
1193 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |||
|
1194 | <script type="text/javascript" src="/static/mercurial.js"></script> | |||
|
1195 | ||||
|
1196 | <title>Help: revisions</title> | |||
|
1197 | </head> | |||
|
1198 | <body> | |||
|
1199 | ||||
|
1200 | <div class="container"> | |||
|
1201 | <div class="menu"> | |||
|
1202 | <div class="logo"> | |||
|
1203 | <a href="http://mercurial.selenic.com/"> | |||
|
1204 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |||
|
1205 | </div> | |||
|
1206 | <ul> | |||
|
1207 | <li><a href="/shortlog">log</a></li> | |||
|
1208 | <li><a href="/graph">graph</a></li> | |||
|
1209 | <li><a href="/tags">tags</a></li> | |||
|
1210 | <li><a href="/bookmarks">bookmarks</a></li> | |||
|
1211 | <li><a href="/branches">branches</a></li> | |||
|
1212 | </ul> | |||
|
1213 | <ul> | |||
|
1214 | <li class="active"><a href="/help">help</a></li> | |||
|
1215 | </ul> | |||
|
1216 | </div> | |||
|
1217 | ||||
|
1218 | <div class="main"> | |||
|
1219 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |||
|
1220 | <h3>Help: revisions</h3> | |||
|
1221 | ||||
|
1222 | <form class="search" action="/log"> | |||
|
1223 | ||||
|
1224 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |||
|
1225 | <div id="hint">find changesets by author, revision, | |||
|
1226 | files, or words in the commit message</div> | |||
|
1227 | </form> | |||
|
1228 | <pre> | |||
|
1229 | Specifying Single Revisions | |||
|
1230 | ||||
|
1231 | Mercurial supports several ways to specify individual revisions. | |||
|
1232 | ||||
|
1233 | A plain integer is treated as a revision number. Negative integers are | |||
|
1234 | treated as sequential offsets from the tip, with -1 denoting the tip, -2 | |||
|
1235 | denoting the revision prior to the tip, and so forth. | |||
|
1236 | ||||
|
1237 | A 40-digit hexadecimal string is treated as a unique revision identifier. | |||
|
1238 | ||||
|
1239 | A hexadecimal string less than 40 characters long is treated as a unique | |||
|
1240 | revision identifier and is referred to as a short-form identifier. A | |||
|
1241 | short-form identifier is only valid if it is the prefix of exactly one | |||
|
1242 | full-length identifier. | |||
|
1243 | ||||
|
1244 | Any other string is treated as a bookmark, tag, or branch name. A bookmark | |||
|
1245 | is a movable pointer to a revision. A tag is a permanent name associated | |||
|
1246 | with a revision. A branch name denotes the tipmost revision of that | |||
|
1247 | branch. Bookmark, tag, and branch names must not contain the ":" | |||
|
1248 | character. | |||
|
1249 | ||||
|
1250 | The reserved name "tip" always identifies the most recent revision. | |||
|
1251 | ||||
|
1252 | The reserved name "null" indicates the null revision. This is the revision | |||
|
1253 | of an empty repository, and the parent of revision 0. | |||
|
1254 | ||||
|
1255 | The reserved name "." indicates the working directory parent. If no | |||
|
1256 | working directory is checked out, it is equivalent to null. If an | |||
|
1257 | uncommitted merge is in progress, "." is the revision of the first parent. | |||
|
1258 | ||||
|
1259 | </pre> | |||
|
1260 | </div> | |||
|
1261 | </div> | |||
|
1262 | ||||
|
1263 | <script type="text/javascript">process_dates()</script> | |||
|
1264 | ||||
|
1265 | ||||
|
1266 | </body> | |||
|
1267 | </html> | |||
|
1268 | ||||
|
1269 | ||||
|
1270 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |||
|
1271 | ||||
|
1272 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now