##// END OF EJS Templates
test-help: verify that extension keywords appear in help templates...
timeless@mozdev.org -
r26487:3f234db6 default
parent child Browse files
Show More
@@ -1,2370 +1,2375 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 another revision into working directory
17 merge merge another revision into working directory
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 another revision into working directory
38 merge merge another revision into working directory
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 create a new bookmark or list existing bookmarks
58 bookmarks create a new bookmark or list existing bookmarks
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 config show combined config settings from all hgrc files
65 config show combined config settings from all hgrc files
66 copy mark files as copied for the next commit
66 copy mark files as copied for the next commit
67 diff diff repository (or selected files)
67 diff diff repository (or selected files)
68 export dump the header and diffs for one or more changesets
68 export dump the header and diffs for one or more changesets
69 files list tracked files
69 files list tracked files
70 forget forget the specified files on the next commit
70 forget forget the specified files on the next commit
71 graft copy changes from other branches onto the current branch
71 graft copy changes from other branches onto the current branch
72 grep search for a pattern in specified files and revisions
72 grep search for a pattern in specified files and revisions
73 heads show branch heads
73 heads show branch heads
74 help show help for a given topic or a help overview
74 help show help for a given topic or a help overview
75 identify identify the working directory or specified revision
75 identify identify the working directory or specified revision
76 import import an ordered set of patches
76 import import an ordered set of patches
77 incoming show new changesets found in source
77 incoming show new changesets found in source
78 init create a new repository in the given directory
78 init create a new repository in the given directory
79 log show revision history of entire repository or files
79 log show revision history of entire repository or files
80 manifest output the current or given revision of the project manifest
80 manifest output the current or given revision of the project manifest
81 merge merge another revision into working directory
81 merge merge another revision into working directory
82 outgoing show changesets not found in the destination
82 outgoing show changesets not found in the destination
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 root print the root (top) of the current working directory
92 root print the root (top) of the current working directory
93 serve start stand-alone webserver
93 serve start stand-alone webserver
94 status show changed files in the working directory
94 status show changed files in the working directory
95 summary summarize working directory state
95 summary summarize working directory state
96 tag add one or more tags for the current or given revision
96 tag add one or more tags for the current or given revision
97 tags list repository tags
97 tags list repository tags
98 unbundle apply one or more changegroup files
98 unbundle apply one or more changegroup files
99 update update working directory (or switch revisions)
99 update update working directory (or switch revisions)
100 verify verify the integrity of the repository
100 verify verify the integrity of the repository
101 version output version and copyright information
101 version output version and copyright information
102
102
103 additional help topics:
103 additional help topics:
104
104
105 config Configuration Files
105 config Configuration Files
106 dates Date Formats
106 dates Date Formats
107 diffs Diff Formats
107 diffs Diff Formats
108 environment Environment Variables
108 environment Environment Variables
109 extensions Using Additional Features
109 extensions Using Additional Features
110 filesets Specifying File Sets
110 filesets Specifying File Sets
111 glossary Glossary
111 glossary Glossary
112 hgignore Syntax for Mercurial Ignore Files
112 hgignore Syntax for Mercurial Ignore Files
113 hgweb Configuring hgweb
113 hgweb Configuring hgweb
114 merge-tools Merge Tools
114 merge-tools Merge Tools
115 multirevs Specifying Multiple Revisions
115 multirevs Specifying Multiple Revisions
116 patterns File Name Patterns
116 patterns File Name Patterns
117 phases Working with Phases
117 phases Working with Phases
118 revisions Specifying Single Revisions
118 revisions Specifying Single Revisions
119 revsets Specifying Revision Sets
119 revsets Specifying Revision Sets
120 scripting Using Mercurial from scripts and automation
120 scripting Using Mercurial from scripts and automation
121 subrepos Subrepositories
121 subrepos Subrepositories
122 templating Template Usage
122 templating Template Usage
123 urls URL Paths
123 urls URL Paths
124
124
125 (use "hg help -v" to show built-in aliases and global options)
125 (use "hg help -v" to show built-in aliases and global options)
126
126
127 $ hg -q help
127 $ hg -q help
128 add add the specified files on the next commit
128 add add the specified files on the next commit
129 addremove add all new files, delete all missing files
129 addremove add all new files, delete all missing files
130 annotate show changeset information by line for each file
130 annotate show changeset information by line for each file
131 archive create an unversioned archive of a repository revision
131 archive create an unversioned archive of a repository revision
132 backout reverse effect of earlier changeset
132 backout reverse effect of earlier changeset
133 bisect subdivision search of changesets
133 bisect subdivision search of changesets
134 bookmarks create a new bookmark or list existing bookmarks
134 bookmarks create a new bookmark or list existing bookmarks
135 branch set or show the current branch name
135 branch set or show the current branch name
136 branches list repository named branches
136 branches list repository named branches
137 bundle create a changegroup file
137 bundle create a changegroup file
138 cat output the current or given revision of files
138 cat output the current or given revision of files
139 clone make a copy of an existing repository
139 clone make a copy of an existing repository
140 commit commit the specified files or all outstanding changes
140 commit commit the specified files or all outstanding changes
141 config show combined config settings from all hgrc files
141 config show combined config settings from all hgrc files
142 copy mark files as copied for the next commit
142 copy mark files as copied for the next commit
143 diff diff repository (or selected files)
143 diff diff repository (or selected files)
144 export dump the header and diffs for one or more changesets
144 export dump the header and diffs for one or more changesets
145 files list tracked files
145 files list tracked files
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 branch heads
149 heads 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 directory or specified revision
151 identify identify the working directory 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 log show revision history of entire repository or files
155 log show revision history of entire repository or files
156 manifest output the current or given revision of the project manifest
156 manifest output the current or given revision of the project manifest
157 merge merge another revision into working directory
157 merge merge another revision into working directory
158 outgoing show changesets not found in the destination
158 outgoing show changesets not found in the destination
159 paths show aliases for remote repositories
159 paths show aliases for remote repositories
160 phase set or show the current phase name
160 phase set or show the current phase name
161 pull pull changes from the specified source
161 pull pull changes from the specified source
162 push push changes to the specified destination
162 push push changes to the specified destination
163 recover roll back an interrupted transaction
163 recover roll back an interrupted transaction
164 remove remove the specified files on the next commit
164 remove remove the specified files on the next commit
165 rename rename files; equivalent of copy + remove
165 rename rename files; equivalent of copy + remove
166 resolve redo merges or set/view the merge status of files
166 resolve redo merges or set/view the merge status of files
167 revert restore files to their checkout state
167 revert restore files to their checkout state
168 root print the root (top) of the current working directory
168 root print the root (top) of the current working directory
169 serve start stand-alone webserver
169 serve start stand-alone webserver
170 status show changed files in the working directory
170 status show changed files in the working directory
171 summary summarize working directory state
171 summary summarize working directory state
172 tag add one or more tags for the current or given revision
172 tag add one or more tags for the current or given revision
173 tags list repository tags
173 tags list repository tags
174 unbundle apply one or more changegroup files
174 unbundle apply one or more changegroup files
175 update update working directory (or switch revisions)
175 update update working directory (or switch revisions)
176 verify verify the integrity of the repository
176 verify verify the integrity of the repository
177 version output version and copyright information
177 version output version and copyright information
178
178
179 additional help topics:
179 additional help topics:
180
180
181 config Configuration Files
181 config Configuration Files
182 dates Date Formats
182 dates Date Formats
183 diffs Diff Formats
183 diffs Diff Formats
184 environment Environment Variables
184 environment Environment Variables
185 extensions Using Additional Features
185 extensions Using Additional Features
186 filesets Specifying File Sets
186 filesets Specifying File Sets
187 glossary Glossary
187 glossary Glossary
188 hgignore Syntax for Mercurial Ignore Files
188 hgignore Syntax for Mercurial Ignore Files
189 hgweb Configuring hgweb
189 hgweb Configuring hgweb
190 merge-tools Merge Tools
190 merge-tools Merge Tools
191 multirevs Specifying Multiple Revisions
191 multirevs Specifying Multiple Revisions
192 patterns File Name Patterns
192 patterns File Name Patterns
193 phases Working with Phases
193 phases Working with Phases
194 revisions Specifying Single Revisions
194 revisions Specifying Single Revisions
195 revsets Specifying Revision Sets
195 revsets Specifying Revision Sets
196 scripting Using Mercurial from scripts and automation
196 scripting Using Mercurial from scripts and automation
197 subrepos Subrepositories
197 subrepos Subrepositories
198 templating Template Usage
198 templating Template Usage
199 urls URL Paths
199 urls URL Paths
200
200
201 Test extension help:
201 Test extension help:
202 $ hg help extensions --config extensions.rebase= --config extensions.children=
202 $ hg help extensions --config extensions.rebase= --config extensions.children=
203 Using Additional Features
203 Using Additional Features
204 """""""""""""""""""""""""
204 """""""""""""""""""""""""
205
205
206 Mercurial has the ability to add new features through the use of
206 Mercurial has the ability to add new features through the use of
207 extensions. Extensions may add new commands, add options to existing
207 extensions. Extensions may add new commands, add options to existing
208 commands, change the default behavior of commands, or implement hooks.
208 commands, change the default behavior of commands, or implement hooks.
209
209
210 To enable the "foo" extension, either shipped with Mercurial or in the
210 To enable the "foo" extension, either shipped with Mercurial or in the
211 Python search path, create an entry for it in your configuration file,
211 Python search path, create an entry for it in your configuration file,
212 like this:
212 like this:
213
213
214 [extensions]
214 [extensions]
215 foo =
215 foo =
216
216
217 You may also specify the full path to an extension:
217 You may also specify the full path to an extension:
218
218
219 [extensions]
219 [extensions]
220 myfeature = ~/.hgext/myfeature.py
220 myfeature = ~/.hgext/myfeature.py
221
221
222 See "hg help config" for more information on configuration files.
222 See "hg help config" for more information on configuration files.
223
223
224 Extensions are not loaded by default for a variety of reasons: they can
224 Extensions are not loaded by default for a variety of reasons: they can
225 increase startup overhead; they may be meant for advanced usage only; they
225 increase startup overhead; they may be meant for advanced usage only; they
226 may provide potentially dangerous abilities (such as letting you destroy
226 may provide potentially dangerous abilities (such as letting you destroy
227 or modify history); they might not be ready for prime time; or they may
227 or modify history); they might not be ready for prime time; or they may
228 alter some usual behaviors of stock Mercurial. It is thus up to the user
228 alter some usual behaviors of stock Mercurial. It is thus up to the user
229 to activate extensions as needed.
229 to activate extensions as needed.
230
230
231 To explicitly disable an extension enabled in a configuration file of
231 To explicitly disable an extension enabled in a configuration file of
232 broader scope, prepend its path with !:
232 broader scope, prepend its path with !:
233
233
234 [extensions]
234 [extensions]
235 # disabling extension bar residing in /path/to/extension/bar.py
235 # disabling extension bar residing in /path/to/extension/bar.py
236 bar = !/path/to/extension/bar.py
236 bar = !/path/to/extension/bar.py
237 # ditto, but no path was supplied for extension baz
237 # ditto, but no path was supplied for extension baz
238 baz = !
238 baz = !
239
239
240 enabled extensions:
240 enabled extensions:
241
241
242 children command to display child changesets (DEPRECATED)
242 children command to display child changesets (DEPRECATED)
243 rebase command to move sets of revisions to a different ancestor
243 rebase command to move sets of revisions to a different ancestor
244
244
245 disabled extensions:
245 disabled extensions:
246
246
247 acl hooks for controlling repository access
247 acl hooks for controlling repository access
248 blackbox log repository events to a blackbox for debugging
248 blackbox log repository events to a blackbox for debugging
249 bugzilla hooks for integrating with the Bugzilla bug tracker
249 bugzilla hooks for integrating with the Bugzilla bug tracker
250 censor erase file content at a given revision
250 censor erase file content at a given revision
251 churn command to display statistics about repository history
251 churn command to display statistics about repository history
252 color colorize output from some commands
252 color colorize output from some commands
253 convert import revisions from foreign VCS repositories into
253 convert import revisions from foreign VCS repositories into
254 Mercurial
254 Mercurial
255 eol automatically manage newlines in repository files
255 eol automatically manage newlines in repository files
256 extdiff command to allow external programs to compare revisions
256 extdiff command to allow external programs to compare revisions
257 factotum http authentication with factotum
257 factotum http authentication with factotum
258 gpg commands to sign and verify changesets
258 gpg commands to sign and verify changesets
259 hgcia hooks for integrating with the CIA.vc notification service
259 hgcia hooks for integrating with the CIA.vc notification service
260 hgk browse the repository in a graphical way
260 hgk browse the repository in a graphical way
261 highlight syntax highlighting for hgweb (requires Pygments)
261 highlight syntax highlighting for hgweb (requires Pygments)
262 histedit interactive history editing
262 histedit interactive history editing
263 keyword expand keywords in tracked files
263 keyword expand keywords in tracked files
264 largefiles track large binary files
264 largefiles track large binary files
265 mq manage a stack of patches
265 mq manage a stack of patches
266 notify hooks for sending email push notifications
266 notify hooks for sending email push notifications
267 pager browse command output with an external pager
267 pager browse command output with an external pager
268 patchbomb command to send changesets as (a series of) patch emails
268 patchbomb command to send changesets as (a series of) patch emails
269 purge command to delete untracked files from the working
269 purge command to delete untracked files from the working
270 directory
270 directory
271 record commands to interactively select changes for
271 record commands to interactively select changes for
272 commit/qrefresh
272 commit/qrefresh
273 relink recreates hardlinks between repository clones
273 relink recreates hardlinks between repository clones
274 schemes extend schemes with shortcuts to repository swarms
274 schemes extend schemes with shortcuts to repository swarms
275 share share a common history between several working directories
275 share share a common history between several working directories
276 shelve save and restore changes to the working directory
276 shelve save and restore changes to the working directory
277 strip strip changesets and their descendants from history
277 strip strip changesets and their descendants from history
278 transplant command to transplant changesets from another branch
278 transplant command to transplant changesets from another branch
279 win32mbcs allow the use of MBCS paths with problematic encodings
279 win32mbcs allow the use of MBCS paths with problematic encodings
280 zeroconf discover and advertise repositories on the local network
280 zeroconf discover and advertise repositories on the local network
281
282 Verify that extension keywords appear in help templates
283
284 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
285
281 Test short command list with verbose option
286 Test short command list with verbose option
282
287
283 $ hg -v help shortlist
288 $ hg -v help shortlist
284 Mercurial Distributed SCM
289 Mercurial Distributed SCM
285
290
286 basic commands:
291 basic commands:
287
292
288 add add the specified files on the next commit
293 add add the specified files on the next commit
289 annotate, blame
294 annotate, blame
290 show changeset information by line for each file
295 show changeset information by line for each file
291 clone make a copy of an existing repository
296 clone make a copy of an existing repository
292 commit, ci commit the specified files or all outstanding changes
297 commit, ci commit the specified files or all outstanding changes
293 diff diff repository (or selected files)
298 diff diff repository (or selected files)
294 export dump the header and diffs for one or more changesets
299 export dump the header and diffs for one or more changesets
295 forget forget the specified files on the next commit
300 forget forget the specified files on the next commit
296 init create a new repository in the given directory
301 init create a new repository in the given directory
297 log, history show revision history of entire repository or files
302 log, history show revision history of entire repository or files
298 merge merge another revision into working directory
303 merge merge another revision into working directory
299 pull pull changes from the specified source
304 pull pull changes from the specified source
300 push push changes to the specified destination
305 push push changes to the specified destination
301 remove, rm remove the specified files on the next commit
306 remove, rm remove the specified files on the next commit
302 serve start stand-alone webserver
307 serve start stand-alone webserver
303 status, st show changed files in the working directory
308 status, st show changed files in the working directory
304 summary, sum summarize working directory state
309 summary, sum summarize working directory state
305 update, up, checkout, co
310 update, up, checkout, co
306 update working directory (or switch revisions)
311 update working directory (or switch revisions)
307
312
308 global options ([+] can be repeated):
313 global options ([+] can be repeated):
309
314
310 -R --repository REPO repository root directory or name of overlay bundle
315 -R --repository REPO repository root directory or name of overlay bundle
311 file
316 file
312 --cwd DIR change working directory
317 --cwd DIR change working directory
313 -y --noninteractive do not prompt, automatically pick the first choice for
318 -y --noninteractive do not prompt, automatically pick the first choice for
314 all prompts
319 all prompts
315 -q --quiet suppress output
320 -q --quiet suppress output
316 -v --verbose enable additional output
321 -v --verbose enable additional output
317 --config CONFIG [+] set/override config option (use 'section.name=value')
322 --config CONFIG [+] set/override config option (use 'section.name=value')
318 --debug enable debugging output
323 --debug enable debugging output
319 --debugger start debugger
324 --debugger start debugger
320 --encoding ENCODE set the charset encoding (default: ascii)
325 --encoding ENCODE set the charset encoding (default: ascii)
321 --encodingmode MODE set the charset encoding mode (default: strict)
326 --encodingmode MODE set the charset encoding mode (default: strict)
322 --traceback always print a traceback on exception
327 --traceback always print a traceback on exception
323 --time time how long the command takes
328 --time time how long the command takes
324 --profile print command execution profile
329 --profile print command execution profile
325 --version output version information and exit
330 --version output version information and exit
326 -h --help display help and exit
331 -h --help display help and exit
327 --hidden consider hidden changesets
332 --hidden consider hidden changesets
328
333
329 (use "hg help" for the full list of commands)
334 (use "hg help" for the full list of commands)
330
335
331 $ hg add -h
336 $ hg add -h
332 hg add [OPTION]... [FILE]...
337 hg add [OPTION]... [FILE]...
333
338
334 add the specified files on the next commit
339 add the specified files on the next commit
335
340
336 Schedule files to be version controlled and added to the repository.
341 Schedule files to be version controlled and added to the repository.
337
342
338 The files will be added to the repository at the next commit. To undo an
343 The files will be added to the repository at the next commit. To undo an
339 add before that, see "hg forget".
344 add before that, see "hg forget".
340
345
341 If no names are given, add all files to the repository.
346 If no names are given, add all files to the repository.
342
347
343 Returns 0 if all files are successfully added.
348 Returns 0 if all files are successfully added.
344
349
345 options ([+] can be repeated):
350 options ([+] can be repeated):
346
351
347 -I --include PATTERN [+] include names matching the given patterns
352 -I --include PATTERN [+] include names matching the given patterns
348 -X --exclude PATTERN [+] exclude names matching the given patterns
353 -X --exclude PATTERN [+] exclude names matching the given patterns
349 -S --subrepos recurse into subrepositories
354 -S --subrepos recurse into subrepositories
350 -n --dry-run do not perform actions, just print output
355 -n --dry-run do not perform actions, just print output
351
356
352 (some details hidden, use --verbose to show complete help)
357 (some details hidden, use --verbose to show complete help)
353
358
354 Verbose help for add
359 Verbose help for add
355
360
356 $ hg add -hv
361 $ hg add -hv
357 hg add [OPTION]... [FILE]...
362 hg add [OPTION]... [FILE]...
358
363
359 add the specified files on the next commit
364 add the specified files on the next commit
360
365
361 Schedule files to be version controlled and added to the repository.
366 Schedule files to be version controlled and added to the repository.
362
367
363 The files will be added to the repository at the next commit. To undo an
368 The files will be added to the repository at the next commit. To undo an
364 add before that, see "hg forget".
369 add before that, see "hg forget".
365
370
366 If no names are given, add all files to the repository.
371 If no names are given, add all files to the repository.
367
372
368 An example showing how new (unknown) files are added automatically by "hg
373 An example showing how new (unknown) files are added automatically by "hg
369 add":
374 add":
370
375
371 $ ls
376 $ ls
372 foo.c
377 foo.c
373 $ hg status
378 $ hg status
374 ? foo.c
379 ? foo.c
375 $ hg add
380 $ hg add
376 adding foo.c
381 adding foo.c
377 $ hg status
382 $ hg status
378 A foo.c
383 A foo.c
379
384
380 Returns 0 if all files are successfully added.
385 Returns 0 if all files are successfully added.
381
386
382 options ([+] can be repeated):
387 options ([+] can be repeated):
383
388
384 -I --include PATTERN [+] include names matching the given patterns
389 -I --include PATTERN [+] include names matching the given patterns
385 -X --exclude PATTERN [+] exclude names matching the given patterns
390 -X --exclude PATTERN [+] exclude names matching the given patterns
386 -S --subrepos recurse into subrepositories
391 -S --subrepos recurse into subrepositories
387 -n --dry-run do not perform actions, just print output
392 -n --dry-run do not perform actions, just print output
388
393
389 global options ([+] can be repeated):
394 global options ([+] can be repeated):
390
395
391 -R --repository REPO repository root directory or name of overlay bundle
396 -R --repository REPO repository root directory or name of overlay bundle
392 file
397 file
393 --cwd DIR change working directory
398 --cwd DIR change working directory
394 -y --noninteractive do not prompt, automatically pick the first choice for
399 -y --noninteractive do not prompt, automatically pick the first choice for
395 all prompts
400 all prompts
396 -q --quiet suppress output
401 -q --quiet suppress output
397 -v --verbose enable additional output
402 -v --verbose enable additional output
398 --config CONFIG [+] set/override config option (use 'section.name=value')
403 --config CONFIG [+] set/override config option (use 'section.name=value')
399 --debug enable debugging output
404 --debug enable debugging output
400 --debugger start debugger
405 --debugger start debugger
401 --encoding ENCODE set the charset encoding (default: ascii)
406 --encoding ENCODE set the charset encoding (default: ascii)
402 --encodingmode MODE set the charset encoding mode (default: strict)
407 --encodingmode MODE set the charset encoding mode (default: strict)
403 --traceback always print a traceback on exception
408 --traceback always print a traceback on exception
404 --time time how long the command takes
409 --time time how long the command takes
405 --profile print command execution profile
410 --profile print command execution profile
406 --version output version information and exit
411 --version output version information and exit
407 -h --help display help and exit
412 -h --help display help and exit
408 --hidden consider hidden changesets
413 --hidden consider hidden changesets
409
414
410 Test help option with version option
415 Test help option with version option
411
416
412 $ hg add -h --version
417 $ hg add -h --version
413 Mercurial Distributed SCM (version *) (glob)
418 Mercurial Distributed SCM (version *) (glob)
414 (see https://mercurial-scm.org for more information)
419 (see https://mercurial-scm.org for more information)
415
420
416 Copyright (C) 2005-2015 Matt Mackall and others
421 Copyright (C) 2005-2015 Matt Mackall and others
417 This is free software; see the source for copying conditions. There is NO
422 This is free software; see the source for copying conditions. There is NO
418 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
423 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
419
424
420 $ hg add --skjdfks
425 $ hg add --skjdfks
421 hg add: option --skjdfks not recognized
426 hg add: option --skjdfks not recognized
422 hg add [OPTION]... [FILE]...
427 hg add [OPTION]... [FILE]...
423
428
424 add the specified files on the next commit
429 add the specified files on the next commit
425
430
426 options ([+] can be repeated):
431 options ([+] can be repeated):
427
432
428 -I --include PATTERN [+] include names matching the given patterns
433 -I --include PATTERN [+] include names matching the given patterns
429 -X --exclude PATTERN [+] exclude names matching the given patterns
434 -X --exclude PATTERN [+] exclude names matching the given patterns
430 -S --subrepos recurse into subrepositories
435 -S --subrepos recurse into subrepositories
431 -n --dry-run do not perform actions, just print output
436 -n --dry-run do not perform actions, just print output
432
437
433 (use "hg add -h" to show more help)
438 (use "hg add -h" to show more help)
434 [255]
439 [255]
435
440
436 Test ambiguous command help
441 Test ambiguous command help
437
442
438 $ hg help ad
443 $ hg help ad
439 list of commands:
444 list of commands:
440
445
441 add add the specified files on the next commit
446 add add the specified files on the next commit
442 addremove add all new files, delete all missing files
447 addremove add all new files, delete all missing files
443
448
444 (use "hg help -v ad" to show built-in aliases and global options)
449 (use "hg help -v ad" to show built-in aliases and global options)
445
450
446 Test command without options
451 Test command without options
447
452
448 $ hg help verify
453 $ hg help verify
449 hg verify
454 hg verify
450
455
451 verify the integrity of the repository
456 verify the integrity of the repository
452
457
453 Verify the integrity of the current repository.
458 Verify the integrity of the current repository.
454
459
455 This will perform an extensive check of the repository's integrity,
460 This will perform an extensive check of the repository's integrity,
456 validating the hashes and checksums of each entry in the changelog,
461 validating the hashes and checksums of each entry in the changelog,
457 manifest, and tracked files, as well as the integrity of their crosslinks
462 manifest, and tracked files, as well as the integrity of their crosslinks
458 and indices.
463 and indices.
459
464
460 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
465 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
461 information about recovery from corruption of the repository.
466 information about recovery from corruption of the repository.
462
467
463 Returns 0 on success, 1 if errors are encountered.
468 Returns 0 on success, 1 if errors are encountered.
464
469
465 (some details hidden, use --verbose to show complete help)
470 (some details hidden, use --verbose to show complete help)
466
471
467 $ hg help diff
472 $ hg help diff
468 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
473 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
469
474
470 diff repository (or selected files)
475 diff repository (or selected files)
471
476
472 Show differences between revisions for the specified files.
477 Show differences between revisions for the specified files.
473
478
474 Differences between files are shown using the unified diff format.
479 Differences between files are shown using the unified diff format.
475
480
476 Note:
481 Note:
477 diff may generate unexpected results for merges, as it will default to
482 diff may generate unexpected results for merges, as it will default to
478 comparing against the working directory's first parent changeset if no
483 comparing against the working directory's first parent changeset if no
479 revisions are specified.
484 revisions are specified.
480
485
481 When two revision arguments are given, then changes are shown between
486 When two revision arguments are given, then changes are shown between
482 those revisions. If only one revision is specified then that revision is
487 those revisions. If only one revision is specified then that revision is
483 compared to the working directory, and, when no revisions are specified,
488 compared to the working directory, and, when no revisions are specified,
484 the working directory files are compared to its parent.
489 the working directory files are compared to its parent.
485
490
486 Alternatively you can specify -c/--change with a revision to see the
491 Alternatively you can specify -c/--change with a revision to see the
487 changes in that changeset relative to its first parent.
492 changes in that changeset relative to its first parent.
488
493
489 Without the -a/--text option, diff will avoid generating diffs of files it
494 Without the -a/--text option, diff will avoid generating diffs of files it
490 detects as binary. With -a, diff will generate a diff anyway, probably
495 detects as binary. With -a, diff will generate a diff anyway, probably
491 with undesirable results.
496 with undesirable results.
492
497
493 Use the -g/--git option to generate diffs in the git extended diff format.
498 Use the -g/--git option to generate diffs in the git extended diff format.
494 For more information, read "hg help diffs".
499 For more information, read "hg help diffs".
495
500
496 Returns 0 on success.
501 Returns 0 on success.
497
502
498 options ([+] can be repeated):
503 options ([+] can be repeated):
499
504
500 -r --rev REV [+] revision
505 -r --rev REV [+] revision
501 -c --change REV change made by revision
506 -c --change REV change made by revision
502 -a --text treat all files as text
507 -a --text treat all files as text
503 -g --git use git extended diff format
508 -g --git use git extended diff format
504 --nodates omit dates from diff headers
509 --nodates omit dates from diff headers
505 --noprefix omit a/ and b/ prefixes from filenames
510 --noprefix omit a/ and b/ prefixes from filenames
506 -p --show-function show which function each change is in
511 -p --show-function show which function each change is in
507 --reverse produce a diff that undoes the changes
512 --reverse produce a diff that undoes the changes
508 -w --ignore-all-space ignore white space when comparing lines
513 -w --ignore-all-space ignore white space when comparing lines
509 -b --ignore-space-change ignore changes in the amount of white space
514 -b --ignore-space-change ignore changes in the amount of white space
510 -B --ignore-blank-lines ignore changes whose lines are all blank
515 -B --ignore-blank-lines ignore changes whose lines are all blank
511 -U --unified NUM number of lines of context to show
516 -U --unified NUM number of lines of context to show
512 --stat output diffstat-style summary of changes
517 --stat output diffstat-style summary of changes
513 --root DIR produce diffs relative to subdirectory
518 --root DIR produce diffs relative to subdirectory
514 -I --include PATTERN [+] include names matching the given patterns
519 -I --include PATTERN [+] include names matching the given patterns
515 -X --exclude PATTERN [+] exclude names matching the given patterns
520 -X --exclude PATTERN [+] exclude names matching the given patterns
516 -S --subrepos recurse into subrepositories
521 -S --subrepos recurse into subrepositories
517
522
518 (some details hidden, use --verbose to show complete help)
523 (some details hidden, use --verbose to show complete help)
519
524
520 $ hg help status
525 $ hg help status
521 hg status [OPTION]... [FILE]...
526 hg status [OPTION]... [FILE]...
522
527
523 aliases: st
528 aliases: st
524
529
525 show changed files in the working directory
530 show changed files in the working directory
526
531
527 Show status of files in the repository. If names are given, only files
532 Show status of files in the repository. If names are given, only files
528 that match are shown. Files that are clean or ignored or the source of a
533 that match are shown. Files that are clean or ignored or the source of a
529 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
534 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
530 -C/--copies or -A/--all are given. Unless options described with "show
535 -C/--copies or -A/--all are given. Unless options described with "show
531 only ..." are given, the options -mardu are used.
536 only ..." are given, the options -mardu are used.
532
537
533 Option -q/--quiet hides untracked (unknown and ignored) files unless
538 Option -q/--quiet hides untracked (unknown and ignored) files unless
534 explicitly requested with -u/--unknown or -i/--ignored.
539 explicitly requested with -u/--unknown or -i/--ignored.
535
540
536 Note:
541 Note:
537 status may appear to disagree with diff if permissions have changed or
542 status may appear to disagree with diff if permissions have changed or
538 a merge has occurred. The standard diff format does not report
543 a merge has occurred. The standard diff format does not report
539 permission changes and diff only reports changes relative to one merge
544 permission changes and diff only reports changes relative to one merge
540 parent.
545 parent.
541
546
542 If one revision is given, it is used as the base revision. If two
547 If one revision is given, it is used as the base revision. If two
543 revisions are given, the differences between them are shown. The --change
548 revisions are given, the differences between them are shown. The --change
544 option can also be used as a shortcut to list the changed files of a
549 option can also be used as a shortcut to list the changed files of a
545 revision from its first parent.
550 revision from its first parent.
546
551
547 The codes used to show the status of files are:
552 The codes used to show the status of files are:
548
553
549 M = modified
554 M = modified
550 A = added
555 A = added
551 R = removed
556 R = removed
552 C = clean
557 C = clean
553 ! = missing (deleted by non-hg command, but still tracked)
558 ! = missing (deleted by non-hg command, but still tracked)
554 ? = not tracked
559 ? = not tracked
555 I = ignored
560 I = ignored
556 = origin of the previous file (with --copies)
561 = origin of the previous file (with --copies)
557
562
558 Returns 0 on success.
563 Returns 0 on success.
559
564
560 options ([+] can be repeated):
565 options ([+] can be repeated):
561
566
562 -A --all show status of all files
567 -A --all show status of all files
563 -m --modified show only modified files
568 -m --modified show only modified files
564 -a --added show only added files
569 -a --added show only added files
565 -r --removed show only removed files
570 -r --removed show only removed files
566 -d --deleted show only deleted (but tracked) files
571 -d --deleted show only deleted (but tracked) files
567 -c --clean show only files without changes
572 -c --clean show only files without changes
568 -u --unknown show only unknown (not tracked) files
573 -u --unknown show only unknown (not tracked) files
569 -i --ignored show only ignored files
574 -i --ignored show only ignored files
570 -n --no-status hide status prefix
575 -n --no-status hide status prefix
571 -C --copies show source of copied files
576 -C --copies show source of copied files
572 -0 --print0 end filenames with NUL, for use with xargs
577 -0 --print0 end filenames with NUL, for use with xargs
573 --rev REV [+] show difference from revision
578 --rev REV [+] show difference from revision
574 --change REV list the changed files of a revision
579 --change REV list the changed files of a revision
575 -I --include PATTERN [+] include names matching the given patterns
580 -I --include PATTERN [+] include names matching the given patterns
576 -X --exclude PATTERN [+] exclude names matching the given patterns
581 -X --exclude PATTERN [+] exclude names matching the given patterns
577 -S --subrepos recurse into subrepositories
582 -S --subrepos recurse into subrepositories
578
583
579 (some details hidden, use --verbose to show complete help)
584 (some details hidden, use --verbose to show complete help)
580
585
581 $ hg -q help status
586 $ hg -q help status
582 hg status [OPTION]... [FILE]...
587 hg status [OPTION]... [FILE]...
583
588
584 show changed files in the working directory
589 show changed files in the working directory
585
590
586 $ hg help foo
591 $ hg help foo
587 abort: no such help topic: foo
592 abort: no such help topic: foo
588 (try "hg help --keyword foo")
593 (try "hg help --keyword foo")
589 [255]
594 [255]
590
595
591 $ hg skjdfks
596 $ hg skjdfks
592 hg: unknown command 'skjdfks'
597 hg: unknown command 'skjdfks'
593 Mercurial Distributed SCM
598 Mercurial Distributed SCM
594
599
595 basic commands:
600 basic commands:
596
601
597 add add the specified files on the next commit
602 add add the specified files on the next commit
598 annotate show changeset information by line for each file
603 annotate show changeset information by line for each file
599 clone make a copy of an existing repository
604 clone make a copy of an existing repository
600 commit commit the specified files or all outstanding changes
605 commit commit the specified files or all outstanding changes
601 diff diff repository (or selected files)
606 diff diff repository (or selected files)
602 export dump the header and diffs for one or more changesets
607 export dump the header and diffs for one or more changesets
603 forget forget the specified files on the next commit
608 forget forget the specified files on the next commit
604 init create a new repository in the given directory
609 init create a new repository in the given directory
605 log show revision history of entire repository or files
610 log show revision history of entire repository or files
606 merge merge another revision into working directory
611 merge merge another revision into working directory
607 pull pull changes from the specified source
612 pull pull changes from the specified source
608 push push changes to the specified destination
613 push push changes to the specified destination
609 remove remove the specified files on the next commit
614 remove remove the specified files on the next commit
610 serve start stand-alone webserver
615 serve start stand-alone webserver
611 status show changed files in the working directory
616 status show changed files in the working directory
612 summary summarize working directory state
617 summary summarize working directory state
613 update update working directory (or switch revisions)
618 update update working directory (or switch revisions)
614
619
615 (use "hg help" for the full list of commands or "hg -v" for details)
620 (use "hg help" for the full list of commands or "hg -v" for details)
616 [255]
621 [255]
617
622
618
623
619 Make sure that we don't run afoul of the help system thinking that
624 Make sure that we don't run afoul of the help system thinking that
620 this is a section and erroring out weirdly.
625 this is a section and erroring out weirdly.
621
626
622 $ hg .log
627 $ hg .log
623 hg: unknown command '.log'
628 hg: unknown command '.log'
624 (did you mean one of log?)
629 (did you mean one of log?)
625 [255]
630 [255]
626
631
627 $ hg log.
632 $ hg log.
628 hg: unknown command 'log.'
633 hg: unknown command 'log.'
629 (did you mean one of log?)
634 (did you mean one of log?)
630 [255]
635 [255]
631 $ hg pu.lh
636 $ hg pu.lh
632 hg: unknown command 'pu.lh'
637 hg: unknown command 'pu.lh'
633 (did you mean one of pull, push?)
638 (did you mean one of pull, push?)
634 [255]
639 [255]
635
640
636 $ cat > helpext.py <<EOF
641 $ cat > helpext.py <<EOF
637 > import os
642 > import os
638 > from mercurial import cmdutil, commands
643 > from mercurial import cmdutil, commands
639 >
644 >
640 > cmdtable = {}
645 > cmdtable = {}
641 > command = cmdutil.command(cmdtable)
646 > command = cmdutil.command(cmdtable)
642 >
647 >
643 > @command('nohelp',
648 > @command('nohelp',
644 > [('', 'longdesc', 3, 'x'*90),
649 > [('', 'longdesc', 3, 'x'*90),
645 > ('n', '', None, 'normal desc'),
650 > ('n', '', None, 'normal desc'),
646 > ('', 'newline', '', 'line1\nline2')],
651 > ('', 'newline', '', 'line1\nline2')],
647 > 'hg nohelp',
652 > 'hg nohelp',
648 > norepo=True)
653 > norepo=True)
649 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
654 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
650 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
655 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
651 > def nohelp(ui, *args, **kwargs):
656 > def nohelp(ui, *args, **kwargs):
652 > pass
657 > pass
653 >
658 >
654 > EOF
659 > EOF
655 $ echo '[extensions]' >> $HGRCPATH
660 $ echo '[extensions]' >> $HGRCPATH
656 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
661 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
657
662
658 Test command with no help text
663 Test command with no help text
659
664
660 $ hg help nohelp
665 $ hg help nohelp
661 hg nohelp
666 hg nohelp
662
667
663 (no help text available)
668 (no help text available)
664
669
665 options:
670 options:
666
671
667 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
672 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
668 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
673 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
669 -n -- normal desc
674 -n -- normal desc
670 --newline VALUE line1 line2
675 --newline VALUE line1 line2
671
676
672 (some details hidden, use --verbose to show complete help)
677 (some details hidden, use --verbose to show complete help)
673
678
674 $ hg help -k nohelp
679 $ hg help -k nohelp
675 Commands:
680 Commands:
676
681
677 nohelp hg nohelp
682 nohelp hg nohelp
678
683
679 Extension Commands:
684 Extension Commands:
680
685
681 nohelp (no help text available)
686 nohelp (no help text available)
682
687
683 Test that default list of commands omits extension commands
688 Test that default list of commands omits extension commands
684
689
685 $ hg help
690 $ hg help
686 Mercurial Distributed SCM
691 Mercurial Distributed SCM
687
692
688 list of commands:
693 list of commands:
689
694
690 add add the specified files on the next commit
695 add add the specified files on the next commit
691 addremove add all new files, delete all missing files
696 addremove add all new files, delete all missing files
692 annotate show changeset information by line for each file
697 annotate show changeset information by line for each file
693 archive create an unversioned archive of a repository revision
698 archive create an unversioned archive of a repository revision
694 backout reverse effect of earlier changeset
699 backout reverse effect of earlier changeset
695 bisect subdivision search of changesets
700 bisect subdivision search of changesets
696 bookmarks create a new bookmark or list existing bookmarks
701 bookmarks create a new bookmark or list existing bookmarks
697 branch set or show the current branch name
702 branch set or show the current branch name
698 branches list repository named branches
703 branches list repository named branches
699 bundle create a changegroup file
704 bundle create a changegroup file
700 cat output the current or given revision of files
705 cat output the current or given revision of files
701 clone make a copy of an existing repository
706 clone make a copy of an existing repository
702 commit commit the specified files or all outstanding changes
707 commit commit the specified files or all outstanding changes
703 config show combined config settings from all hgrc files
708 config show combined config settings from all hgrc files
704 copy mark files as copied for the next commit
709 copy mark files as copied for the next commit
705 diff diff repository (or selected files)
710 diff diff repository (or selected files)
706 export dump the header and diffs for one or more changesets
711 export dump the header and diffs for one or more changesets
707 files list tracked files
712 files list tracked files
708 forget forget the specified files on the next commit
713 forget forget the specified files on the next commit
709 graft copy changes from other branches onto the current branch
714 graft copy changes from other branches onto the current branch
710 grep search for a pattern in specified files and revisions
715 grep search for a pattern in specified files and revisions
711 heads show branch heads
716 heads show branch heads
712 help show help for a given topic or a help overview
717 help show help for a given topic or a help overview
713 identify identify the working directory or specified revision
718 identify identify the working directory or specified revision
714 import import an ordered set of patches
719 import import an ordered set of patches
715 incoming show new changesets found in source
720 incoming show new changesets found in source
716 init create a new repository in the given directory
721 init create a new repository in the given directory
717 log show revision history of entire repository or files
722 log show revision history of entire repository or files
718 manifest output the current or given revision of the project manifest
723 manifest output the current or given revision of the project manifest
719 merge merge another revision into working directory
724 merge merge another revision into working directory
720 outgoing show changesets not found in the destination
725 outgoing show changesets not found in the destination
721 paths show aliases for remote repositories
726 paths show aliases for remote repositories
722 phase set or show the current phase name
727 phase set or show the current phase name
723 pull pull changes from the specified source
728 pull pull changes from the specified source
724 push push changes to the specified destination
729 push push changes to the specified destination
725 recover roll back an interrupted transaction
730 recover roll back an interrupted transaction
726 remove remove the specified files on the next commit
731 remove remove the specified files on the next commit
727 rename rename files; equivalent of copy + remove
732 rename rename files; equivalent of copy + remove
728 resolve redo merges or set/view the merge status of files
733 resolve redo merges or set/view the merge status of files
729 revert restore files to their checkout state
734 revert restore files to their checkout state
730 root print the root (top) of the current working directory
735 root print the root (top) of the current working directory
731 serve start stand-alone webserver
736 serve start stand-alone webserver
732 status show changed files in the working directory
737 status show changed files in the working directory
733 summary summarize working directory state
738 summary summarize working directory state
734 tag add one or more tags for the current or given revision
739 tag add one or more tags for the current or given revision
735 tags list repository tags
740 tags list repository tags
736 unbundle apply one or more changegroup files
741 unbundle apply one or more changegroup files
737 update update working directory (or switch revisions)
742 update update working directory (or switch revisions)
738 verify verify the integrity of the repository
743 verify verify the integrity of the repository
739 version output version and copyright information
744 version output version and copyright information
740
745
741 enabled extensions:
746 enabled extensions:
742
747
743 helpext (no help text available)
748 helpext (no help text available)
744
749
745 additional help topics:
750 additional help topics:
746
751
747 config Configuration Files
752 config Configuration Files
748 dates Date Formats
753 dates Date Formats
749 diffs Diff Formats
754 diffs Diff Formats
750 environment Environment Variables
755 environment Environment Variables
751 extensions Using Additional Features
756 extensions Using Additional Features
752 filesets Specifying File Sets
757 filesets Specifying File Sets
753 glossary Glossary
758 glossary Glossary
754 hgignore Syntax for Mercurial Ignore Files
759 hgignore Syntax for Mercurial Ignore Files
755 hgweb Configuring hgweb
760 hgweb Configuring hgweb
756 merge-tools Merge Tools
761 merge-tools Merge Tools
757 multirevs Specifying Multiple Revisions
762 multirevs Specifying Multiple Revisions
758 patterns File Name Patterns
763 patterns File Name Patterns
759 phases Working with Phases
764 phases Working with Phases
760 revisions Specifying Single Revisions
765 revisions Specifying Single Revisions
761 revsets Specifying Revision Sets
766 revsets Specifying Revision Sets
762 scripting Using Mercurial from scripts and automation
767 scripting Using Mercurial from scripts and automation
763 subrepos Subrepositories
768 subrepos Subrepositories
764 templating Template Usage
769 templating Template Usage
765 urls URL Paths
770 urls URL Paths
766
771
767 (use "hg help -v" to show built-in aliases and global options)
772 (use "hg help -v" to show built-in aliases and global options)
768
773
769
774
770 Test list of internal help commands
775 Test list of internal help commands
771
776
772 $ hg help debug
777 $ hg help debug
773 debug commands (internal and unsupported):
778 debug commands (internal and unsupported):
774
779
775 debugancestor
780 debugancestor
776 find the ancestor revision of two revisions in a given index
781 find the ancestor revision of two revisions in a given index
777 debugbuilddag
782 debugbuilddag
778 builds a repo with a given DAG from scratch in the current
783 builds a repo with a given DAG from scratch in the current
779 empty repo
784 empty repo
780 debugbundle lists the contents of a bundle
785 debugbundle lists the contents of a bundle
781 debugcheckstate
786 debugcheckstate
782 validate the correctness of the current dirstate
787 validate the correctness of the current dirstate
783 debugcommands
788 debugcommands
784 list all available commands and options
789 list all available commands and options
785 debugcomplete
790 debugcomplete
786 returns the completion list associated with the given command
791 returns the completion list associated with the given command
787 debugdag format the changelog or an index DAG as a concise textual
792 debugdag format the changelog or an index DAG as a concise textual
788 description
793 description
789 debugdata dump the contents of a data file revision
794 debugdata dump the contents of a data file revision
790 debugdate parse and display a date
795 debugdate parse and display a date
791 debugdirstate
796 debugdirstate
792 show the contents of the current dirstate
797 show the contents of the current dirstate
793 debugdiscovery
798 debugdiscovery
794 runs the changeset discovery protocol in isolation
799 runs the changeset discovery protocol in isolation
795 debugextensions
800 debugextensions
796 show information about active extensions
801 show information about active extensions
797 debugfileset parse and apply a fileset specification
802 debugfileset parse and apply a fileset specification
798 debugfsinfo show information detected about current filesystem
803 debugfsinfo show information detected about current filesystem
799 debuggetbundle
804 debuggetbundle
800 retrieves a bundle from a repo
805 retrieves a bundle from a repo
801 debugignore display the combined ignore pattern
806 debugignore display the combined ignore pattern
802 debugindex dump the contents of an index file
807 debugindex dump the contents of an index file
803 debugindexdot
808 debugindexdot
804 dump an index DAG as a graphviz dot file
809 dump an index DAG as a graphviz dot file
805 debuginstall test Mercurial installation
810 debuginstall test Mercurial installation
806 debugknown test whether node ids are known to a repo
811 debugknown test whether node ids are known to a repo
807 debuglocks show or modify state of locks
812 debuglocks show or modify state of locks
808 debugnamecomplete
813 debugnamecomplete
809 complete "names" - tags, open branch names, bookmark names
814 complete "names" - tags, open branch names, bookmark names
810 debugobsolete
815 debugobsolete
811 create arbitrary obsolete marker
816 create arbitrary obsolete marker
812 debugoptDEP (no help text available)
817 debugoptDEP (no help text available)
813 debugoptEXP (no help text available)
818 debugoptEXP (no help text available)
814 debugpathcomplete
819 debugpathcomplete
815 complete part or all of a tracked path
820 complete part or all of a tracked path
816 debugpushkey access the pushkey key/value protocol
821 debugpushkey access the pushkey key/value protocol
817 debugpvec (no help text available)
822 debugpvec (no help text available)
818 debugrebuilddirstate
823 debugrebuilddirstate
819 rebuild the dirstate as it would look like for the given
824 rebuild the dirstate as it would look like for the given
820 revision
825 revision
821 debugrebuildfncache
826 debugrebuildfncache
822 rebuild the fncache file
827 rebuild the fncache file
823 debugrename dump rename information
828 debugrename dump rename information
824 debugrevlog show data and statistics about a revlog
829 debugrevlog show data and statistics about a revlog
825 debugrevspec parse and apply a revision specification
830 debugrevspec parse and apply a revision specification
826 debugsetparents
831 debugsetparents
827 manually set the parents of the current working directory
832 manually set the parents of the current working directory
828 debugsub (no help text available)
833 debugsub (no help text available)
829 debugsuccessorssets
834 debugsuccessorssets
830 show set of successors for revision
835 show set of successors for revision
831 debugwalk show how files match on given patterns
836 debugwalk show how files match on given patterns
832 debugwireargs
837 debugwireargs
833 (no help text available)
838 (no help text available)
834
839
835 (use "hg help -v debug" to show built-in aliases and global options)
840 (use "hg help -v debug" to show built-in aliases and global options)
836
841
837
842
838 Test list of commands with command with no help text
843 Test list of commands with command with no help text
839
844
840 $ hg help helpext
845 $ hg help helpext
841 helpext extension - no help text available
846 helpext extension - no help text available
842
847
843 list of commands:
848 list of commands:
844
849
845 nohelp (no help text available)
850 nohelp (no help text available)
846
851
847 (use "hg help -v helpext" to show built-in aliases and global options)
852 (use "hg help -v helpext" to show built-in aliases and global options)
848
853
849
854
850 test deprecated and experimental options are hidden in command help
855 test deprecated and experimental options are hidden in command help
851 $ hg help debugoptDEP
856 $ hg help debugoptDEP
852 hg debugoptDEP
857 hg debugoptDEP
853
858
854 (no help text available)
859 (no help text available)
855
860
856 options:
861 options:
857
862
858 (some details hidden, use --verbose to show complete help)
863 (some details hidden, use --verbose to show complete help)
859
864
860 $ hg help debugoptEXP
865 $ hg help debugoptEXP
861 hg debugoptEXP
866 hg debugoptEXP
862
867
863 (no help text available)
868 (no help text available)
864
869
865 options:
870 options:
866
871
867 (some details hidden, use --verbose to show complete help)
872 (some details hidden, use --verbose to show complete help)
868
873
869 test deprecated and experimental options is shown with -v
874 test deprecated and experimental options is shown with -v
870 $ hg help -v debugoptDEP | grep dopt
875 $ hg help -v debugoptDEP | grep dopt
871 --dopt option is (DEPRECATED)
876 --dopt option is (DEPRECATED)
872 $ hg help -v debugoptEXP | grep eopt
877 $ hg help -v debugoptEXP | grep eopt
873 --eopt option is (EXPERIMENTAL)
878 --eopt option is (EXPERIMENTAL)
874
879
875 #if gettext
880 #if gettext
876 test deprecated option is hidden with translation with untranslated description
881 test deprecated option is hidden with translation with untranslated description
877 (use many globy for not failing on changed transaction)
882 (use many globy for not failing on changed transaction)
878 $ LANGUAGE=sv hg help debugoptDEP
883 $ LANGUAGE=sv hg help debugoptDEP
879 hg debugoptDEP
884 hg debugoptDEP
880
885
881 (*) (glob)
886 (*) (glob)
882
887
883 options:
888 options:
884
889
885 (some details hidden, use --verbose to show complete help)
890 (some details hidden, use --verbose to show complete help)
886 #endif
891 #endif
887
892
888 Test commands that collide with topics (issue4240)
893 Test commands that collide with topics (issue4240)
889
894
890 $ hg config -hq
895 $ hg config -hq
891 hg config [-u] [NAME]...
896 hg config [-u] [NAME]...
892
897
893 show combined config settings from all hgrc files
898 show combined config settings from all hgrc files
894 $ hg showconfig -hq
899 $ hg showconfig -hq
895 hg config [-u] [NAME]...
900 hg config [-u] [NAME]...
896
901
897 show combined config settings from all hgrc files
902 show combined config settings from all hgrc files
898
903
899 Test a help topic
904 Test a help topic
900
905
901 $ hg help revs
906 $ hg help revs
902 Specifying Single Revisions
907 Specifying Single Revisions
903 """""""""""""""""""""""""""
908 """""""""""""""""""""""""""
904
909
905 Mercurial supports several ways to specify individual revisions.
910 Mercurial supports several ways to specify individual revisions.
906
911
907 A plain integer is treated as a revision number. Negative integers are
912 A plain integer is treated as a revision number. Negative integers are
908 treated as sequential offsets from the tip, with -1 denoting the tip, -2
913 treated as sequential offsets from the tip, with -1 denoting the tip, -2
909 denoting the revision prior to the tip, and so forth.
914 denoting the revision prior to the tip, and so forth.
910
915
911 A 40-digit hexadecimal string is treated as a unique revision identifier.
916 A 40-digit hexadecimal string is treated as a unique revision identifier.
912
917
913 A hexadecimal string less than 40 characters long is treated as a unique
918 A hexadecimal string less than 40 characters long is treated as a unique
914 revision identifier and is referred to as a short-form identifier. A
919 revision identifier and is referred to as a short-form identifier. A
915 short-form identifier is only valid if it is the prefix of exactly one
920 short-form identifier is only valid if it is the prefix of exactly one
916 full-length identifier.
921 full-length identifier.
917
922
918 Any other string is treated as a bookmark, tag, or branch name. A bookmark
923 Any other string is treated as a bookmark, tag, or branch name. A bookmark
919 is a movable pointer to a revision. A tag is a permanent name associated
924 is a movable pointer to a revision. A tag is a permanent name associated
920 with a revision. A branch name denotes the tipmost open branch head of
925 with a revision. A branch name denotes the tipmost open branch head of
921 that branch - or if they are all closed, the tipmost closed head of the
926 that branch - or if they are all closed, the tipmost closed head of the
922 branch. Bookmark, tag, and branch names must not contain the ":"
927 branch. Bookmark, tag, and branch names must not contain the ":"
923 character.
928 character.
924
929
925 The reserved name "tip" always identifies the most recent revision.
930 The reserved name "tip" always identifies the most recent revision.
926
931
927 The reserved name "null" indicates the null revision. This is the revision
932 The reserved name "null" indicates the null revision. This is the revision
928 of an empty repository, and the parent of revision 0.
933 of an empty repository, and the parent of revision 0.
929
934
930 The reserved name "." indicates the working directory parent. If no
935 The reserved name "." indicates the working directory parent. If no
931 working directory is checked out, it is equivalent to null. If an
936 working directory is checked out, it is equivalent to null. If an
932 uncommitted merge is in progress, "." is the revision of the first parent.
937 uncommitted merge is in progress, "." is the revision of the first parent.
933
938
934 Test repeated config section name
939 Test repeated config section name
935
940
936 $ hg help config.host
941 $ hg help config.host
937 "http_proxy.host"
942 "http_proxy.host"
938 Host name and (optional) port of the proxy server, for example
943 Host name and (optional) port of the proxy server, for example
939 "myproxy:8000".
944 "myproxy:8000".
940
945
941 "smtp.host"
946 "smtp.host"
942 Host name of mail server, e.g. "mail.example.com".
947 Host name of mail server, e.g. "mail.example.com".
943
948
944 Unrelated trailing paragraphs shouldn't be included
949 Unrelated trailing paragraphs shouldn't be included
945
950
946 $ hg help config.extramsg | grep '^$'
951 $ hg help config.extramsg | grep '^$'
947
952
948
953
949 Test capitalized section name
954 Test capitalized section name
950
955
951 $ hg help scripting.HGPLAIN > /dev/null
956 $ hg help scripting.HGPLAIN > /dev/null
952
957
953 Help subsection:
958 Help subsection:
954
959
955 $ hg help config.charsets |grep "Email example:" > /dev/null
960 $ hg help config.charsets |grep "Email example:" > /dev/null
956 [1]
961 [1]
957
962
958 Show nested definitions
963 Show nested definitions
959 ("profiling.type"[break]"ls"[break]"stat"[break])
964 ("profiling.type"[break]"ls"[break]"stat"[break])
960
965
961 $ hg help config.type | egrep '^$'|wc -l
966 $ hg help config.type | egrep '^$'|wc -l
962 \s*3 (re)
967 \s*3 (re)
963
968
964 Last item in help config.*:
969 Last item in help config.*:
965
970
966 $ hg help config.`hg help config|grep '^ "'| \
971 $ hg help config.`hg help config|grep '^ "'| \
967 > tail -1|sed 's![ "]*!!g'`| \
972 > tail -1|sed 's![ "]*!!g'`| \
968 > grep "hg help -c config" > /dev/null
973 > grep "hg help -c config" > /dev/null
969 [1]
974 [1]
970
975
971 note to use help -c for general hg help config:
976 note to use help -c for general hg help config:
972
977
973 $ hg help config |grep "hg help -c config" > /dev/null
978 $ hg help config |grep "hg help -c config" > /dev/null
974
979
975 Test templating help
980 Test templating help
976
981
977 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
982 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
978 desc String. The text of the changeset description.
983 desc String. The text of the changeset description.
979 diffstat String. Statistics of changes with the following format:
984 diffstat String. Statistics of changes with the following format:
980 firstline Any text. Returns the first line of text.
985 firstline Any text. Returns the first line of text.
981 nonempty Any text. Returns '(none)' if the string is empty.
986 nonempty Any text. Returns '(none)' if the string is empty.
982
987
983 Test deprecated items
988 Test deprecated items
984
989
985 $ hg help -v templating | grep currentbookmark
990 $ hg help -v templating | grep currentbookmark
986 currentbookmark
991 currentbookmark
987 $ hg help templating | (grep currentbookmark || true)
992 $ hg help templating | (grep currentbookmark || true)
988
993
989 Test help hooks
994 Test help hooks
990
995
991 $ cat > helphook1.py <<EOF
996 $ cat > helphook1.py <<EOF
992 > from mercurial import help
997 > from mercurial import help
993 >
998 >
994 > def rewrite(ui, topic, doc):
999 > def rewrite(ui, topic, doc):
995 > return doc + '\nhelphook1\n'
1000 > return doc + '\nhelphook1\n'
996 >
1001 >
997 > def extsetup(ui):
1002 > def extsetup(ui):
998 > help.addtopichook('revsets', rewrite)
1003 > help.addtopichook('revsets', rewrite)
999 > EOF
1004 > EOF
1000 $ cat > helphook2.py <<EOF
1005 $ cat > helphook2.py <<EOF
1001 > from mercurial import help
1006 > from mercurial import help
1002 >
1007 >
1003 > def rewrite(ui, topic, doc):
1008 > def rewrite(ui, topic, doc):
1004 > return doc + '\nhelphook2\n'
1009 > return doc + '\nhelphook2\n'
1005 >
1010 >
1006 > def extsetup(ui):
1011 > def extsetup(ui):
1007 > help.addtopichook('revsets', rewrite)
1012 > help.addtopichook('revsets', rewrite)
1008 > EOF
1013 > EOF
1009 $ echo '[extensions]' >> $HGRCPATH
1014 $ echo '[extensions]' >> $HGRCPATH
1010 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1015 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1011 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1016 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1012 $ hg help revsets | grep helphook
1017 $ hg help revsets | grep helphook
1013 helphook1
1018 helphook1
1014 helphook2
1019 helphook2
1015
1020
1016 Test -e / -c / -k combinations
1021 Test -e / -c / -k combinations
1017
1022
1018 $ hg help -c progress
1023 $ hg help -c progress
1019 abort: no such help topic: progress
1024 abort: no such help topic: progress
1020 (try "hg help --keyword progress")
1025 (try "hg help --keyword progress")
1021 [255]
1026 [255]
1022 $ hg help -e progress |head -1
1027 $ hg help -e progress |head -1
1023 progress extension - show progress bars for some actions (DEPRECATED)
1028 progress extension - show progress bars for some actions (DEPRECATED)
1024 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1029 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1025 Commands:
1030 Commands:
1026 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1031 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1027 Extensions:
1032 Extensions:
1028 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1033 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1029 Extensions:
1034 Extensions:
1030 Commands:
1035 Commands:
1031 $ hg help -c commit > /dev/null
1036 $ hg help -c commit > /dev/null
1032 $ hg help -e -c commit > /dev/null
1037 $ hg help -e -c commit > /dev/null
1033 $ hg help -e commit > /dev/null
1038 $ hg help -e commit > /dev/null
1034 abort: no such help topic: commit
1039 abort: no such help topic: commit
1035 (try "hg help --keyword commit")
1040 (try "hg help --keyword commit")
1036 [255]
1041 [255]
1037
1042
1038 Test keyword search help
1043 Test keyword search help
1039
1044
1040 $ cat > prefixedname.py <<EOF
1045 $ cat > prefixedname.py <<EOF
1041 > '''matched against word "clone"
1046 > '''matched against word "clone"
1042 > '''
1047 > '''
1043 > EOF
1048 > EOF
1044 $ echo '[extensions]' >> $HGRCPATH
1049 $ echo '[extensions]' >> $HGRCPATH
1045 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1050 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1046 $ hg help -k clone
1051 $ hg help -k clone
1047 Topics:
1052 Topics:
1048
1053
1049 config Configuration Files
1054 config Configuration Files
1050 extensions Using Additional Features
1055 extensions Using Additional Features
1051 glossary Glossary
1056 glossary Glossary
1052 phases Working with Phases
1057 phases Working with Phases
1053 subrepos Subrepositories
1058 subrepos Subrepositories
1054 urls URL Paths
1059 urls URL Paths
1055
1060
1056 Commands:
1061 Commands:
1057
1062
1058 bookmarks create a new bookmark or list existing bookmarks
1063 bookmarks create a new bookmark or list existing bookmarks
1059 clone make a copy of an existing repository
1064 clone make a copy of an existing repository
1060 paths show aliases for remote repositories
1065 paths show aliases for remote repositories
1061 update update working directory (or switch revisions)
1066 update update working directory (or switch revisions)
1062
1067
1063 Extensions:
1068 Extensions:
1064
1069
1065 prefixedname matched against word "clone"
1070 prefixedname matched against word "clone"
1066 relink recreates hardlinks between repository clones
1071 relink recreates hardlinks between repository clones
1067
1072
1068 Extension Commands:
1073 Extension Commands:
1069
1074
1070 qclone clone main and patch repository at same time
1075 qclone clone main and patch repository at same time
1071
1076
1072 Test unfound topic
1077 Test unfound topic
1073
1078
1074 $ hg help nonexistingtopicthatwillneverexisteverever
1079 $ hg help nonexistingtopicthatwillneverexisteverever
1075 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1080 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1076 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1081 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1077 [255]
1082 [255]
1078
1083
1079 Test unfound keyword
1084 Test unfound keyword
1080
1085
1081 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1086 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1082 abort: no matches
1087 abort: no matches
1083 (try "hg help" for a list of topics)
1088 (try "hg help" for a list of topics)
1084 [255]
1089 [255]
1085
1090
1086 Test omit indicating for help
1091 Test omit indicating for help
1087
1092
1088 $ cat > addverboseitems.py <<EOF
1093 $ cat > addverboseitems.py <<EOF
1089 > '''extension to test omit indicating.
1094 > '''extension to test omit indicating.
1090 >
1095 >
1091 > This paragraph is never omitted (for extension)
1096 > This paragraph is never omitted (for extension)
1092 >
1097 >
1093 > .. container:: verbose
1098 > .. container:: verbose
1094 >
1099 >
1095 > This paragraph is omitted,
1100 > This paragraph is omitted,
1096 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1101 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1097 >
1102 >
1098 > This paragraph is never omitted, too (for extension)
1103 > This paragraph is never omitted, too (for extension)
1099 > '''
1104 > '''
1100 >
1105 >
1101 > from mercurial import help, commands
1106 > from mercurial import help, commands
1102 > testtopic = """This paragraph is never omitted (for topic).
1107 > testtopic = """This paragraph is never omitted (for topic).
1103 >
1108 >
1104 > .. container:: verbose
1109 > .. container:: verbose
1105 >
1110 >
1106 > This paragraph is omitted,
1111 > This paragraph is omitted,
1107 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1112 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1108 >
1113 >
1109 > This paragraph is never omitted, too (for topic)
1114 > This paragraph is never omitted, too (for topic)
1110 > """
1115 > """
1111 > def extsetup(ui):
1116 > def extsetup(ui):
1112 > help.helptable.append((["topic-containing-verbose"],
1117 > help.helptable.append((["topic-containing-verbose"],
1113 > "This is the topic to test omit indicating.",
1118 > "This is the topic to test omit indicating.",
1114 > lambda ui: testtopic))
1119 > lambda ui: testtopic))
1115 > EOF
1120 > EOF
1116 $ echo '[extensions]' >> $HGRCPATH
1121 $ echo '[extensions]' >> $HGRCPATH
1117 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1122 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1118 $ hg help addverboseitems
1123 $ hg help addverboseitems
1119 addverboseitems extension - extension to test omit indicating.
1124 addverboseitems extension - extension to test omit indicating.
1120
1125
1121 This paragraph is never omitted (for extension)
1126 This paragraph is never omitted (for extension)
1122
1127
1123 This paragraph is never omitted, too (for extension)
1128 This paragraph is never omitted, too (for extension)
1124
1129
1125 (some details hidden, use --verbose to show complete help)
1130 (some details hidden, use --verbose to show complete help)
1126
1131
1127 no commands defined
1132 no commands defined
1128 $ hg help -v addverboseitems
1133 $ hg help -v addverboseitems
1129 addverboseitems extension - extension to test omit indicating.
1134 addverboseitems extension - extension to test omit indicating.
1130
1135
1131 This paragraph is never omitted (for extension)
1136 This paragraph is never omitted (for extension)
1132
1137
1133 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1138 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1134 extension)
1139 extension)
1135
1140
1136 This paragraph is never omitted, too (for extension)
1141 This paragraph is never omitted, too (for extension)
1137
1142
1138 no commands defined
1143 no commands defined
1139 $ hg help topic-containing-verbose
1144 $ hg help topic-containing-verbose
1140 This is the topic to test omit indicating.
1145 This is the topic to test omit indicating.
1141 """"""""""""""""""""""""""""""""""""""""""
1146 """"""""""""""""""""""""""""""""""""""""""
1142
1147
1143 This paragraph is never omitted (for topic).
1148 This paragraph is never omitted (for topic).
1144
1149
1145 This paragraph is never omitted, too (for topic)
1150 This paragraph is never omitted, too (for topic)
1146
1151
1147 (some details hidden, use --verbose to show complete help)
1152 (some details hidden, use --verbose to show complete help)
1148 $ hg help -v topic-containing-verbose
1153 $ hg help -v topic-containing-verbose
1149 This is the topic to test omit indicating.
1154 This is the topic to test omit indicating.
1150 """"""""""""""""""""""""""""""""""""""""""
1155 """"""""""""""""""""""""""""""""""""""""""
1151
1156
1152 This paragraph is never omitted (for topic).
1157 This paragraph is never omitted (for topic).
1153
1158
1154 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1159 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1155 topic)
1160 topic)
1156
1161
1157 This paragraph is never omitted, too (for topic)
1162 This paragraph is never omitted, too (for topic)
1158
1163
1159 Test section lookup
1164 Test section lookup
1160
1165
1161 $ hg help revset.merge
1166 $ hg help revset.merge
1162 "merge()"
1167 "merge()"
1163 Changeset is a merge changeset.
1168 Changeset is a merge changeset.
1164
1169
1165 $ hg help glossary.dag
1170 $ hg help glossary.dag
1166 DAG
1171 DAG
1167 The repository of changesets of a distributed version control system
1172 The repository of changesets of a distributed version control system
1168 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1173 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1169 of nodes and edges, where nodes correspond to changesets and edges
1174 of nodes and edges, where nodes correspond to changesets and edges
1170 imply a parent -> child relation. This graph can be visualized by
1175 imply a parent -> child relation. This graph can be visualized by
1171 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1176 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1172 limited by the requirement for children to have at most two parents.
1177 limited by the requirement for children to have at most two parents.
1173
1178
1174
1179
1175 $ hg help hgrc.paths
1180 $ hg help hgrc.paths
1176 "paths"
1181 "paths"
1177 -------
1182 -------
1178
1183
1179 Assigns symbolic names to repositories. The left side is the symbolic
1184 Assigns symbolic names to repositories. The left side is the symbolic
1180 name, and the right gives the directory or URL that is the location of the
1185 name, and the right gives the directory or URL that is the location of the
1181 repository. Default paths can be declared by setting the following
1186 repository. Default paths can be declared by setting the following
1182 entries.
1187 entries.
1183
1188
1184 "default"
1189 "default"
1185 Directory or URL to use when pulling if no source is specified.
1190 Directory or URL to use when pulling if no source is specified.
1186 (default: repository from which the current repository was cloned)
1191 (default: repository from which the current repository was cloned)
1187
1192
1188 "default-push"
1193 "default-push"
1189 Optional. Directory or URL to use when pushing if no destination is
1194 Optional. Directory or URL to use when pushing if no destination is
1190 specified.
1195 specified.
1191
1196
1192 Custom paths can be defined by assigning the path to a name that later can
1197 Custom paths can be defined by assigning the path to a name that later can
1193 be used from the command line. Example:
1198 be used from the command line. Example:
1194
1199
1195 [paths]
1200 [paths]
1196 my_path = http://example.com/path
1201 my_path = http://example.com/path
1197
1202
1198 To push to the path defined in "my_path" run the command:
1203 To push to the path defined in "my_path" run the command:
1199
1204
1200 hg push my_path
1205 hg push my_path
1201
1206
1202 $ hg help glossary.mcguffin
1207 $ hg help glossary.mcguffin
1203 abort: help section not found
1208 abort: help section not found
1204 [255]
1209 [255]
1205
1210
1206 $ hg help glossary.mc.guffin
1211 $ hg help glossary.mc.guffin
1207 abort: help section not found
1212 abort: help section not found
1208 [255]
1213 [255]
1209
1214
1210 $ hg help template.files
1215 $ hg help template.files
1211 files List of strings. All files modified, added, or removed by
1216 files List of strings. All files modified, added, or removed by
1212 this changeset.
1217 this changeset.
1213
1218
1214 Test dynamic list of merge tools only shows up once
1219 Test dynamic list of merge tools only shows up once
1215 $ hg help merge-tools
1220 $ hg help merge-tools
1216 Merge Tools
1221 Merge Tools
1217 """""""""""
1222 """""""""""
1218
1223
1219 To merge files Mercurial uses merge tools.
1224 To merge files Mercurial uses merge tools.
1220
1225
1221 A merge tool combines two different versions of a file into a merged file.
1226 A merge tool combines two different versions of a file into a merged file.
1222 Merge tools are given the two files and the greatest common ancestor of
1227 Merge tools are given the two files and the greatest common ancestor of
1223 the two file versions, so they can determine the changes made on both
1228 the two file versions, so they can determine the changes made on both
1224 branches.
1229 branches.
1225
1230
1226 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1231 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1227 backout" and in several extensions.
1232 backout" and in several extensions.
1228
1233
1229 Usually, the merge tool tries to automatically reconcile the files by
1234 Usually, the merge tool tries to automatically reconcile the files by
1230 combining all non-overlapping changes that occurred separately in the two
1235 combining all non-overlapping changes that occurred separately in the two
1231 different evolutions of the same initial base file. Furthermore, some
1236 different evolutions of the same initial base file. Furthermore, some
1232 interactive merge programs make it easier to manually resolve conflicting
1237 interactive merge programs make it easier to manually resolve conflicting
1233 merges, either in a graphical way, or by inserting some conflict markers.
1238 merges, either in a graphical way, or by inserting some conflict markers.
1234 Mercurial does not include any interactive merge programs but relies on
1239 Mercurial does not include any interactive merge programs but relies on
1235 external tools for that.
1240 external tools for that.
1236
1241
1237 Available merge tools
1242 Available merge tools
1238 =====================
1243 =====================
1239
1244
1240 External merge tools and their properties are configured in the merge-
1245 External merge tools and their properties are configured in the merge-
1241 tools configuration section - see hgrc(5) - but they can often just be
1246 tools configuration section - see hgrc(5) - but they can often just be
1242 named by their executable.
1247 named by their executable.
1243
1248
1244 A merge tool is generally usable if its executable can be found on the
1249 A merge tool is generally usable if its executable can be found on the
1245 system and if it can handle the merge. The executable is found if it is an
1250 system and if it can handle the merge. The executable is found if it is an
1246 absolute or relative executable path or the name of an application in the
1251 absolute or relative executable path or the name of an application in the
1247 executable search path. The tool is assumed to be able to handle the merge
1252 executable search path. The tool is assumed to be able to handle the merge
1248 if it can handle symlinks if the file is a symlink, if it can handle
1253 if it can handle symlinks if the file is a symlink, if it can handle
1249 binary files if the file is binary, and if a GUI is available if the tool
1254 binary files if the file is binary, and if a GUI is available if the tool
1250 requires a GUI.
1255 requires a GUI.
1251
1256
1252 There are some internal merge tools which can be used. The internal merge
1257 There are some internal merge tools which can be used. The internal merge
1253 tools are:
1258 tools are:
1254
1259
1255 ":dump"
1260 ":dump"
1256 Creates three versions of the files to merge, containing the contents of
1261 Creates three versions of the files to merge, containing the contents of
1257 local, other and base. These files can then be used to perform a merge
1262 local, other and base. These files can then be used to perform a merge
1258 manually. If the file to be merged is named "a.txt", these files will
1263 manually. If the file to be merged is named "a.txt", these files will
1259 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1264 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1260 they will be placed in the same directory as "a.txt".
1265 they will be placed in the same directory as "a.txt".
1261
1266
1262 ":fail"
1267 ":fail"
1263 Rather than attempting to merge files that were modified on both
1268 Rather than attempting to merge files that were modified on both
1264 branches, it marks them as unresolved. The resolve command must be used
1269 branches, it marks them as unresolved. The resolve command must be used
1265 to resolve these conflicts.
1270 to resolve these conflicts.
1266
1271
1267 ":local"
1272 ":local"
1268 Uses the local version of files as the merged version.
1273 Uses the local version of files as the merged version.
1269
1274
1270 ":merge"
1275 ":merge"
1271 Uses the internal non-interactive simple merge algorithm for merging
1276 Uses the internal non-interactive simple merge algorithm for merging
1272 files. It will fail if there are any conflicts and leave markers in the
1277 files. It will fail if there are any conflicts and leave markers in the
1273 partially merged file. Markers will have two sections, one for each side
1278 partially merged file. Markers will have two sections, one for each side
1274 of merge.
1279 of merge.
1275
1280
1276 ":merge-local"
1281 ":merge-local"
1277 Like :merge, but resolve all conflicts non-interactively in favor of the
1282 Like :merge, but resolve all conflicts non-interactively in favor of the
1278 local changes.
1283 local changes.
1279
1284
1280 ":merge-other"
1285 ":merge-other"
1281 Like :merge, but resolve all conflicts non-interactively in favor of the
1286 Like :merge, but resolve all conflicts non-interactively in favor of the
1282 other changes.
1287 other changes.
1283
1288
1284 ":merge3"
1289 ":merge3"
1285 Uses the internal non-interactive simple merge algorithm for merging
1290 Uses the internal non-interactive simple merge algorithm for merging
1286 files. It will fail if there are any conflicts and leave markers in the
1291 files. It will fail if there are any conflicts and leave markers in the
1287 partially merged file. Marker will have three sections, one from each
1292 partially merged file. Marker will have three sections, one from each
1288 side of the merge and one for the base content.
1293 side of the merge and one for the base content.
1289
1294
1290 ":other"
1295 ":other"
1291 Uses the other version of files as the merged version.
1296 Uses the other version of files as the merged version.
1292
1297
1293 ":prompt"
1298 ":prompt"
1294 Asks the user which of the local or the other version to keep as the
1299 Asks the user which of the local or the other version to keep as the
1295 merged version.
1300 merged version.
1296
1301
1297 ":tagmerge"
1302 ":tagmerge"
1298 Uses the internal tag merge algorithm (experimental).
1303 Uses the internal tag merge algorithm (experimental).
1299
1304
1300 ":union"
1305 ":union"
1301 Uses the internal non-interactive simple merge algorithm for merging
1306 Uses the internal non-interactive simple merge algorithm for merging
1302 files. It will use both left and right sides for conflict regions. No
1307 files. It will use both left and right sides for conflict regions. No
1303 markers are inserted.
1308 markers are inserted.
1304
1309
1305 Internal tools are always available and do not require a GUI but will by
1310 Internal tools are always available and do not require a GUI but will by
1306 default not handle symlinks or binary files.
1311 default not handle symlinks or binary files.
1307
1312
1308 Choosing a merge tool
1313 Choosing a merge tool
1309 =====================
1314 =====================
1310
1315
1311 Mercurial uses these rules when deciding which merge tool to use:
1316 Mercurial uses these rules when deciding which merge tool to use:
1312
1317
1313 1. If a tool has been specified with the --tool option to merge or
1318 1. If a tool has been specified with the --tool option to merge or
1314 resolve, it is used. If it is the name of a tool in the merge-tools
1319 resolve, it is used. If it is the name of a tool in the merge-tools
1315 configuration, its configuration is used. Otherwise the specified tool
1320 configuration, its configuration is used. Otherwise the specified tool
1316 must be executable by the shell.
1321 must be executable by the shell.
1317 2. If the "HGMERGE" environment variable is present, its value is used and
1322 2. If the "HGMERGE" environment variable is present, its value is used and
1318 must be executable by the shell.
1323 must be executable by the shell.
1319 3. If the filename of the file to be merged matches any of the patterns in
1324 3. If the filename of the file to be merged matches any of the patterns in
1320 the merge-patterns configuration section, the first usable merge tool
1325 the merge-patterns configuration section, the first usable merge tool
1321 corresponding to a matching pattern is used. Here, binary capabilities
1326 corresponding to a matching pattern is used. Here, binary capabilities
1322 of the merge tool are not considered.
1327 of the merge tool are not considered.
1323 4. If ui.merge is set it will be considered next. If the value is not the
1328 4. If ui.merge is set it will be considered next. If the value is not the
1324 name of a configured tool, the specified value is used and must be
1329 name of a configured tool, the specified value is used and must be
1325 executable by the shell. Otherwise the named tool is used if it is
1330 executable by the shell. Otherwise the named tool is used if it is
1326 usable.
1331 usable.
1327 5. If any usable merge tools are present in the merge-tools configuration
1332 5. If any usable merge tools are present in the merge-tools configuration
1328 section, the one with the highest priority is used.
1333 section, the one with the highest priority is used.
1329 6. If a program named "hgmerge" can be found on the system, it is used -
1334 6. If a program named "hgmerge" can be found on the system, it is used -
1330 but it will by default not be used for symlinks and binary files.
1335 but it will by default not be used for symlinks and binary files.
1331 7. If the file to be merged is not binary and is not a symlink, then
1336 7. If the file to be merged is not binary and is not a symlink, then
1332 internal ":merge" is used.
1337 internal ":merge" is used.
1333 8. The merge of the file fails and must be resolved before commit.
1338 8. The merge of the file fails and must be resolved before commit.
1334
1339
1335 Note:
1340 Note:
1336 After selecting a merge program, Mercurial will by default attempt to
1341 After selecting a merge program, Mercurial will by default attempt to
1337 merge the files using a simple merge algorithm first. Only if it
1342 merge the files using a simple merge algorithm first. Only if it
1338 doesn't succeed because of conflicting changes Mercurial will actually
1343 doesn't succeed because of conflicting changes Mercurial will actually
1339 execute the merge program. Whether to use the simple merge algorithm
1344 execute the merge program. Whether to use the simple merge algorithm
1340 first can be controlled by the premerge setting of the merge tool.
1345 first can be controlled by the premerge setting of the merge tool.
1341 Premerge is enabled by default unless the file is binary or a symlink.
1346 Premerge is enabled by default unless the file is binary or a symlink.
1342
1347
1343 See the merge-tools and ui sections of hgrc(5) for details on the
1348 See the merge-tools and ui sections of hgrc(5) for details on the
1344 configuration of merge tools.
1349 configuration of merge tools.
1345
1350
1346 Test usage of section marks in help documents
1351 Test usage of section marks in help documents
1347
1352
1348 $ cd "$TESTDIR"/../doc
1353 $ cd "$TESTDIR"/../doc
1349 $ python check-seclevel.py
1354 $ python check-seclevel.py
1350 $ cd $TESTTMP
1355 $ cd $TESTTMP
1351
1356
1352 #if serve
1357 #if serve
1353
1358
1354 Test the help pages in hgweb.
1359 Test the help pages in hgweb.
1355
1360
1356 Dish up an empty repo; serve it cold.
1361 Dish up an empty repo; serve it cold.
1357
1362
1358 $ hg init "$TESTTMP/test"
1363 $ hg init "$TESTTMP/test"
1359 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1364 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1360 $ cat hg.pid >> $DAEMON_PIDS
1365 $ cat hg.pid >> $DAEMON_PIDS
1361
1366
1362 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1367 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1363 200 Script output follows
1368 200 Script output follows
1364
1369
1365 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1370 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1366 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1371 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1367 <head>
1372 <head>
1368 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1373 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1369 <meta name="robots" content="index, nofollow" />
1374 <meta name="robots" content="index, nofollow" />
1370 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1375 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1371 <script type="text/javascript" src="/static/mercurial.js"></script>
1376 <script type="text/javascript" src="/static/mercurial.js"></script>
1372
1377
1373 <title>Help: Index</title>
1378 <title>Help: Index</title>
1374 </head>
1379 </head>
1375 <body>
1380 <body>
1376
1381
1377 <div class="container">
1382 <div class="container">
1378 <div class="menu">
1383 <div class="menu">
1379 <div class="logo">
1384 <div class="logo">
1380 <a href="https://mercurial-scm.org/">
1385 <a href="https://mercurial-scm.org/">
1381 <img src="/static/hglogo.png" alt="mercurial" /></a>
1386 <img src="/static/hglogo.png" alt="mercurial" /></a>
1382 </div>
1387 </div>
1383 <ul>
1388 <ul>
1384 <li><a href="/shortlog">log</a></li>
1389 <li><a href="/shortlog">log</a></li>
1385 <li><a href="/graph">graph</a></li>
1390 <li><a href="/graph">graph</a></li>
1386 <li><a href="/tags">tags</a></li>
1391 <li><a href="/tags">tags</a></li>
1387 <li><a href="/bookmarks">bookmarks</a></li>
1392 <li><a href="/bookmarks">bookmarks</a></li>
1388 <li><a href="/branches">branches</a></li>
1393 <li><a href="/branches">branches</a></li>
1389 </ul>
1394 </ul>
1390 <ul>
1395 <ul>
1391 <li class="active">help</li>
1396 <li class="active">help</li>
1392 </ul>
1397 </ul>
1393 </div>
1398 </div>
1394
1399
1395 <div class="main">
1400 <div class="main">
1396 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1401 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1397 <form class="search" action="/log">
1402 <form class="search" action="/log">
1398
1403
1399 <p><input name="rev" id="search1" type="text" size="30" /></p>
1404 <p><input name="rev" id="search1" type="text" size="30" /></p>
1400 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1405 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1401 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1406 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1402 </form>
1407 </form>
1403 <table class="bigtable">
1408 <table class="bigtable">
1404 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1409 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1405
1410
1406 <tr><td>
1411 <tr><td>
1407 <a href="/help/config">
1412 <a href="/help/config">
1408 config
1413 config
1409 </a>
1414 </a>
1410 </td><td>
1415 </td><td>
1411 Configuration Files
1416 Configuration Files
1412 </td></tr>
1417 </td></tr>
1413 <tr><td>
1418 <tr><td>
1414 <a href="/help/dates">
1419 <a href="/help/dates">
1415 dates
1420 dates
1416 </a>
1421 </a>
1417 </td><td>
1422 </td><td>
1418 Date Formats
1423 Date Formats
1419 </td></tr>
1424 </td></tr>
1420 <tr><td>
1425 <tr><td>
1421 <a href="/help/diffs">
1426 <a href="/help/diffs">
1422 diffs
1427 diffs
1423 </a>
1428 </a>
1424 </td><td>
1429 </td><td>
1425 Diff Formats
1430 Diff Formats
1426 </td></tr>
1431 </td></tr>
1427 <tr><td>
1432 <tr><td>
1428 <a href="/help/environment">
1433 <a href="/help/environment">
1429 environment
1434 environment
1430 </a>
1435 </a>
1431 </td><td>
1436 </td><td>
1432 Environment Variables
1437 Environment Variables
1433 </td></tr>
1438 </td></tr>
1434 <tr><td>
1439 <tr><td>
1435 <a href="/help/extensions">
1440 <a href="/help/extensions">
1436 extensions
1441 extensions
1437 </a>
1442 </a>
1438 </td><td>
1443 </td><td>
1439 Using Additional Features
1444 Using Additional Features
1440 </td></tr>
1445 </td></tr>
1441 <tr><td>
1446 <tr><td>
1442 <a href="/help/filesets">
1447 <a href="/help/filesets">
1443 filesets
1448 filesets
1444 </a>
1449 </a>
1445 </td><td>
1450 </td><td>
1446 Specifying File Sets
1451 Specifying File Sets
1447 </td></tr>
1452 </td></tr>
1448 <tr><td>
1453 <tr><td>
1449 <a href="/help/glossary">
1454 <a href="/help/glossary">
1450 glossary
1455 glossary
1451 </a>
1456 </a>
1452 </td><td>
1457 </td><td>
1453 Glossary
1458 Glossary
1454 </td></tr>
1459 </td></tr>
1455 <tr><td>
1460 <tr><td>
1456 <a href="/help/hgignore">
1461 <a href="/help/hgignore">
1457 hgignore
1462 hgignore
1458 </a>
1463 </a>
1459 </td><td>
1464 </td><td>
1460 Syntax for Mercurial Ignore Files
1465 Syntax for Mercurial Ignore Files
1461 </td></tr>
1466 </td></tr>
1462 <tr><td>
1467 <tr><td>
1463 <a href="/help/hgweb">
1468 <a href="/help/hgweb">
1464 hgweb
1469 hgweb
1465 </a>
1470 </a>
1466 </td><td>
1471 </td><td>
1467 Configuring hgweb
1472 Configuring hgweb
1468 </td></tr>
1473 </td></tr>
1469 <tr><td>
1474 <tr><td>
1470 <a href="/help/merge-tools">
1475 <a href="/help/merge-tools">
1471 merge-tools
1476 merge-tools
1472 </a>
1477 </a>
1473 </td><td>
1478 </td><td>
1474 Merge Tools
1479 Merge Tools
1475 </td></tr>
1480 </td></tr>
1476 <tr><td>
1481 <tr><td>
1477 <a href="/help/multirevs">
1482 <a href="/help/multirevs">
1478 multirevs
1483 multirevs
1479 </a>
1484 </a>
1480 </td><td>
1485 </td><td>
1481 Specifying Multiple Revisions
1486 Specifying Multiple Revisions
1482 </td></tr>
1487 </td></tr>
1483 <tr><td>
1488 <tr><td>
1484 <a href="/help/patterns">
1489 <a href="/help/patterns">
1485 patterns
1490 patterns
1486 </a>
1491 </a>
1487 </td><td>
1492 </td><td>
1488 File Name Patterns
1493 File Name Patterns
1489 </td></tr>
1494 </td></tr>
1490 <tr><td>
1495 <tr><td>
1491 <a href="/help/phases">
1496 <a href="/help/phases">
1492 phases
1497 phases
1493 </a>
1498 </a>
1494 </td><td>
1499 </td><td>
1495 Working with Phases
1500 Working with Phases
1496 </td></tr>
1501 </td></tr>
1497 <tr><td>
1502 <tr><td>
1498 <a href="/help/revisions">
1503 <a href="/help/revisions">
1499 revisions
1504 revisions
1500 </a>
1505 </a>
1501 </td><td>
1506 </td><td>
1502 Specifying Single Revisions
1507 Specifying Single Revisions
1503 </td></tr>
1508 </td></tr>
1504 <tr><td>
1509 <tr><td>
1505 <a href="/help/revsets">
1510 <a href="/help/revsets">
1506 revsets
1511 revsets
1507 </a>
1512 </a>
1508 </td><td>
1513 </td><td>
1509 Specifying Revision Sets
1514 Specifying Revision Sets
1510 </td></tr>
1515 </td></tr>
1511 <tr><td>
1516 <tr><td>
1512 <a href="/help/scripting">
1517 <a href="/help/scripting">
1513 scripting
1518 scripting
1514 </a>
1519 </a>
1515 </td><td>
1520 </td><td>
1516 Using Mercurial from scripts and automation
1521 Using Mercurial from scripts and automation
1517 </td></tr>
1522 </td></tr>
1518 <tr><td>
1523 <tr><td>
1519 <a href="/help/subrepos">
1524 <a href="/help/subrepos">
1520 subrepos
1525 subrepos
1521 </a>
1526 </a>
1522 </td><td>
1527 </td><td>
1523 Subrepositories
1528 Subrepositories
1524 </td></tr>
1529 </td></tr>
1525 <tr><td>
1530 <tr><td>
1526 <a href="/help/templating">
1531 <a href="/help/templating">
1527 templating
1532 templating
1528 </a>
1533 </a>
1529 </td><td>
1534 </td><td>
1530 Template Usage
1535 Template Usage
1531 </td></tr>
1536 </td></tr>
1532 <tr><td>
1537 <tr><td>
1533 <a href="/help/urls">
1538 <a href="/help/urls">
1534 urls
1539 urls
1535 </a>
1540 </a>
1536 </td><td>
1541 </td><td>
1537 URL Paths
1542 URL Paths
1538 </td></tr>
1543 </td></tr>
1539 <tr><td>
1544 <tr><td>
1540 <a href="/help/topic-containing-verbose">
1545 <a href="/help/topic-containing-verbose">
1541 topic-containing-verbose
1546 topic-containing-verbose
1542 </a>
1547 </a>
1543 </td><td>
1548 </td><td>
1544 This is the topic to test omit indicating.
1549 This is the topic to test omit indicating.
1545 </td></tr>
1550 </td></tr>
1546
1551
1547 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1552 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1548
1553
1549 <tr><td>
1554 <tr><td>
1550 <a href="/help/add">
1555 <a href="/help/add">
1551 add
1556 add
1552 </a>
1557 </a>
1553 </td><td>
1558 </td><td>
1554 add the specified files on the next commit
1559 add the specified files on the next commit
1555 </td></tr>
1560 </td></tr>
1556 <tr><td>
1561 <tr><td>
1557 <a href="/help/annotate">
1562 <a href="/help/annotate">
1558 annotate
1563 annotate
1559 </a>
1564 </a>
1560 </td><td>
1565 </td><td>
1561 show changeset information by line for each file
1566 show changeset information by line for each file
1562 </td></tr>
1567 </td></tr>
1563 <tr><td>
1568 <tr><td>
1564 <a href="/help/clone">
1569 <a href="/help/clone">
1565 clone
1570 clone
1566 </a>
1571 </a>
1567 </td><td>
1572 </td><td>
1568 make a copy of an existing repository
1573 make a copy of an existing repository
1569 </td></tr>
1574 </td></tr>
1570 <tr><td>
1575 <tr><td>
1571 <a href="/help/commit">
1576 <a href="/help/commit">
1572 commit
1577 commit
1573 </a>
1578 </a>
1574 </td><td>
1579 </td><td>
1575 commit the specified files or all outstanding changes
1580 commit the specified files or all outstanding changes
1576 </td></tr>
1581 </td></tr>
1577 <tr><td>
1582 <tr><td>
1578 <a href="/help/diff">
1583 <a href="/help/diff">
1579 diff
1584 diff
1580 </a>
1585 </a>
1581 </td><td>
1586 </td><td>
1582 diff repository (or selected files)
1587 diff repository (or selected files)
1583 </td></tr>
1588 </td></tr>
1584 <tr><td>
1589 <tr><td>
1585 <a href="/help/export">
1590 <a href="/help/export">
1586 export
1591 export
1587 </a>
1592 </a>
1588 </td><td>
1593 </td><td>
1589 dump the header and diffs for one or more changesets
1594 dump the header and diffs for one or more changesets
1590 </td></tr>
1595 </td></tr>
1591 <tr><td>
1596 <tr><td>
1592 <a href="/help/forget">
1597 <a href="/help/forget">
1593 forget
1598 forget
1594 </a>
1599 </a>
1595 </td><td>
1600 </td><td>
1596 forget the specified files on the next commit
1601 forget the specified files on the next commit
1597 </td></tr>
1602 </td></tr>
1598 <tr><td>
1603 <tr><td>
1599 <a href="/help/init">
1604 <a href="/help/init">
1600 init
1605 init
1601 </a>
1606 </a>
1602 </td><td>
1607 </td><td>
1603 create a new repository in the given directory
1608 create a new repository in the given directory
1604 </td></tr>
1609 </td></tr>
1605 <tr><td>
1610 <tr><td>
1606 <a href="/help/log">
1611 <a href="/help/log">
1607 log
1612 log
1608 </a>
1613 </a>
1609 </td><td>
1614 </td><td>
1610 show revision history of entire repository or files
1615 show revision history of entire repository or files
1611 </td></tr>
1616 </td></tr>
1612 <tr><td>
1617 <tr><td>
1613 <a href="/help/merge">
1618 <a href="/help/merge">
1614 merge
1619 merge
1615 </a>
1620 </a>
1616 </td><td>
1621 </td><td>
1617 merge another revision into working directory
1622 merge another revision into working directory
1618 </td></tr>
1623 </td></tr>
1619 <tr><td>
1624 <tr><td>
1620 <a href="/help/pull">
1625 <a href="/help/pull">
1621 pull
1626 pull
1622 </a>
1627 </a>
1623 </td><td>
1628 </td><td>
1624 pull changes from the specified source
1629 pull changes from the specified source
1625 </td></tr>
1630 </td></tr>
1626 <tr><td>
1631 <tr><td>
1627 <a href="/help/push">
1632 <a href="/help/push">
1628 push
1633 push
1629 </a>
1634 </a>
1630 </td><td>
1635 </td><td>
1631 push changes to the specified destination
1636 push changes to the specified destination
1632 </td></tr>
1637 </td></tr>
1633 <tr><td>
1638 <tr><td>
1634 <a href="/help/remove">
1639 <a href="/help/remove">
1635 remove
1640 remove
1636 </a>
1641 </a>
1637 </td><td>
1642 </td><td>
1638 remove the specified files on the next commit
1643 remove the specified files on the next commit
1639 </td></tr>
1644 </td></tr>
1640 <tr><td>
1645 <tr><td>
1641 <a href="/help/serve">
1646 <a href="/help/serve">
1642 serve
1647 serve
1643 </a>
1648 </a>
1644 </td><td>
1649 </td><td>
1645 start stand-alone webserver
1650 start stand-alone webserver
1646 </td></tr>
1651 </td></tr>
1647 <tr><td>
1652 <tr><td>
1648 <a href="/help/status">
1653 <a href="/help/status">
1649 status
1654 status
1650 </a>
1655 </a>
1651 </td><td>
1656 </td><td>
1652 show changed files in the working directory
1657 show changed files in the working directory
1653 </td></tr>
1658 </td></tr>
1654 <tr><td>
1659 <tr><td>
1655 <a href="/help/summary">
1660 <a href="/help/summary">
1656 summary
1661 summary
1657 </a>
1662 </a>
1658 </td><td>
1663 </td><td>
1659 summarize working directory state
1664 summarize working directory state
1660 </td></tr>
1665 </td></tr>
1661 <tr><td>
1666 <tr><td>
1662 <a href="/help/update">
1667 <a href="/help/update">
1663 update
1668 update
1664 </a>
1669 </a>
1665 </td><td>
1670 </td><td>
1666 update working directory (or switch revisions)
1671 update working directory (or switch revisions)
1667 </td></tr>
1672 </td></tr>
1668
1673
1669 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1674 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1670
1675
1671 <tr><td>
1676 <tr><td>
1672 <a href="/help/addremove">
1677 <a href="/help/addremove">
1673 addremove
1678 addremove
1674 </a>
1679 </a>
1675 </td><td>
1680 </td><td>
1676 add all new files, delete all missing files
1681 add all new files, delete all missing files
1677 </td></tr>
1682 </td></tr>
1678 <tr><td>
1683 <tr><td>
1679 <a href="/help/archive">
1684 <a href="/help/archive">
1680 archive
1685 archive
1681 </a>
1686 </a>
1682 </td><td>
1687 </td><td>
1683 create an unversioned archive of a repository revision
1688 create an unversioned archive of a repository revision
1684 </td></tr>
1689 </td></tr>
1685 <tr><td>
1690 <tr><td>
1686 <a href="/help/backout">
1691 <a href="/help/backout">
1687 backout
1692 backout
1688 </a>
1693 </a>
1689 </td><td>
1694 </td><td>
1690 reverse effect of earlier changeset
1695 reverse effect of earlier changeset
1691 </td></tr>
1696 </td></tr>
1692 <tr><td>
1697 <tr><td>
1693 <a href="/help/bisect">
1698 <a href="/help/bisect">
1694 bisect
1699 bisect
1695 </a>
1700 </a>
1696 </td><td>
1701 </td><td>
1697 subdivision search of changesets
1702 subdivision search of changesets
1698 </td></tr>
1703 </td></tr>
1699 <tr><td>
1704 <tr><td>
1700 <a href="/help/bookmarks">
1705 <a href="/help/bookmarks">
1701 bookmarks
1706 bookmarks
1702 </a>
1707 </a>
1703 </td><td>
1708 </td><td>
1704 create a new bookmark or list existing bookmarks
1709 create a new bookmark or list existing bookmarks
1705 </td></tr>
1710 </td></tr>
1706 <tr><td>
1711 <tr><td>
1707 <a href="/help/branch">
1712 <a href="/help/branch">
1708 branch
1713 branch
1709 </a>
1714 </a>
1710 </td><td>
1715 </td><td>
1711 set or show the current branch name
1716 set or show the current branch name
1712 </td></tr>
1717 </td></tr>
1713 <tr><td>
1718 <tr><td>
1714 <a href="/help/branches">
1719 <a href="/help/branches">
1715 branches
1720 branches
1716 </a>
1721 </a>
1717 </td><td>
1722 </td><td>
1718 list repository named branches
1723 list repository named branches
1719 </td></tr>
1724 </td></tr>
1720 <tr><td>
1725 <tr><td>
1721 <a href="/help/bundle">
1726 <a href="/help/bundle">
1722 bundle
1727 bundle
1723 </a>
1728 </a>
1724 </td><td>
1729 </td><td>
1725 create a changegroup file
1730 create a changegroup file
1726 </td></tr>
1731 </td></tr>
1727 <tr><td>
1732 <tr><td>
1728 <a href="/help/cat">
1733 <a href="/help/cat">
1729 cat
1734 cat
1730 </a>
1735 </a>
1731 </td><td>
1736 </td><td>
1732 output the current or given revision of files
1737 output the current or given revision of files
1733 </td></tr>
1738 </td></tr>
1734 <tr><td>
1739 <tr><td>
1735 <a href="/help/config">
1740 <a href="/help/config">
1736 config
1741 config
1737 </a>
1742 </a>
1738 </td><td>
1743 </td><td>
1739 show combined config settings from all hgrc files
1744 show combined config settings from all hgrc files
1740 </td></tr>
1745 </td></tr>
1741 <tr><td>
1746 <tr><td>
1742 <a href="/help/copy">
1747 <a href="/help/copy">
1743 copy
1748 copy
1744 </a>
1749 </a>
1745 </td><td>
1750 </td><td>
1746 mark files as copied for the next commit
1751 mark files as copied for the next commit
1747 </td></tr>
1752 </td></tr>
1748 <tr><td>
1753 <tr><td>
1749 <a href="/help/files">
1754 <a href="/help/files">
1750 files
1755 files
1751 </a>
1756 </a>
1752 </td><td>
1757 </td><td>
1753 list tracked files
1758 list tracked files
1754 </td></tr>
1759 </td></tr>
1755 <tr><td>
1760 <tr><td>
1756 <a href="/help/graft">
1761 <a href="/help/graft">
1757 graft
1762 graft
1758 </a>
1763 </a>
1759 </td><td>
1764 </td><td>
1760 copy changes from other branches onto the current branch
1765 copy changes from other branches onto the current branch
1761 </td></tr>
1766 </td></tr>
1762 <tr><td>
1767 <tr><td>
1763 <a href="/help/grep">
1768 <a href="/help/grep">
1764 grep
1769 grep
1765 </a>
1770 </a>
1766 </td><td>
1771 </td><td>
1767 search for a pattern in specified files and revisions
1772 search for a pattern in specified files and revisions
1768 </td></tr>
1773 </td></tr>
1769 <tr><td>
1774 <tr><td>
1770 <a href="/help/heads">
1775 <a href="/help/heads">
1771 heads
1776 heads
1772 </a>
1777 </a>
1773 </td><td>
1778 </td><td>
1774 show branch heads
1779 show branch heads
1775 </td></tr>
1780 </td></tr>
1776 <tr><td>
1781 <tr><td>
1777 <a href="/help/help">
1782 <a href="/help/help">
1778 help
1783 help
1779 </a>
1784 </a>
1780 </td><td>
1785 </td><td>
1781 show help for a given topic or a help overview
1786 show help for a given topic or a help overview
1782 </td></tr>
1787 </td></tr>
1783 <tr><td>
1788 <tr><td>
1784 <a href="/help/identify">
1789 <a href="/help/identify">
1785 identify
1790 identify
1786 </a>
1791 </a>
1787 </td><td>
1792 </td><td>
1788 identify the working directory or specified revision
1793 identify the working directory or specified revision
1789 </td></tr>
1794 </td></tr>
1790 <tr><td>
1795 <tr><td>
1791 <a href="/help/import">
1796 <a href="/help/import">
1792 import
1797 import
1793 </a>
1798 </a>
1794 </td><td>
1799 </td><td>
1795 import an ordered set of patches
1800 import an ordered set of patches
1796 </td></tr>
1801 </td></tr>
1797 <tr><td>
1802 <tr><td>
1798 <a href="/help/incoming">
1803 <a href="/help/incoming">
1799 incoming
1804 incoming
1800 </a>
1805 </a>
1801 </td><td>
1806 </td><td>
1802 show new changesets found in source
1807 show new changesets found in source
1803 </td></tr>
1808 </td></tr>
1804 <tr><td>
1809 <tr><td>
1805 <a href="/help/manifest">
1810 <a href="/help/manifest">
1806 manifest
1811 manifest
1807 </a>
1812 </a>
1808 </td><td>
1813 </td><td>
1809 output the current or given revision of the project manifest
1814 output the current or given revision of the project manifest
1810 </td></tr>
1815 </td></tr>
1811 <tr><td>
1816 <tr><td>
1812 <a href="/help/nohelp">
1817 <a href="/help/nohelp">
1813 nohelp
1818 nohelp
1814 </a>
1819 </a>
1815 </td><td>
1820 </td><td>
1816 (no help text available)
1821 (no help text available)
1817 </td></tr>
1822 </td></tr>
1818 <tr><td>
1823 <tr><td>
1819 <a href="/help/outgoing">
1824 <a href="/help/outgoing">
1820 outgoing
1825 outgoing
1821 </a>
1826 </a>
1822 </td><td>
1827 </td><td>
1823 show changesets not found in the destination
1828 show changesets not found in the destination
1824 </td></tr>
1829 </td></tr>
1825 <tr><td>
1830 <tr><td>
1826 <a href="/help/paths">
1831 <a href="/help/paths">
1827 paths
1832 paths
1828 </a>
1833 </a>
1829 </td><td>
1834 </td><td>
1830 show aliases for remote repositories
1835 show aliases for remote repositories
1831 </td></tr>
1836 </td></tr>
1832 <tr><td>
1837 <tr><td>
1833 <a href="/help/phase">
1838 <a href="/help/phase">
1834 phase
1839 phase
1835 </a>
1840 </a>
1836 </td><td>
1841 </td><td>
1837 set or show the current phase name
1842 set or show the current phase name
1838 </td></tr>
1843 </td></tr>
1839 <tr><td>
1844 <tr><td>
1840 <a href="/help/recover">
1845 <a href="/help/recover">
1841 recover
1846 recover
1842 </a>
1847 </a>
1843 </td><td>
1848 </td><td>
1844 roll back an interrupted transaction
1849 roll back an interrupted transaction
1845 </td></tr>
1850 </td></tr>
1846 <tr><td>
1851 <tr><td>
1847 <a href="/help/rename">
1852 <a href="/help/rename">
1848 rename
1853 rename
1849 </a>
1854 </a>
1850 </td><td>
1855 </td><td>
1851 rename files; equivalent of copy + remove
1856 rename files; equivalent of copy + remove
1852 </td></tr>
1857 </td></tr>
1853 <tr><td>
1858 <tr><td>
1854 <a href="/help/resolve">
1859 <a href="/help/resolve">
1855 resolve
1860 resolve
1856 </a>
1861 </a>
1857 </td><td>
1862 </td><td>
1858 redo merges or set/view the merge status of files
1863 redo merges or set/view the merge status of files
1859 </td></tr>
1864 </td></tr>
1860 <tr><td>
1865 <tr><td>
1861 <a href="/help/revert">
1866 <a href="/help/revert">
1862 revert
1867 revert
1863 </a>
1868 </a>
1864 </td><td>
1869 </td><td>
1865 restore files to their checkout state
1870 restore files to their checkout state
1866 </td></tr>
1871 </td></tr>
1867 <tr><td>
1872 <tr><td>
1868 <a href="/help/root">
1873 <a href="/help/root">
1869 root
1874 root
1870 </a>
1875 </a>
1871 </td><td>
1876 </td><td>
1872 print the root (top) of the current working directory
1877 print the root (top) of the current working directory
1873 </td></tr>
1878 </td></tr>
1874 <tr><td>
1879 <tr><td>
1875 <a href="/help/tag">
1880 <a href="/help/tag">
1876 tag
1881 tag
1877 </a>
1882 </a>
1878 </td><td>
1883 </td><td>
1879 add one or more tags for the current or given revision
1884 add one or more tags for the current or given revision
1880 </td></tr>
1885 </td></tr>
1881 <tr><td>
1886 <tr><td>
1882 <a href="/help/tags">
1887 <a href="/help/tags">
1883 tags
1888 tags
1884 </a>
1889 </a>
1885 </td><td>
1890 </td><td>
1886 list repository tags
1891 list repository tags
1887 </td></tr>
1892 </td></tr>
1888 <tr><td>
1893 <tr><td>
1889 <a href="/help/unbundle">
1894 <a href="/help/unbundle">
1890 unbundle
1895 unbundle
1891 </a>
1896 </a>
1892 </td><td>
1897 </td><td>
1893 apply one or more changegroup files
1898 apply one or more changegroup files
1894 </td></tr>
1899 </td></tr>
1895 <tr><td>
1900 <tr><td>
1896 <a href="/help/verify">
1901 <a href="/help/verify">
1897 verify
1902 verify
1898 </a>
1903 </a>
1899 </td><td>
1904 </td><td>
1900 verify the integrity of the repository
1905 verify the integrity of the repository
1901 </td></tr>
1906 </td></tr>
1902 <tr><td>
1907 <tr><td>
1903 <a href="/help/version">
1908 <a href="/help/version">
1904 version
1909 version
1905 </a>
1910 </a>
1906 </td><td>
1911 </td><td>
1907 output version and copyright information
1912 output version and copyright information
1908 </td></tr>
1913 </td></tr>
1909 </table>
1914 </table>
1910 </div>
1915 </div>
1911 </div>
1916 </div>
1912
1917
1913 <script type="text/javascript">process_dates()</script>
1918 <script type="text/javascript">process_dates()</script>
1914
1919
1915
1920
1916 </body>
1921 </body>
1917 </html>
1922 </html>
1918
1923
1919
1924
1920 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
1925 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
1921 200 Script output follows
1926 200 Script output follows
1922
1927
1923 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1928 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1924 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1929 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1925 <head>
1930 <head>
1926 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1931 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1927 <meta name="robots" content="index, nofollow" />
1932 <meta name="robots" content="index, nofollow" />
1928 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1933 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1929 <script type="text/javascript" src="/static/mercurial.js"></script>
1934 <script type="text/javascript" src="/static/mercurial.js"></script>
1930
1935
1931 <title>Help: add</title>
1936 <title>Help: add</title>
1932 </head>
1937 </head>
1933 <body>
1938 <body>
1934
1939
1935 <div class="container">
1940 <div class="container">
1936 <div class="menu">
1941 <div class="menu">
1937 <div class="logo">
1942 <div class="logo">
1938 <a href="https://mercurial-scm.org/">
1943 <a href="https://mercurial-scm.org/">
1939 <img src="/static/hglogo.png" alt="mercurial" /></a>
1944 <img src="/static/hglogo.png" alt="mercurial" /></a>
1940 </div>
1945 </div>
1941 <ul>
1946 <ul>
1942 <li><a href="/shortlog">log</a></li>
1947 <li><a href="/shortlog">log</a></li>
1943 <li><a href="/graph">graph</a></li>
1948 <li><a href="/graph">graph</a></li>
1944 <li><a href="/tags">tags</a></li>
1949 <li><a href="/tags">tags</a></li>
1945 <li><a href="/bookmarks">bookmarks</a></li>
1950 <li><a href="/bookmarks">bookmarks</a></li>
1946 <li><a href="/branches">branches</a></li>
1951 <li><a href="/branches">branches</a></li>
1947 </ul>
1952 </ul>
1948 <ul>
1953 <ul>
1949 <li class="active"><a href="/help">help</a></li>
1954 <li class="active"><a href="/help">help</a></li>
1950 </ul>
1955 </ul>
1951 </div>
1956 </div>
1952
1957
1953 <div class="main">
1958 <div class="main">
1954 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1959 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1955 <h3>Help: add</h3>
1960 <h3>Help: add</h3>
1956
1961
1957 <form class="search" action="/log">
1962 <form class="search" action="/log">
1958
1963
1959 <p><input name="rev" id="search1" type="text" size="30" /></p>
1964 <p><input name="rev" id="search1" type="text" size="30" /></p>
1960 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1965 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1961 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1966 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1962 </form>
1967 </form>
1963 <div id="doc">
1968 <div id="doc">
1964 <p>
1969 <p>
1965 hg add [OPTION]... [FILE]...
1970 hg add [OPTION]... [FILE]...
1966 </p>
1971 </p>
1967 <p>
1972 <p>
1968 add the specified files on the next commit
1973 add the specified files on the next commit
1969 </p>
1974 </p>
1970 <p>
1975 <p>
1971 Schedule files to be version controlled and added to the
1976 Schedule files to be version controlled and added to the
1972 repository.
1977 repository.
1973 </p>
1978 </p>
1974 <p>
1979 <p>
1975 The files will be added to the repository at the next commit. To
1980 The files will be added to the repository at the next commit. To
1976 undo an add before that, see &quot;hg forget&quot;.
1981 undo an add before that, see &quot;hg forget&quot;.
1977 </p>
1982 </p>
1978 <p>
1983 <p>
1979 If no names are given, add all files to the repository.
1984 If no names are given, add all files to the repository.
1980 </p>
1985 </p>
1981 <p>
1986 <p>
1982 An example showing how new (unknown) files are added
1987 An example showing how new (unknown) files are added
1983 automatically by &quot;hg add&quot;:
1988 automatically by &quot;hg add&quot;:
1984 </p>
1989 </p>
1985 <pre>
1990 <pre>
1986 \$ ls (re)
1991 \$ ls (re)
1987 foo.c
1992 foo.c
1988 \$ hg status (re)
1993 \$ hg status (re)
1989 ? foo.c
1994 ? foo.c
1990 \$ hg add (re)
1995 \$ hg add (re)
1991 adding foo.c
1996 adding foo.c
1992 \$ hg status (re)
1997 \$ hg status (re)
1993 A foo.c
1998 A foo.c
1994 </pre>
1999 </pre>
1995 <p>
2000 <p>
1996 Returns 0 if all files are successfully added.
2001 Returns 0 if all files are successfully added.
1997 </p>
2002 </p>
1998 <p>
2003 <p>
1999 options ([+] can be repeated):
2004 options ([+] can be repeated):
2000 </p>
2005 </p>
2001 <table>
2006 <table>
2002 <tr><td>-I</td>
2007 <tr><td>-I</td>
2003 <td>--include PATTERN [+]</td>
2008 <td>--include PATTERN [+]</td>
2004 <td>include names matching the given patterns</td></tr>
2009 <td>include names matching the given patterns</td></tr>
2005 <tr><td>-X</td>
2010 <tr><td>-X</td>
2006 <td>--exclude PATTERN [+]</td>
2011 <td>--exclude PATTERN [+]</td>
2007 <td>exclude names matching the given patterns</td></tr>
2012 <td>exclude names matching the given patterns</td></tr>
2008 <tr><td>-S</td>
2013 <tr><td>-S</td>
2009 <td>--subrepos</td>
2014 <td>--subrepos</td>
2010 <td>recurse into subrepositories</td></tr>
2015 <td>recurse into subrepositories</td></tr>
2011 <tr><td>-n</td>
2016 <tr><td>-n</td>
2012 <td>--dry-run</td>
2017 <td>--dry-run</td>
2013 <td>do not perform actions, just print output</td></tr>
2018 <td>do not perform actions, just print output</td></tr>
2014 </table>
2019 </table>
2015 <p>
2020 <p>
2016 global options ([+] can be repeated):
2021 global options ([+] can be repeated):
2017 </p>
2022 </p>
2018 <table>
2023 <table>
2019 <tr><td>-R</td>
2024 <tr><td>-R</td>
2020 <td>--repository REPO</td>
2025 <td>--repository REPO</td>
2021 <td>repository root directory or name of overlay bundle file</td></tr>
2026 <td>repository root directory or name of overlay bundle file</td></tr>
2022 <tr><td></td>
2027 <tr><td></td>
2023 <td>--cwd DIR</td>
2028 <td>--cwd DIR</td>
2024 <td>change working directory</td></tr>
2029 <td>change working directory</td></tr>
2025 <tr><td>-y</td>
2030 <tr><td>-y</td>
2026 <td>--noninteractive</td>
2031 <td>--noninteractive</td>
2027 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2032 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2028 <tr><td>-q</td>
2033 <tr><td>-q</td>
2029 <td>--quiet</td>
2034 <td>--quiet</td>
2030 <td>suppress output</td></tr>
2035 <td>suppress output</td></tr>
2031 <tr><td>-v</td>
2036 <tr><td>-v</td>
2032 <td>--verbose</td>
2037 <td>--verbose</td>
2033 <td>enable additional output</td></tr>
2038 <td>enable additional output</td></tr>
2034 <tr><td></td>
2039 <tr><td></td>
2035 <td>--config CONFIG [+]</td>
2040 <td>--config CONFIG [+]</td>
2036 <td>set/override config option (use 'section.name=value')</td></tr>
2041 <td>set/override config option (use 'section.name=value')</td></tr>
2037 <tr><td></td>
2042 <tr><td></td>
2038 <td>--debug</td>
2043 <td>--debug</td>
2039 <td>enable debugging output</td></tr>
2044 <td>enable debugging output</td></tr>
2040 <tr><td></td>
2045 <tr><td></td>
2041 <td>--debugger</td>
2046 <td>--debugger</td>
2042 <td>start debugger</td></tr>
2047 <td>start debugger</td></tr>
2043 <tr><td></td>
2048 <tr><td></td>
2044 <td>--encoding ENCODE</td>
2049 <td>--encoding ENCODE</td>
2045 <td>set the charset encoding (default: ascii)</td></tr>
2050 <td>set the charset encoding (default: ascii)</td></tr>
2046 <tr><td></td>
2051 <tr><td></td>
2047 <td>--encodingmode MODE</td>
2052 <td>--encodingmode MODE</td>
2048 <td>set the charset encoding mode (default: strict)</td></tr>
2053 <td>set the charset encoding mode (default: strict)</td></tr>
2049 <tr><td></td>
2054 <tr><td></td>
2050 <td>--traceback</td>
2055 <td>--traceback</td>
2051 <td>always print a traceback on exception</td></tr>
2056 <td>always print a traceback on exception</td></tr>
2052 <tr><td></td>
2057 <tr><td></td>
2053 <td>--time</td>
2058 <td>--time</td>
2054 <td>time how long the command takes</td></tr>
2059 <td>time how long the command takes</td></tr>
2055 <tr><td></td>
2060 <tr><td></td>
2056 <td>--profile</td>
2061 <td>--profile</td>
2057 <td>print command execution profile</td></tr>
2062 <td>print command execution profile</td></tr>
2058 <tr><td></td>
2063 <tr><td></td>
2059 <td>--version</td>
2064 <td>--version</td>
2060 <td>output version information and exit</td></tr>
2065 <td>output version information and exit</td></tr>
2061 <tr><td>-h</td>
2066 <tr><td>-h</td>
2062 <td>--help</td>
2067 <td>--help</td>
2063 <td>display help and exit</td></tr>
2068 <td>display help and exit</td></tr>
2064 <tr><td></td>
2069 <tr><td></td>
2065 <td>--hidden</td>
2070 <td>--hidden</td>
2066 <td>consider hidden changesets</td></tr>
2071 <td>consider hidden changesets</td></tr>
2067 </table>
2072 </table>
2068
2073
2069 </div>
2074 </div>
2070 </div>
2075 </div>
2071 </div>
2076 </div>
2072
2077
2073 <script type="text/javascript">process_dates()</script>
2078 <script type="text/javascript">process_dates()</script>
2074
2079
2075
2080
2076 </body>
2081 </body>
2077 </html>
2082 </html>
2078
2083
2079
2084
2080 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2085 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2081 200 Script output follows
2086 200 Script output follows
2082
2087
2083 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2088 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2084 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2089 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2085 <head>
2090 <head>
2086 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2091 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2087 <meta name="robots" content="index, nofollow" />
2092 <meta name="robots" content="index, nofollow" />
2088 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2093 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2089 <script type="text/javascript" src="/static/mercurial.js"></script>
2094 <script type="text/javascript" src="/static/mercurial.js"></script>
2090
2095
2091 <title>Help: remove</title>
2096 <title>Help: remove</title>
2092 </head>
2097 </head>
2093 <body>
2098 <body>
2094
2099
2095 <div class="container">
2100 <div class="container">
2096 <div class="menu">
2101 <div class="menu">
2097 <div class="logo">
2102 <div class="logo">
2098 <a href="https://mercurial-scm.org/">
2103 <a href="https://mercurial-scm.org/">
2099 <img src="/static/hglogo.png" alt="mercurial" /></a>
2104 <img src="/static/hglogo.png" alt="mercurial" /></a>
2100 </div>
2105 </div>
2101 <ul>
2106 <ul>
2102 <li><a href="/shortlog">log</a></li>
2107 <li><a href="/shortlog">log</a></li>
2103 <li><a href="/graph">graph</a></li>
2108 <li><a href="/graph">graph</a></li>
2104 <li><a href="/tags">tags</a></li>
2109 <li><a href="/tags">tags</a></li>
2105 <li><a href="/bookmarks">bookmarks</a></li>
2110 <li><a href="/bookmarks">bookmarks</a></li>
2106 <li><a href="/branches">branches</a></li>
2111 <li><a href="/branches">branches</a></li>
2107 </ul>
2112 </ul>
2108 <ul>
2113 <ul>
2109 <li class="active"><a href="/help">help</a></li>
2114 <li class="active"><a href="/help">help</a></li>
2110 </ul>
2115 </ul>
2111 </div>
2116 </div>
2112
2117
2113 <div class="main">
2118 <div class="main">
2114 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2119 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2115 <h3>Help: remove</h3>
2120 <h3>Help: remove</h3>
2116
2121
2117 <form class="search" action="/log">
2122 <form class="search" action="/log">
2118
2123
2119 <p><input name="rev" id="search1" type="text" size="30" /></p>
2124 <p><input name="rev" id="search1" type="text" size="30" /></p>
2120 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2125 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2121 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2126 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2122 </form>
2127 </form>
2123 <div id="doc">
2128 <div id="doc">
2124 <p>
2129 <p>
2125 hg remove [OPTION]... FILE...
2130 hg remove [OPTION]... FILE...
2126 </p>
2131 </p>
2127 <p>
2132 <p>
2128 aliases: rm
2133 aliases: rm
2129 </p>
2134 </p>
2130 <p>
2135 <p>
2131 remove the specified files on the next commit
2136 remove the specified files on the next commit
2132 </p>
2137 </p>
2133 <p>
2138 <p>
2134 Schedule the indicated files for removal from the current branch.
2139 Schedule the indicated files for removal from the current branch.
2135 </p>
2140 </p>
2136 <p>
2141 <p>
2137 This command schedules the files to be removed at the next commit.
2142 This command schedules the files to be removed at the next commit.
2138 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2143 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2139 files, see &quot;hg forget&quot;.
2144 files, see &quot;hg forget&quot;.
2140 </p>
2145 </p>
2141 <p>
2146 <p>
2142 -A/--after can be used to remove only files that have already
2147 -A/--after can be used to remove only files that have already
2143 been deleted, -f/--force can be used to force deletion, and -Af
2148 been deleted, -f/--force can be used to force deletion, and -Af
2144 can be used to remove files from the next revision without
2149 can be used to remove files from the next revision without
2145 deleting them from the working directory.
2150 deleting them from the working directory.
2146 </p>
2151 </p>
2147 <p>
2152 <p>
2148 The following table details the behavior of remove for different
2153 The following table details the behavior of remove for different
2149 file states (columns) and option combinations (rows). The file
2154 file states (columns) and option combinations (rows). The file
2150 states are Added [A], Clean [C], Modified [M] and Missing [!]
2155 states are Added [A], Clean [C], Modified [M] and Missing [!]
2151 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2156 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2152 (from branch) and Delete (from disk):
2157 (from branch) and Delete (from disk):
2153 </p>
2158 </p>
2154 <table>
2159 <table>
2155 <tr><td>opt/state</td>
2160 <tr><td>opt/state</td>
2156 <td>A</td>
2161 <td>A</td>
2157 <td>C</td>
2162 <td>C</td>
2158 <td>M</td>
2163 <td>M</td>
2159 <td>!</td></tr>
2164 <td>!</td></tr>
2160 <tr><td>none</td>
2165 <tr><td>none</td>
2161 <td>W</td>
2166 <td>W</td>
2162 <td>RD</td>
2167 <td>RD</td>
2163 <td>W</td>
2168 <td>W</td>
2164 <td>R</td></tr>
2169 <td>R</td></tr>
2165 <tr><td>-f</td>
2170 <tr><td>-f</td>
2166 <td>R</td>
2171 <td>R</td>
2167 <td>RD</td>
2172 <td>RD</td>
2168 <td>RD</td>
2173 <td>RD</td>
2169 <td>R</td></tr>
2174 <td>R</td></tr>
2170 <tr><td>-A</td>
2175 <tr><td>-A</td>
2171 <td>W</td>
2176 <td>W</td>
2172 <td>W</td>
2177 <td>W</td>
2173 <td>W</td>
2178 <td>W</td>
2174 <td>R</td></tr>
2179 <td>R</td></tr>
2175 <tr><td>-Af</td>
2180 <tr><td>-Af</td>
2176 <td>R</td>
2181 <td>R</td>
2177 <td>R</td>
2182 <td>R</td>
2178 <td>R</td>
2183 <td>R</td>
2179 <td>R</td></tr>
2184 <td>R</td></tr>
2180 </table>
2185 </table>
2181 <p>
2186 <p>
2182 Note that remove never deletes files in Added [A] state from the
2187 Note that remove never deletes files in Added [A] state from the
2183 working directory, not even if option --force is specified.
2188 working directory, not even if option --force is specified.
2184 </p>
2189 </p>
2185 <p>
2190 <p>
2186 Returns 0 on success, 1 if any warnings encountered.
2191 Returns 0 on success, 1 if any warnings encountered.
2187 </p>
2192 </p>
2188 <p>
2193 <p>
2189 options ([+] can be repeated):
2194 options ([+] can be repeated):
2190 </p>
2195 </p>
2191 <table>
2196 <table>
2192 <tr><td>-A</td>
2197 <tr><td>-A</td>
2193 <td>--after</td>
2198 <td>--after</td>
2194 <td>record delete for missing files</td></tr>
2199 <td>record delete for missing files</td></tr>
2195 <tr><td>-f</td>
2200 <tr><td>-f</td>
2196 <td>--force</td>
2201 <td>--force</td>
2197 <td>remove (and delete) file even if added or modified</td></tr>
2202 <td>remove (and delete) file even if added or modified</td></tr>
2198 <tr><td>-S</td>
2203 <tr><td>-S</td>
2199 <td>--subrepos</td>
2204 <td>--subrepos</td>
2200 <td>recurse into subrepositories</td></tr>
2205 <td>recurse into subrepositories</td></tr>
2201 <tr><td>-I</td>
2206 <tr><td>-I</td>
2202 <td>--include PATTERN [+]</td>
2207 <td>--include PATTERN [+]</td>
2203 <td>include names matching the given patterns</td></tr>
2208 <td>include names matching the given patterns</td></tr>
2204 <tr><td>-X</td>
2209 <tr><td>-X</td>
2205 <td>--exclude PATTERN [+]</td>
2210 <td>--exclude PATTERN [+]</td>
2206 <td>exclude names matching the given patterns</td></tr>
2211 <td>exclude names matching the given patterns</td></tr>
2207 </table>
2212 </table>
2208 <p>
2213 <p>
2209 global options ([+] can be repeated):
2214 global options ([+] can be repeated):
2210 </p>
2215 </p>
2211 <table>
2216 <table>
2212 <tr><td>-R</td>
2217 <tr><td>-R</td>
2213 <td>--repository REPO</td>
2218 <td>--repository REPO</td>
2214 <td>repository root directory or name of overlay bundle file</td></tr>
2219 <td>repository root directory or name of overlay bundle file</td></tr>
2215 <tr><td></td>
2220 <tr><td></td>
2216 <td>--cwd DIR</td>
2221 <td>--cwd DIR</td>
2217 <td>change working directory</td></tr>
2222 <td>change working directory</td></tr>
2218 <tr><td>-y</td>
2223 <tr><td>-y</td>
2219 <td>--noninteractive</td>
2224 <td>--noninteractive</td>
2220 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2225 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2221 <tr><td>-q</td>
2226 <tr><td>-q</td>
2222 <td>--quiet</td>
2227 <td>--quiet</td>
2223 <td>suppress output</td></tr>
2228 <td>suppress output</td></tr>
2224 <tr><td>-v</td>
2229 <tr><td>-v</td>
2225 <td>--verbose</td>
2230 <td>--verbose</td>
2226 <td>enable additional output</td></tr>
2231 <td>enable additional output</td></tr>
2227 <tr><td></td>
2232 <tr><td></td>
2228 <td>--config CONFIG [+]</td>
2233 <td>--config CONFIG [+]</td>
2229 <td>set/override config option (use 'section.name=value')</td></tr>
2234 <td>set/override config option (use 'section.name=value')</td></tr>
2230 <tr><td></td>
2235 <tr><td></td>
2231 <td>--debug</td>
2236 <td>--debug</td>
2232 <td>enable debugging output</td></tr>
2237 <td>enable debugging output</td></tr>
2233 <tr><td></td>
2238 <tr><td></td>
2234 <td>--debugger</td>
2239 <td>--debugger</td>
2235 <td>start debugger</td></tr>
2240 <td>start debugger</td></tr>
2236 <tr><td></td>
2241 <tr><td></td>
2237 <td>--encoding ENCODE</td>
2242 <td>--encoding ENCODE</td>
2238 <td>set the charset encoding (default: ascii)</td></tr>
2243 <td>set the charset encoding (default: ascii)</td></tr>
2239 <tr><td></td>
2244 <tr><td></td>
2240 <td>--encodingmode MODE</td>
2245 <td>--encodingmode MODE</td>
2241 <td>set the charset encoding mode (default: strict)</td></tr>
2246 <td>set the charset encoding mode (default: strict)</td></tr>
2242 <tr><td></td>
2247 <tr><td></td>
2243 <td>--traceback</td>
2248 <td>--traceback</td>
2244 <td>always print a traceback on exception</td></tr>
2249 <td>always print a traceback on exception</td></tr>
2245 <tr><td></td>
2250 <tr><td></td>
2246 <td>--time</td>
2251 <td>--time</td>
2247 <td>time how long the command takes</td></tr>
2252 <td>time how long the command takes</td></tr>
2248 <tr><td></td>
2253 <tr><td></td>
2249 <td>--profile</td>
2254 <td>--profile</td>
2250 <td>print command execution profile</td></tr>
2255 <td>print command execution profile</td></tr>
2251 <tr><td></td>
2256 <tr><td></td>
2252 <td>--version</td>
2257 <td>--version</td>
2253 <td>output version information and exit</td></tr>
2258 <td>output version information and exit</td></tr>
2254 <tr><td>-h</td>
2259 <tr><td>-h</td>
2255 <td>--help</td>
2260 <td>--help</td>
2256 <td>display help and exit</td></tr>
2261 <td>display help and exit</td></tr>
2257 <tr><td></td>
2262 <tr><td></td>
2258 <td>--hidden</td>
2263 <td>--hidden</td>
2259 <td>consider hidden changesets</td></tr>
2264 <td>consider hidden changesets</td></tr>
2260 </table>
2265 </table>
2261
2266
2262 </div>
2267 </div>
2263 </div>
2268 </div>
2264 </div>
2269 </div>
2265
2270
2266 <script type="text/javascript">process_dates()</script>
2271 <script type="text/javascript">process_dates()</script>
2267
2272
2268
2273
2269 </body>
2274 </body>
2270 </html>
2275 </html>
2271
2276
2272
2277
2273 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2278 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2274 200 Script output follows
2279 200 Script output follows
2275
2280
2276 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2281 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2277 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2282 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2278 <head>
2283 <head>
2279 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2284 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2280 <meta name="robots" content="index, nofollow" />
2285 <meta name="robots" content="index, nofollow" />
2281 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2286 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2282 <script type="text/javascript" src="/static/mercurial.js"></script>
2287 <script type="text/javascript" src="/static/mercurial.js"></script>
2283
2288
2284 <title>Help: revisions</title>
2289 <title>Help: revisions</title>
2285 </head>
2290 </head>
2286 <body>
2291 <body>
2287
2292
2288 <div class="container">
2293 <div class="container">
2289 <div class="menu">
2294 <div class="menu">
2290 <div class="logo">
2295 <div class="logo">
2291 <a href="https://mercurial-scm.org/">
2296 <a href="https://mercurial-scm.org/">
2292 <img src="/static/hglogo.png" alt="mercurial" /></a>
2297 <img src="/static/hglogo.png" alt="mercurial" /></a>
2293 </div>
2298 </div>
2294 <ul>
2299 <ul>
2295 <li><a href="/shortlog">log</a></li>
2300 <li><a href="/shortlog">log</a></li>
2296 <li><a href="/graph">graph</a></li>
2301 <li><a href="/graph">graph</a></li>
2297 <li><a href="/tags">tags</a></li>
2302 <li><a href="/tags">tags</a></li>
2298 <li><a href="/bookmarks">bookmarks</a></li>
2303 <li><a href="/bookmarks">bookmarks</a></li>
2299 <li><a href="/branches">branches</a></li>
2304 <li><a href="/branches">branches</a></li>
2300 </ul>
2305 </ul>
2301 <ul>
2306 <ul>
2302 <li class="active"><a href="/help">help</a></li>
2307 <li class="active"><a href="/help">help</a></li>
2303 </ul>
2308 </ul>
2304 </div>
2309 </div>
2305
2310
2306 <div class="main">
2311 <div class="main">
2307 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2312 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2308 <h3>Help: revisions</h3>
2313 <h3>Help: revisions</h3>
2309
2314
2310 <form class="search" action="/log">
2315 <form class="search" action="/log">
2311
2316
2312 <p><input name="rev" id="search1" type="text" size="30" /></p>
2317 <p><input name="rev" id="search1" type="text" size="30" /></p>
2313 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2318 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2314 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2319 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2315 </form>
2320 </form>
2316 <div id="doc">
2321 <div id="doc">
2317 <h1>Specifying Single Revisions</h1>
2322 <h1>Specifying Single Revisions</h1>
2318 <p>
2323 <p>
2319 Mercurial supports several ways to specify individual revisions.
2324 Mercurial supports several ways to specify individual revisions.
2320 </p>
2325 </p>
2321 <p>
2326 <p>
2322 A plain integer is treated as a revision number. Negative integers are
2327 A plain integer is treated as a revision number. Negative integers are
2323 treated as sequential offsets from the tip, with -1 denoting the tip,
2328 treated as sequential offsets from the tip, with -1 denoting the tip,
2324 -2 denoting the revision prior to the tip, and so forth.
2329 -2 denoting the revision prior to the tip, and so forth.
2325 </p>
2330 </p>
2326 <p>
2331 <p>
2327 A 40-digit hexadecimal string is treated as a unique revision
2332 A 40-digit hexadecimal string is treated as a unique revision
2328 identifier.
2333 identifier.
2329 </p>
2334 </p>
2330 <p>
2335 <p>
2331 A hexadecimal string less than 40 characters long is treated as a
2336 A hexadecimal string less than 40 characters long is treated as a
2332 unique revision identifier and is referred to as a short-form
2337 unique revision identifier and is referred to as a short-form
2333 identifier. A short-form identifier is only valid if it is the prefix
2338 identifier. A short-form identifier is only valid if it is the prefix
2334 of exactly one full-length identifier.
2339 of exactly one full-length identifier.
2335 </p>
2340 </p>
2336 <p>
2341 <p>
2337 Any other string is treated as a bookmark, tag, or branch name. A
2342 Any other string is treated as a bookmark, tag, or branch name. A
2338 bookmark is a movable pointer to a revision. A tag is a permanent name
2343 bookmark is a movable pointer to a revision. A tag is a permanent name
2339 associated with a revision. A branch name denotes the tipmost open branch head
2344 associated with a revision. A branch name denotes the tipmost open branch head
2340 of that branch - or if they are all closed, the tipmost closed head of the
2345 of that branch - or if they are all closed, the tipmost closed head of the
2341 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2346 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2342 </p>
2347 </p>
2343 <p>
2348 <p>
2344 The reserved name &quot;tip&quot; always identifies the most recent revision.
2349 The reserved name &quot;tip&quot; always identifies the most recent revision.
2345 </p>
2350 </p>
2346 <p>
2351 <p>
2347 The reserved name &quot;null&quot; indicates the null revision. This is the
2352 The reserved name &quot;null&quot; indicates the null revision. This is the
2348 revision of an empty repository, and the parent of revision 0.
2353 revision of an empty repository, and the parent of revision 0.
2349 </p>
2354 </p>
2350 <p>
2355 <p>
2351 The reserved name &quot;.&quot; indicates the working directory parent. If no
2356 The reserved name &quot;.&quot; indicates the working directory parent. If no
2352 working directory is checked out, it is equivalent to null. If an
2357 working directory is checked out, it is equivalent to null. If an
2353 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2358 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2354 parent.
2359 parent.
2355 </p>
2360 </p>
2356
2361
2357 </div>
2362 </div>
2358 </div>
2363 </div>
2359 </div>
2364 </div>
2360
2365
2361 <script type="text/javascript">process_dates()</script>
2366 <script type="text/javascript">process_dates()</script>
2362
2367
2363
2368
2364 </body>
2369 </body>
2365 </html>
2370 </html>
2366
2371
2367
2372
2368 $ killdaemons.py
2373 $ killdaemons.py
2369
2374
2370 #endif
2375 #endif
General Comments 0
You need to be logged in to leave comments. Login now