##// END OF EJS Templates
tests: port test extension in test-help.t to python 3...
Augie Fackler -
r32545:37863db5 default
parent child Browse files
Show More
@@ -1,3338 +1,3338 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 bundle file
61 bundle create a bundle 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 revision history for a pattern in specified files
72 grep search revision history for a pattern in specified files
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 bundle files
98 unbundle apply one or more bundle 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 bundlespec Bundle File Formats
105 bundlespec Bundle File Formats
106 color Colorizing Outputs
106 color Colorizing Outputs
107 config Configuration Files
107 config Configuration Files
108 dates Date Formats
108 dates Date Formats
109 diffs Diff Formats
109 diffs Diff Formats
110 environment Environment Variables
110 environment Environment Variables
111 extensions Using Additional Features
111 extensions Using Additional Features
112 filesets Specifying File Sets
112 filesets Specifying File Sets
113 glossary Glossary
113 glossary Glossary
114 hgignore Syntax for Mercurial Ignore Files
114 hgignore Syntax for Mercurial Ignore Files
115 hgweb Configuring hgweb
115 hgweb Configuring hgweb
116 internals Technical implementation topics
116 internals Technical implementation topics
117 merge-tools Merge Tools
117 merge-tools Merge Tools
118 pager Pager Support
118 pager Pager Support
119 patterns File Name Patterns
119 patterns File Name Patterns
120 phases Working with Phases
120 phases Working with Phases
121 revisions Specifying Revisions
121 revisions Specifying Revisions
122 scripting Using Mercurial from scripts and automation
122 scripting Using Mercurial from scripts and automation
123 subrepos Subrepositories
123 subrepos Subrepositories
124 templating Template Usage
124 templating Template Usage
125 urls URL Paths
125 urls URL Paths
126
126
127 (use 'hg help -v' to show built-in aliases and global options)
127 (use 'hg help -v' to show built-in aliases and global options)
128
128
129 $ hg -q help
129 $ hg -q help
130 add add the specified files on the next commit
130 add add the specified files on the next commit
131 addremove add all new files, delete all missing files
131 addremove add all new files, delete all missing files
132 annotate show changeset information by line for each file
132 annotate show changeset information by line for each file
133 archive create an unversioned archive of a repository revision
133 archive create an unversioned archive of a repository revision
134 backout reverse effect of earlier changeset
134 backout reverse effect of earlier changeset
135 bisect subdivision search of changesets
135 bisect subdivision search of changesets
136 bookmarks create a new bookmark or list existing bookmarks
136 bookmarks create a new bookmark or list existing bookmarks
137 branch set or show the current branch name
137 branch set or show the current branch name
138 branches list repository named branches
138 branches list repository named branches
139 bundle create a bundle file
139 bundle create a bundle file
140 cat output the current or given revision of files
140 cat output the current or given revision of files
141 clone make a copy of an existing repository
141 clone make a copy of an existing repository
142 commit commit the specified files or all outstanding changes
142 commit commit the specified files or all outstanding changes
143 config show combined config settings from all hgrc files
143 config show combined config settings from all hgrc files
144 copy mark files as copied for the next commit
144 copy mark files as copied for the next commit
145 diff diff repository (or selected files)
145 diff diff repository (or selected files)
146 export dump the header and diffs for one or more changesets
146 export dump the header and diffs for one or more changesets
147 files list tracked files
147 files list tracked files
148 forget forget the specified files on the next commit
148 forget forget the specified files on the next commit
149 graft copy changes from other branches onto the current branch
149 graft copy changes from other branches onto the current branch
150 grep search revision history for a pattern in specified files
150 grep search revision history for a pattern in specified files
151 heads show branch heads
151 heads show branch heads
152 help show help for a given topic or a help overview
152 help show help for a given topic or a help overview
153 identify identify the working directory or specified revision
153 identify identify the working directory or specified revision
154 import import an ordered set of patches
154 import import an ordered set of patches
155 incoming show new changesets found in source
155 incoming show new changesets found in source
156 init create a new repository in the given directory
156 init create a new repository in the given directory
157 log show revision history of entire repository or files
157 log show revision history of entire repository or files
158 manifest output the current or given revision of the project manifest
158 manifest output the current or given revision of the project manifest
159 merge merge another revision into working directory
159 merge merge another revision into working directory
160 outgoing show changesets not found in the destination
160 outgoing show changesets not found in the destination
161 paths show aliases for remote repositories
161 paths show aliases for remote repositories
162 phase set or show the current phase name
162 phase set or show the current phase name
163 pull pull changes from the specified source
163 pull pull changes from the specified source
164 push push changes to the specified destination
164 push push changes to the specified destination
165 recover roll back an interrupted transaction
165 recover roll back an interrupted transaction
166 remove remove the specified files on the next commit
166 remove remove the specified files on the next commit
167 rename rename files; equivalent of copy + remove
167 rename rename files; equivalent of copy + remove
168 resolve redo merges or set/view the merge status of files
168 resolve redo merges or set/view the merge status of files
169 revert restore files to their checkout state
169 revert restore files to their checkout state
170 root print the root (top) of the current working directory
170 root print the root (top) of the current working directory
171 serve start stand-alone webserver
171 serve start stand-alone webserver
172 status show changed files in the working directory
172 status show changed files in the working directory
173 summary summarize working directory state
173 summary summarize working directory state
174 tag add one or more tags for the current or given revision
174 tag add one or more tags for the current or given revision
175 tags list repository tags
175 tags list repository tags
176 unbundle apply one or more bundle files
176 unbundle apply one or more bundle files
177 update update working directory (or switch revisions)
177 update update working directory (or switch revisions)
178 verify verify the integrity of the repository
178 verify verify the integrity of the repository
179 version output version and copyright information
179 version output version and copyright information
180
180
181 additional help topics:
181 additional help topics:
182
182
183 bundlespec Bundle File Formats
183 bundlespec Bundle File Formats
184 color Colorizing Outputs
184 color Colorizing Outputs
185 config Configuration Files
185 config Configuration Files
186 dates Date Formats
186 dates Date Formats
187 diffs Diff Formats
187 diffs Diff Formats
188 environment Environment Variables
188 environment Environment Variables
189 extensions Using Additional Features
189 extensions Using Additional Features
190 filesets Specifying File Sets
190 filesets Specifying File Sets
191 glossary Glossary
191 glossary Glossary
192 hgignore Syntax for Mercurial Ignore Files
192 hgignore Syntax for Mercurial Ignore Files
193 hgweb Configuring hgweb
193 hgweb Configuring hgweb
194 internals Technical implementation topics
194 internals Technical implementation topics
195 merge-tools Merge Tools
195 merge-tools Merge Tools
196 pager Pager Support
196 pager Pager Support
197 patterns File Name Patterns
197 patterns File Name Patterns
198 phases Working with Phases
198 phases Working with Phases
199 revisions Specifying Revisions
199 revisions Specifying Revisions
200 scripting Using Mercurial from scripts and automation
200 scripting Using Mercurial from scripts and automation
201 subrepos Subrepositories
201 subrepos Subrepositories
202 templating Template Usage
202 templating Template Usage
203 urls URL Paths
203 urls URL Paths
204
204
205 Test extension help:
205 Test extension help:
206 $ hg help extensions --config extensions.rebase= --config extensions.children=
206 $ hg help extensions --config extensions.rebase= --config extensions.children=
207 Using Additional Features
207 Using Additional Features
208 """""""""""""""""""""""""
208 """""""""""""""""""""""""
209
209
210 Mercurial has the ability to add new features through the use of
210 Mercurial has the ability to add new features through the use of
211 extensions. Extensions may add new commands, add options to existing
211 extensions. Extensions may add new commands, add options to existing
212 commands, change the default behavior of commands, or implement hooks.
212 commands, change the default behavior of commands, or implement hooks.
213
213
214 To enable the "foo" extension, either shipped with Mercurial or in the
214 To enable the "foo" extension, either shipped with Mercurial or in the
215 Python search path, create an entry for it in your configuration file,
215 Python search path, create an entry for it in your configuration file,
216 like this:
216 like this:
217
217
218 [extensions]
218 [extensions]
219 foo =
219 foo =
220
220
221 You may also specify the full path to an extension:
221 You may also specify the full path to an extension:
222
222
223 [extensions]
223 [extensions]
224 myfeature = ~/.hgext/myfeature.py
224 myfeature = ~/.hgext/myfeature.py
225
225
226 See 'hg help config' for more information on configuration files.
226 See 'hg help config' for more information on configuration files.
227
227
228 Extensions are not loaded by default for a variety of reasons: they can
228 Extensions are not loaded by default for a variety of reasons: they can
229 increase startup overhead; they may be meant for advanced usage only; they
229 increase startup overhead; they may be meant for advanced usage only; they
230 may provide potentially dangerous abilities (such as letting you destroy
230 may provide potentially dangerous abilities (such as letting you destroy
231 or modify history); they might not be ready for prime time; or they may
231 or modify history); they might not be ready for prime time; or they may
232 alter some usual behaviors of stock Mercurial. It is thus up to the user
232 alter some usual behaviors of stock Mercurial. It is thus up to the user
233 to activate extensions as needed.
233 to activate extensions as needed.
234
234
235 To explicitly disable an extension enabled in a configuration file of
235 To explicitly disable an extension enabled in a configuration file of
236 broader scope, prepend its path with !:
236 broader scope, prepend its path with !:
237
237
238 [extensions]
238 [extensions]
239 # disabling extension bar residing in /path/to/extension/bar.py
239 # disabling extension bar residing in /path/to/extension/bar.py
240 bar = !/path/to/extension/bar.py
240 bar = !/path/to/extension/bar.py
241 # ditto, but no path was supplied for extension baz
241 # ditto, but no path was supplied for extension baz
242 baz = !
242 baz = !
243
243
244 enabled extensions:
244 enabled extensions:
245
245
246 children command to display child changesets (DEPRECATED)
246 children command to display child changesets (DEPRECATED)
247 rebase command to move sets of revisions to a different ancestor
247 rebase command to move sets of revisions to a different ancestor
248
248
249 disabled extensions:
249 disabled extensions:
250
250
251 acl hooks for controlling repository access
251 acl hooks for controlling repository access
252 blackbox log repository events to a blackbox for debugging
252 blackbox log repository events to a blackbox for debugging
253 bugzilla hooks for integrating with the Bugzilla bug tracker
253 bugzilla hooks for integrating with the Bugzilla bug tracker
254 censor erase file content at a given revision
254 censor erase file content at a given revision
255 churn command to display statistics about repository history
255 churn command to display statistics about repository history
256 clonebundles advertise pre-generated bundles to seed clones
256 clonebundles advertise pre-generated bundles to seed clones
257 convert import revisions from foreign VCS repositories into
257 convert import revisions from foreign VCS repositories into
258 Mercurial
258 Mercurial
259 eol automatically manage newlines in repository files
259 eol automatically manage newlines in repository files
260 extdiff command to allow external programs to compare revisions
260 extdiff command to allow external programs to compare revisions
261 factotum http authentication with factotum
261 factotum http authentication with factotum
262 gpg commands to sign and verify changesets
262 gpg commands to sign and verify changesets
263 hgk browse the repository in a graphical way
263 hgk browse the repository in a graphical way
264 highlight syntax highlighting for hgweb (requires Pygments)
264 highlight syntax highlighting for hgweb (requires Pygments)
265 histedit interactive history editing
265 histedit interactive history editing
266 keyword expand keywords in tracked files
266 keyword expand keywords in tracked files
267 largefiles track large binary files
267 largefiles track large binary files
268 mq manage a stack of patches
268 mq manage a stack of patches
269 notify hooks for sending email push notifications
269 notify hooks for sending email push notifications
270 patchbomb command to send changesets as (a series of) patch emails
270 patchbomb command to send changesets as (a series of) patch emails
271 purge command to delete untracked files from the working
271 purge command to delete untracked files from the working
272 directory
272 directory
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
281
282 Verify that extension keywords appear in help templates
282 Verify that extension keywords appear in help templates
283
283
284 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
284 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
285
285
286 Test short command list with verbose option
286 Test short command list with verbose option
287
287
288 $ hg -v help shortlist
288 $ hg -v help shortlist
289 Mercurial Distributed SCM
289 Mercurial Distributed SCM
290
290
291 basic commands:
291 basic commands:
292
292
293 add add the specified files on the next commit
293 add add the specified files on the next commit
294 annotate, blame
294 annotate, blame
295 show changeset information by line for each file
295 show changeset information by line for each file
296 clone make a copy of an existing repository
296 clone make a copy of an existing repository
297 commit, ci commit the specified files or all outstanding changes
297 commit, ci commit the specified files or all outstanding changes
298 diff diff repository (or selected files)
298 diff diff repository (or selected files)
299 export dump the header and diffs for one or more changesets
299 export dump the header and diffs for one or more changesets
300 forget forget the specified files on the next commit
300 forget forget the specified files on the next commit
301 init create a new repository in the given directory
301 init create a new repository in the given directory
302 log, history show revision history of entire repository or files
302 log, history show revision history of entire repository or files
303 merge merge another revision into working directory
303 merge merge another revision into working directory
304 pull pull changes from the specified source
304 pull pull changes from the specified source
305 push push changes to the specified destination
305 push push changes to the specified destination
306 remove, rm remove the specified files on the next commit
306 remove, rm remove the specified files on the next commit
307 serve start stand-alone webserver
307 serve start stand-alone webserver
308 status, st show changed files in the working directory
308 status, st show changed files in the working directory
309 summary, sum summarize working directory state
309 summary, sum summarize working directory state
310 update, up, checkout, co
310 update, up, checkout, co
311 update working directory (or switch revisions)
311 update working directory (or switch revisions)
312
312
313 global options ([+] can be repeated):
313 global options ([+] can be repeated):
314
314
315 -R --repository REPO repository root directory or name of overlay bundle
315 -R --repository REPO repository root directory or name of overlay bundle
316 file
316 file
317 --cwd DIR change working directory
317 --cwd DIR change working directory
318 -y --noninteractive do not prompt, automatically pick the first choice for
318 -y --noninteractive do not prompt, automatically pick the first choice for
319 all prompts
319 all prompts
320 -q --quiet suppress output
320 -q --quiet suppress output
321 -v --verbose enable additional output
321 -v --verbose enable additional output
322 --color TYPE when to colorize (boolean, always, auto, never, or
322 --color TYPE when to colorize (boolean, always, auto, never, or
323 debug)
323 debug)
324 --config CONFIG [+] set/override config option (use 'section.name=value')
324 --config CONFIG [+] set/override config option (use 'section.name=value')
325 --debug enable debugging output
325 --debug enable debugging output
326 --debugger start debugger
326 --debugger start debugger
327 --encoding ENCODE set the charset encoding (default: ascii)
327 --encoding ENCODE set the charset encoding (default: ascii)
328 --encodingmode MODE set the charset encoding mode (default: strict)
328 --encodingmode MODE set the charset encoding mode (default: strict)
329 --traceback always print a traceback on exception
329 --traceback always print a traceback on exception
330 --time time how long the command takes
330 --time time how long the command takes
331 --profile print command execution profile
331 --profile print command execution profile
332 --version output version information and exit
332 --version output version information and exit
333 -h --help display help and exit
333 -h --help display help and exit
334 --hidden consider hidden changesets
334 --hidden consider hidden changesets
335 --pager TYPE when to paginate (boolean, always, auto, or never)
335 --pager TYPE when to paginate (boolean, always, auto, or never)
336 (default: auto)
336 (default: auto)
337
337
338 (use 'hg help' for the full list of commands)
338 (use 'hg help' for the full list of commands)
339
339
340 $ hg add -h
340 $ hg add -h
341 hg add [OPTION]... [FILE]...
341 hg add [OPTION]... [FILE]...
342
342
343 add the specified files on the next commit
343 add the specified files on the next commit
344
344
345 Schedule files to be version controlled and added to the repository.
345 Schedule files to be version controlled and added to the repository.
346
346
347 The files will be added to the repository at the next commit. To undo an
347 The files will be added to the repository at the next commit. To undo an
348 add before that, see 'hg forget'.
348 add before that, see 'hg forget'.
349
349
350 If no names are given, add all files to the repository (except files
350 If no names are given, add all files to the repository (except files
351 matching ".hgignore").
351 matching ".hgignore").
352
352
353 Returns 0 if all files are successfully added.
353 Returns 0 if all files are successfully added.
354
354
355 options ([+] can be repeated):
355 options ([+] can be repeated):
356
356
357 -I --include PATTERN [+] include names matching the given patterns
357 -I --include PATTERN [+] include names matching the given patterns
358 -X --exclude PATTERN [+] exclude names matching the given patterns
358 -X --exclude PATTERN [+] exclude names matching the given patterns
359 -S --subrepos recurse into subrepositories
359 -S --subrepos recurse into subrepositories
360 -n --dry-run do not perform actions, just print output
360 -n --dry-run do not perform actions, just print output
361
361
362 (some details hidden, use --verbose to show complete help)
362 (some details hidden, use --verbose to show complete help)
363
363
364 Verbose help for add
364 Verbose help for add
365
365
366 $ hg add -hv
366 $ hg add -hv
367 hg add [OPTION]... [FILE]...
367 hg add [OPTION]... [FILE]...
368
368
369 add the specified files on the next commit
369 add the specified files on the next commit
370
370
371 Schedule files to be version controlled and added to the repository.
371 Schedule files to be version controlled and added to the repository.
372
372
373 The files will be added to the repository at the next commit. To undo an
373 The files will be added to the repository at the next commit. To undo an
374 add before that, see 'hg forget'.
374 add before that, see 'hg forget'.
375
375
376 If no names are given, add all files to the repository (except files
376 If no names are given, add all files to the repository (except files
377 matching ".hgignore").
377 matching ".hgignore").
378
378
379 Examples:
379 Examples:
380
380
381 - New (unknown) files are added automatically by 'hg add':
381 - New (unknown) files are added automatically by 'hg add':
382
382
383 $ ls
383 $ ls
384 foo.c
384 foo.c
385 $ hg status
385 $ hg status
386 ? foo.c
386 ? foo.c
387 $ hg add
387 $ hg add
388 adding foo.c
388 adding foo.c
389 $ hg status
389 $ hg status
390 A foo.c
390 A foo.c
391
391
392 - Specific files to be added can be specified:
392 - Specific files to be added can be specified:
393
393
394 $ ls
394 $ ls
395 bar.c foo.c
395 bar.c foo.c
396 $ hg status
396 $ hg status
397 ? bar.c
397 ? bar.c
398 ? foo.c
398 ? foo.c
399 $ hg add bar.c
399 $ hg add bar.c
400 $ hg status
400 $ hg status
401 A bar.c
401 A bar.c
402 ? foo.c
402 ? foo.c
403
403
404 Returns 0 if all files are successfully added.
404 Returns 0 if all files are successfully added.
405
405
406 options ([+] can be repeated):
406 options ([+] can be repeated):
407
407
408 -I --include PATTERN [+] include names matching the given patterns
408 -I --include PATTERN [+] include names matching the given patterns
409 -X --exclude PATTERN [+] exclude names matching the given patterns
409 -X --exclude PATTERN [+] exclude names matching the given patterns
410 -S --subrepos recurse into subrepositories
410 -S --subrepos recurse into subrepositories
411 -n --dry-run do not perform actions, just print output
411 -n --dry-run do not perform actions, just print output
412
412
413 global options ([+] can be repeated):
413 global options ([+] can be repeated):
414
414
415 -R --repository REPO repository root directory or name of overlay bundle
415 -R --repository REPO repository root directory or name of overlay bundle
416 file
416 file
417 --cwd DIR change working directory
417 --cwd DIR change working directory
418 -y --noninteractive do not prompt, automatically pick the first choice for
418 -y --noninteractive do not prompt, automatically pick the first choice for
419 all prompts
419 all prompts
420 -q --quiet suppress output
420 -q --quiet suppress output
421 -v --verbose enable additional output
421 -v --verbose enable additional output
422 --color TYPE when to colorize (boolean, always, auto, never, or
422 --color TYPE when to colorize (boolean, always, auto, never, or
423 debug)
423 debug)
424 --config CONFIG [+] set/override config option (use 'section.name=value')
424 --config CONFIG [+] set/override config option (use 'section.name=value')
425 --debug enable debugging output
425 --debug enable debugging output
426 --debugger start debugger
426 --debugger start debugger
427 --encoding ENCODE set the charset encoding (default: ascii)
427 --encoding ENCODE set the charset encoding (default: ascii)
428 --encodingmode MODE set the charset encoding mode (default: strict)
428 --encodingmode MODE set the charset encoding mode (default: strict)
429 --traceback always print a traceback on exception
429 --traceback always print a traceback on exception
430 --time time how long the command takes
430 --time time how long the command takes
431 --profile print command execution profile
431 --profile print command execution profile
432 --version output version information and exit
432 --version output version information and exit
433 -h --help display help and exit
433 -h --help display help and exit
434 --hidden consider hidden changesets
434 --hidden consider hidden changesets
435 --pager TYPE when to paginate (boolean, always, auto, or never)
435 --pager TYPE when to paginate (boolean, always, auto, or never)
436 (default: auto)
436 (default: auto)
437
437
438 Test the textwidth config option
438 Test the textwidth config option
439
439
440 $ hg root -h --config ui.textwidth=50
440 $ hg root -h --config ui.textwidth=50
441 hg root
441 hg root
442
442
443 print the root (top) of the current working
443 print the root (top) of the current working
444 directory
444 directory
445
445
446 Print the root directory of the current
446 Print the root directory of the current
447 repository.
447 repository.
448
448
449 Returns 0 on success.
449 Returns 0 on success.
450
450
451 (some details hidden, use --verbose to show
451 (some details hidden, use --verbose to show
452 complete help)
452 complete help)
453
453
454 Test help option with version option
454 Test help option with version option
455
455
456 $ hg add -h --version
456 $ hg add -h --version
457 Mercurial Distributed SCM (version *) (glob)
457 Mercurial Distributed SCM (version *) (glob)
458 (see https://mercurial-scm.org for more information)
458 (see https://mercurial-scm.org for more information)
459
459
460 Copyright (C) 2005-* Matt Mackall and others (glob)
460 Copyright (C) 2005-* Matt Mackall and others (glob)
461 This is free software; see the source for copying conditions. There is NO
461 This is free software; see the source for copying conditions. There is NO
462 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
462 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
463
463
464 $ hg add --skjdfks
464 $ hg add --skjdfks
465 hg add: option --skjdfks not recognized
465 hg add: option --skjdfks not recognized
466 hg add [OPTION]... [FILE]...
466 hg add [OPTION]... [FILE]...
467
467
468 add the specified files on the next commit
468 add the specified files on the next commit
469
469
470 options ([+] can be repeated):
470 options ([+] can be repeated):
471
471
472 -I --include PATTERN [+] include names matching the given patterns
472 -I --include PATTERN [+] include names matching the given patterns
473 -X --exclude PATTERN [+] exclude names matching the given patterns
473 -X --exclude PATTERN [+] exclude names matching the given patterns
474 -S --subrepos recurse into subrepositories
474 -S --subrepos recurse into subrepositories
475 -n --dry-run do not perform actions, just print output
475 -n --dry-run do not perform actions, just print output
476
476
477 (use 'hg add -h' to show more help)
477 (use 'hg add -h' to show more help)
478 [255]
478 [255]
479
479
480 Test ambiguous command help
480 Test ambiguous command help
481
481
482 $ hg help ad
482 $ hg help ad
483 list of commands:
483 list of commands:
484
484
485 add add the specified files on the next commit
485 add add the specified files on the next commit
486 addremove add all new files, delete all missing files
486 addremove add all new files, delete all missing files
487
487
488 (use 'hg help -v ad' to show built-in aliases and global options)
488 (use 'hg help -v ad' to show built-in aliases and global options)
489
489
490 Test command without options
490 Test command without options
491
491
492 $ hg help verify
492 $ hg help verify
493 hg verify
493 hg verify
494
494
495 verify the integrity of the repository
495 verify the integrity of the repository
496
496
497 Verify the integrity of the current repository.
497 Verify the integrity of the current repository.
498
498
499 This will perform an extensive check of the repository's integrity,
499 This will perform an extensive check of the repository's integrity,
500 validating the hashes and checksums of each entry in the changelog,
500 validating the hashes and checksums of each entry in the changelog,
501 manifest, and tracked files, as well as the integrity of their crosslinks
501 manifest, and tracked files, as well as the integrity of their crosslinks
502 and indices.
502 and indices.
503
503
504 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
504 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
505 information about recovery from corruption of the repository.
505 information about recovery from corruption of the repository.
506
506
507 Returns 0 on success, 1 if errors are encountered.
507 Returns 0 on success, 1 if errors are encountered.
508
508
509 (some details hidden, use --verbose to show complete help)
509 (some details hidden, use --verbose to show complete help)
510
510
511 $ hg help diff
511 $ hg help diff
512 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
512 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
513
513
514 diff repository (or selected files)
514 diff repository (or selected files)
515
515
516 Show differences between revisions for the specified files.
516 Show differences between revisions for the specified files.
517
517
518 Differences between files are shown using the unified diff format.
518 Differences between files are shown using the unified diff format.
519
519
520 Note:
520 Note:
521 'hg diff' may generate unexpected results for merges, as it will
521 'hg diff' may generate unexpected results for merges, as it will
522 default to comparing against the working directory's first parent
522 default to comparing against the working directory's first parent
523 changeset if no revisions are specified.
523 changeset if no revisions are specified.
524
524
525 When two revision arguments are given, then changes are shown between
525 When two revision arguments are given, then changes are shown between
526 those revisions. If only one revision is specified then that revision is
526 those revisions. If only one revision is specified then that revision is
527 compared to the working directory, and, when no revisions are specified,
527 compared to the working directory, and, when no revisions are specified,
528 the working directory files are compared to its first parent.
528 the working directory files are compared to its first parent.
529
529
530 Alternatively you can specify -c/--change with a revision to see the
530 Alternatively you can specify -c/--change with a revision to see the
531 changes in that changeset relative to its first parent.
531 changes in that changeset relative to its first parent.
532
532
533 Without the -a/--text option, diff will avoid generating diffs of files it
533 Without the -a/--text option, diff will avoid generating diffs of files it
534 detects as binary. With -a, diff will generate a diff anyway, probably
534 detects as binary. With -a, diff will generate a diff anyway, probably
535 with undesirable results.
535 with undesirable results.
536
536
537 Use the -g/--git option to generate diffs in the git extended diff format.
537 Use the -g/--git option to generate diffs in the git extended diff format.
538 For more information, read 'hg help diffs'.
538 For more information, read 'hg help diffs'.
539
539
540 Returns 0 on success.
540 Returns 0 on success.
541
541
542 options ([+] can be repeated):
542 options ([+] can be repeated):
543
543
544 -r --rev REV [+] revision
544 -r --rev REV [+] revision
545 -c --change REV change made by revision
545 -c --change REV change made by revision
546 -a --text treat all files as text
546 -a --text treat all files as text
547 -g --git use git extended diff format
547 -g --git use git extended diff format
548 --binary generate binary diffs in git mode (default)
548 --binary generate binary diffs in git mode (default)
549 --nodates omit dates from diff headers
549 --nodates omit dates from diff headers
550 --noprefix omit a/ and b/ prefixes from filenames
550 --noprefix omit a/ and b/ prefixes from filenames
551 -p --show-function show which function each change is in
551 -p --show-function show which function each change is in
552 --reverse produce a diff that undoes the changes
552 --reverse produce a diff that undoes the changes
553 -w --ignore-all-space ignore white space when comparing lines
553 -w --ignore-all-space ignore white space when comparing lines
554 -b --ignore-space-change ignore changes in the amount of white space
554 -b --ignore-space-change ignore changes in the amount of white space
555 -B --ignore-blank-lines ignore changes whose lines are all blank
555 -B --ignore-blank-lines ignore changes whose lines are all blank
556 -U --unified NUM number of lines of context to show
556 -U --unified NUM number of lines of context to show
557 --stat output diffstat-style summary of changes
557 --stat output diffstat-style summary of changes
558 --root DIR produce diffs relative to subdirectory
558 --root DIR produce diffs relative to subdirectory
559 -I --include PATTERN [+] include names matching the given patterns
559 -I --include PATTERN [+] include names matching the given patterns
560 -X --exclude PATTERN [+] exclude names matching the given patterns
560 -X --exclude PATTERN [+] exclude names matching the given patterns
561 -S --subrepos recurse into subrepositories
561 -S --subrepos recurse into subrepositories
562
562
563 (some details hidden, use --verbose to show complete help)
563 (some details hidden, use --verbose to show complete help)
564
564
565 $ hg help status
565 $ hg help status
566 hg status [OPTION]... [FILE]...
566 hg status [OPTION]... [FILE]...
567
567
568 aliases: st
568 aliases: st
569
569
570 show changed files in the working directory
570 show changed files in the working directory
571
571
572 Show status of files in the repository. If names are given, only files
572 Show status of files in the repository. If names are given, only files
573 that match are shown. Files that are clean or ignored or the source of a
573 that match are shown. Files that are clean or ignored or the source of a
574 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
574 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
575 -C/--copies or -A/--all are given. Unless options described with "show
575 -C/--copies or -A/--all are given. Unless options described with "show
576 only ..." are given, the options -mardu are used.
576 only ..." are given, the options -mardu are used.
577
577
578 Option -q/--quiet hides untracked (unknown and ignored) files unless
578 Option -q/--quiet hides untracked (unknown and ignored) files unless
579 explicitly requested with -u/--unknown or -i/--ignored.
579 explicitly requested with -u/--unknown or -i/--ignored.
580
580
581 Note:
581 Note:
582 'hg status' may appear to disagree with diff if permissions have
582 'hg status' may appear to disagree with diff if permissions have
583 changed or a merge has occurred. The standard diff format does not
583 changed or a merge has occurred. The standard diff format does not
584 report permission changes and diff only reports changes relative to one
584 report permission changes and diff only reports changes relative to one
585 merge parent.
585 merge parent.
586
586
587 If one revision is given, it is used as the base revision. If two
587 If one revision is given, it is used as the base revision. If two
588 revisions are given, the differences between them are shown. The --change
588 revisions are given, the differences between them are shown. The --change
589 option can also be used as a shortcut to list the changed files of a
589 option can also be used as a shortcut to list the changed files of a
590 revision from its first parent.
590 revision from its first parent.
591
591
592 The codes used to show the status of files are:
592 The codes used to show the status of files are:
593
593
594 M = modified
594 M = modified
595 A = added
595 A = added
596 R = removed
596 R = removed
597 C = clean
597 C = clean
598 ! = missing (deleted by non-hg command, but still tracked)
598 ! = missing (deleted by non-hg command, but still tracked)
599 ? = not tracked
599 ? = not tracked
600 I = ignored
600 I = ignored
601 = origin of the previous file (with --copies)
601 = origin of the previous file (with --copies)
602
602
603 Returns 0 on success.
603 Returns 0 on success.
604
604
605 options ([+] can be repeated):
605 options ([+] can be repeated):
606
606
607 -A --all show status of all files
607 -A --all show status of all files
608 -m --modified show only modified files
608 -m --modified show only modified files
609 -a --added show only added files
609 -a --added show only added files
610 -r --removed show only removed files
610 -r --removed show only removed files
611 -d --deleted show only deleted (but tracked) files
611 -d --deleted show only deleted (but tracked) files
612 -c --clean show only files without changes
612 -c --clean show only files without changes
613 -u --unknown show only unknown (not tracked) files
613 -u --unknown show only unknown (not tracked) files
614 -i --ignored show only ignored files
614 -i --ignored show only ignored files
615 -n --no-status hide status prefix
615 -n --no-status hide status prefix
616 -C --copies show source of copied files
616 -C --copies show source of copied files
617 -0 --print0 end filenames with NUL, for use with xargs
617 -0 --print0 end filenames with NUL, for use with xargs
618 --rev REV [+] show difference from revision
618 --rev REV [+] show difference from revision
619 --change REV list the changed files of a revision
619 --change REV list the changed files of a revision
620 -I --include PATTERN [+] include names matching the given patterns
620 -I --include PATTERN [+] include names matching the given patterns
621 -X --exclude PATTERN [+] exclude names matching the given patterns
621 -X --exclude PATTERN [+] exclude names matching the given patterns
622 -S --subrepos recurse into subrepositories
622 -S --subrepos recurse into subrepositories
623
623
624 (some details hidden, use --verbose to show complete help)
624 (some details hidden, use --verbose to show complete help)
625
625
626 $ hg -q help status
626 $ hg -q help status
627 hg status [OPTION]... [FILE]...
627 hg status [OPTION]... [FILE]...
628
628
629 show changed files in the working directory
629 show changed files in the working directory
630
630
631 $ hg help foo
631 $ hg help foo
632 abort: no such help topic: foo
632 abort: no such help topic: foo
633 (try 'hg help --keyword foo')
633 (try 'hg help --keyword foo')
634 [255]
634 [255]
635
635
636 $ hg skjdfks
636 $ hg skjdfks
637 hg: unknown command 'skjdfks'
637 hg: unknown command 'skjdfks'
638 Mercurial Distributed SCM
638 Mercurial Distributed SCM
639
639
640 basic commands:
640 basic commands:
641
641
642 add add the specified files on the next commit
642 add add the specified files on the next commit
643 annotate show changeset information by line for each file
643 annotate show changeset information by line for each file
644 clone make a copy of an existing repository
644 clone make a copy of an existing repository
645 commit commit the specified files or all outstanding changes
645 commit commit the specified files or all outstanding changes
646 diff diff repository (or selected files)
646 diff diff repository (or selected files)
647 export dump the header and diffs for one or more changesets
647 export dump the header and diffs for one or more changesets
648 forget forget the specified files on the next commit
648 forget forget the specified files on the next commit
649 init create a new repository in the given directory
649 init create a new repository in the given directory
650 log show revision history of entire repository or files
650 log show revision history of entire repository or files
651 merge merge another revision into working directory
651 merge merge another revision into working directory
652 pull pull changes from the specified source
652 pull pull changes from the specified source
653 push push changes to the specified destination
653 push push changes to the specified destination
654 remove remove the specified files on the next commit
654 remove remove the specified files on the next commit
655 serve start stand-alone webserver
655 serve start stand-alone webserver
656 status show changed files in the working directory
656 status show changed files in the working directory
657 summary summarize working directory state
657 summary summarize working directory state
658 update update working directory (or switch revisions)
658 update update working directory (or switch revisions)
659
659
660 (use 'hg help' for the full list of commands or 'hg -v' for details)
660 (use 'hg help' for the full list of commands or 'hg -v' for details)
661 [255]
661 [255]
662
662
663
663
664 Make sure that we don't run afoul of the help system thinking that
664 Make sure that we don't run afoul of the help system thinking that
665 this is a section and erroring out weirdly.
665 this is a section and erroring out weirdly.
666
666
667 $ hg .log
667 $ hg .log
668 hg: unknown command '.log'
668 hg: unknown command '.log'
669 (did you mean log?)
669 (did you mean log?)
670 [255]
670 [255]
671
671
672 $ hg log.
672 $ hg log.
673 hg: unknown command 'log.'
673 hg: unknown command 'log.'
674 (did you mean log?)
674 (did you mean log?)
675 [255]
675 [255]
676 $ hg pu.lh
676 $ hg pu.lh
677 hg: unknown command 'pu.lh'
677 hg: unknown command 'pu.lh'
678 (did you mean one of pull, push?)
678 (did you mean one of pull, push?)
679 [255]
679 [255]
680
680
681 $ cat > helpext.py <<EOF
681 $ cat > helpext.py <<EOF
682 > import os
682 > import os
683 > from mercurial import commands, registrar
683 > from mercurial import commands, registrar
684 >
684 >
685 > cmdtable = {}
685 > cmdtable = {}
686 > command = registrar.command(cmdtable)
686 > command = registrar.command(cmdtable)
687 >
687 >
688 > @command('nohelp',
688 > @command(b'nohelp',
689 > [('', 'longdesc', 3, 'x'*90),
689 > [(b'', b'longdesc', 3, b'x'*90),
690 > ('n', '', None, 'normal desc'),
690 > (b'n', b'', None, b'normal desc'),
691 > ('', 'newline', '', 'line1\nline2')],
691 > (b'', b'newline', b'', b'line1\nline2')],
692 > 'hg nohelp',
692 > b'hg nohelp',
693 > norepo=True)
693 > norepo=True)
694 > @command('debugoptADV', [('', 'aopt', None, 'option is (ADVANCED)')])
694 > @command(b'debugoptADV', [(b'', b'aopt', None, b'option is (ADVANCED)')])
695 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
695 > @command(b'debugoptDEP', [(b'', b'dopt', None, b'option is (DEPRECATED)')])
696 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
696 > @command(b'debugoptEXP', [(b'', b'eopt', None, b'option is (EXPERIMENTAL)')])
697 > def nohelp(ui, *args, **kwargs):
697 > def nohelp(ui, *args, **kwargs):
698 > pass
698 > pass
699 >
699 >
700 > def uisetup(ui):
700 > def uisetup(ui):
701 > ui.setconfig('alias', 'shellalias', '!echo hi', 'helpext')
701 > ui.setconfig(b'alias', b'shellalias', b'!echo hi', b'helpext')
702 > ui.setconfig('alias', 'hgalias', 'summary', 'helpext')
702 > ui.setconfig(b'alias', b'hgalias', b'summary', b'helpext')
703 >
703 >
704 > EOF
704 > EOF
705 $ echo '[extensions]' >> $HGRCPATH
705 $ echo '[extensions]' >> $HGRCPATH
706 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
706 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
707
707
708 Test for aliases
708 Test for aliases
709
709
710 $ hg help hgalias
710 $ hg help hgalias
711 hg hgalias [--remote]
711 hg hgalias [--remote]
712
712
713 alias for: hg summary
713 alias for: hg summary
714
714
715 summarize working directory state
715 summarize working directory state
716
716
717 This generates a brief summary of the working directory state, including
717 This generates a brief summary of the working directory state, including
718 parents, branch, commit status, phase and available updates.
718 parents, branch, commit status, phase and available updates.
719
719
720 With the --remote option, this will check the default paths for incoming
720 With the --remote option, this will check the default paths for incoming
721 and outgoing changes. This can be time-consuming.
721 and outgoing changes. This can be time-consuming.
722
722
723 Returns 0 on success.
723 Returns 0 on success.
724
724
725 defined by: helpext
725 defined by: helpext
726
726
727 options:
727 options:
728
728
729 --remote check for push and pull
729 --remote check for push and pull
730
730
731 (some details hidden, use --verbose to show complete help)
731 (some details hidden, use --verbose to show complete help)
732
732
733 $ hg help shellalias
733 $ hg help shellalias
734 hg shellalias
734 hg shellalias
735
735
736 shell alias for:
736 shell alias for:
737
737
738 echo hi
738 echo hi
739
739
740 defined by: helpext
740 defined by: helpext
741
741
742 (some details hidden, use --verbose to show complete help)
742 (some details hidden, use --verbose to show complete help)
743
743
744 Test command with no help text
744 Test command with no help text
745
745
746 $ hg help nohelp
746 $ hg help nohelp
747 hg nohelp
747 hg nohelp
748
748
749 (no help text available)
749 (no help text available)
750
750
751 options:
751 options:
752
752
753 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
753 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
754 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
754 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
755 -n -- normal desc
755 -n -- normal desc
756 --newline VALUE line1 line2
756 --newline VALUE line1 line2
757
757
758 (some details hidden, use --verbose to show complete help)
758 (some details hidden, use --verbose to show complete help)
759
759
760 $ hg help -k nohelp
760 $ hg help -k nohelp
761 Commands:
761 Commands:
762
762
763 nohelp hg nohelp
763 nohelp hg nohelp
764
764
765 Extension Commands:
765 Extension Commands:
766
766
767 nohelp (no help text available)
767 nohelp (no help text available)
768
768
769 Test that default list of commands omits extension commands
769 Test that default list of commands omits extension commands
770
770
771 $ hg help
771 $ hg help
772 Mercurial Distributed SCM
772 Mercurial Distributed SCM
773
773
774 list of commands:
774 list of commands:
775
775
776 add add the specified files on the next commit
776 add add the specified files on the next commit
777 addremove add all new files, delete all missing files
777 addremove add all new files, delete all missing files
778 annotate show changeset information by line for each file
778 annotate show changeset information by line for each file
779 archive create an unversioned archive of a repository revision
779 archive create an unversioned archive of a repository revision
780 backout reverse effect of earlier changeset
780 backout reverse effect of earlier changeset
781 bisect subdivision search of changesets
781 bisect subdivision search of changesets
782 bookmarks create a new bookmark or list existing bookmarks
782 bookmarks create a new bookmark or list existing bookmarks
783 branch set or show the current branch name
783 branch set or show the current branch name
784 branches list repository named branches
784 branches list repository named branches
785 bundle create a bundle file
785 bundle create a bundle file
786 cat output the current or given revision of files
786 cat output the current or given revision of files
787 clone make a copy of an existing repository
787 clone make a copy of an existing repository
788 commit commit the specified files or all outstanding changes
788 commit commit the specified files or all outstanding changes
789 config show combined config settings from all hgrc files
789 config show combined config settings from all hgrc files
790 copy mark files as copied for the next commit
790 copy mark files as copied for the next commit
791 diff diff repository (or selected files)
791 diff diff repository (or selected files)
792 export dump the header and diffs for one or more changesets
792 export dump the header and diffs for one or more changesets
793 files list tracked files
793 files list tracked files
794 forget forget the specified files on the next commit
794 forget forget the specified files on the next commit
795 graft copy changes from other branches onto the current branch
795 graft copy changes from other branches onto the current branch
796 grep search revision history for a pattern in specified files
796 grep search revision history for a pattern in specified files
797 heads show branch heads
797 heads show branch heads
798 help show help for a given topic or a help overview
798 help show help for a given topic or a help overview
799 identify identify the working directory or specified revision
799 identify identify the working directory or specified revision
800 import import an ordered set of patches
800 import import an ordered set of patches
801 incoming show new changesets found in source
801 incoming show new changesets found in source
802 init create a new repository in the given directory
802 init create a new repository in the given directory
803 log show revision history of entire repository or files
803 log show revision history of entire repository or files
804 manifest output the current or given revision of the project manifest
804 manifest output the current or given revision of the project manifest
805 merge merge another revision into working directory
805 merge merge another revision into working directory
806 outgoing show changesets not found in the destination
806 outgoing show changesets not found in the destination
807 paths show aliases for remote repositories
807 paths show aliases for remote repositories
808 phase set or show the current phase name
808 phase set or show the current phase name
809 pull pull changes from the specified source
809 pull pull changes from the specified source
810 push push changes to the specified destination
810 push push changes to the specified destination
811 recover roll back an interrupted transaction
811 recover roll back an interrupted transaction
812 remove remove the specified files on the next commit
812 remove remove the specified files on the next commit
813 rename rename files; equivalent of copy + remove
813 rename rename files; equivalent of copy + remove
814 resolve redo merges or set/view the merge status of files
814 resolve redo merges or set/view the merge status of files
815 revert restore files to their checkout state
815 revert restore files to their checkout state
816 root print the root (top) of the current working directory
816 root print the root (top) of the current working directory
817 serve start stand-alone webserver
817 serve start stand-alone webserver
818 status show changed files in the working directory
818 status show changed files in the working directory
819 summary summarize working directory state
819 summary summarize working directory state
820 tag add one or more tags for the current or given revision
820 tag add one or more tags for the current or given revision
821 tags list repository tags
821 tags list repository tags
822 unbundle apply one or more bundle files
822 unbundle apply one or more bundle files
823 update update working directory (or switch revisions)
823 update update working directory (or switch revisions)
824 verify verify the integrity of the repository
824 verify verify the integrity of the repository
825 version output version and copyright information
825 version output version and copyright information
826
826
827 enabled extensions:
827 enabled extensions:
828
828
829 helpext (no help text available)
829 helpext (no help text available)
830
830
831 additional help topics:
831 additional help topics:
832
832
833 bundlespec Bundle File Formats
833 bundlespec Bundle File Formats
834 color Colorizing Outputs
834 color Colorizing Outputs
835 config Configuration Files
835 config Configuration Files
836 dates Date Formats
836 dates Date Formats
837 diffs Diff Formats
837 diffs Diff Formats
838 environment Environment Variables
838 environment Environment Variables
839 extensions Using Additional Features
839 extensions Using Additional Features
840 filesets Specifying File Sets
840 filesets Specifying File Sets
841 glossary Glossary
841 glossary Glossary
842 hgignore Syntax for Mercurial Ignore Files
842 hgignore Syntax for Mercurial Ignore Files
843 hgweb Configuring hgweb
843 hgweb Configuring hgweb
844 internals Technical implementation topics
844 internals Technical implementation topics
845 merge-tools Merge Tools
845 merge-tools Merge Tools
846 pager Pager Support
846 pager Pager Support
847 patterns File Name Patterns
847 patterns File Name Patterns
848 phases Working with Phases
848 phases Working with Phases
849 revisions Specifying Revisions
849 revisions Specifying Revisions
850 scripting Using Mercurial from scripts and automation
850 scripting Using Mercurial from scripts and automation
851 subrepos Subrepositories
851 subrepos Subrepositories
852 templating Template Usage
852 templating Template Usage
853 urls URL Paths
853 urls URL Paths
854
854
855 (use 'hg help -v' to show built-in aliases and global options)
855 (use 'hg help -v' to show built-in aliases and global options)
856
856
857
857
858 Test list of internal help commands
858 Test list of internal help commands
859
859
860 $ hg help debug
860 $ hg help debug
861 debug commands (internal and unsupported):
861 debug commands (internal and unsupported):
862
862
863 debugancestor
863 debugancestor
864 find the ancestor revision of two revisions in a given index
864 find the ancestor revision of two revisions in a given index
865 debugapplystreamclonebundle
865 debugapplystreamclonebundle
866 apply a stream clone bundle file
866 apply a stream clone bundle file
867 debugbuilddag
867 debugbuilddag
868 builds a repo with a given DAG from scratch in the current
868 builds a repo with a given DAG from scratch in the current
869 empty repo
869 empty repo
870 debugbundle lists the contents of a bundle
870 debugbundle lists the contents of a bundle
871 debugcheckstate
871 debugcheckstate
872 validate the correctness of the current dirstate
872 validate the correctness of the current dirstate
873 debugcolor show available color, effects or style
873 debugcolor show available color, effects or style
874 debugcommands
874 debugcommands
875 list all available commands and options
875 list all available commands and options
876 debugcomplete
876 debugcomplete
877 returns the completion list associated with the given command
877 returns the completion list associated with the given command
878 debugcreatestreamclonebundle
878 debugcreatestreamclonebundle
879 create a stream clone bundle file
879 create a stream clone bundle file
880 debugdag format the changelog or an index DAG as a concise textual
880 debugdag format the changelog or an index DAG as a concise textual
881 description
881 description
882 debugdata dump the contents of a data file revision
882 debugdata dump the contents of a data file revision
883 debugdate parse and display a date
883 debugdate parse and display a date
884 debugdeltachain
884 debugdeltachain
885 dump information about delta chains in a revlog
885 dump information about delta chains in a revlog
886 debugdirstate
886 debugdirstate
887 show the contents of the current dirstate
887 show the contents of the current dirstate
888 debugdiscovery
888 debugdiscovery
889 runs the changeset discovery protocol in isolation
889 runs the changeset discovery protocol in isolation
890 debugextensions
890 debugextensions
891 show information about active extensions
891 show information about active extensions
892 debugfileset parse and apply a fileset specification
892 debugfileset parse and apply a fileset specification
893 debugfsinfo show information detected about current filesystem
893 debugfsinfo show information detected about current filesystem
894 debuggetbundle
894 debuggetbundle
895 retrieves a bundle from a repo
895 retrieves a bundle from a repo
896 debugignore display the combined ignore pattern and information about
896 debugignore display the combined ignore pattern and information about
897 ignored files
897 ignored files
898 debugindex dump the contents of an index file
898 debugindex dump the contents of an index file
899 debugindexdot
899 debugindexdot
900 dump an index DAG as a graphviz dot file
900 dump an index DAG as a graphviz dot file
901 debuginstall test Mercurial installation
901 debuginstall test Mercurial installation
902 debugknown test whether node ids are known to a repo
902 debugknown test whether node ids are known to a repo
903 debuglocks show or modify state of locks
903 debuglocks show or modify state of locks
904 debugmergestate
904 debugmergestate
905 print merge state
905 print merge state
906 debugnamecomplete
906 debugnamecomplete
907 complete "names" - tags, open branch names, bookmark names
907 complete "names" - tags, open branch names, bookmark names
908 debugobsolete
908 debugobsolete
909 create arbitrary obsolete marker
909 create arbitrary obsolete marker
910 debugoptADV (no help text available)
910 debugoptADV (no help text available)
911 debugoptDEP (no help text available)
911 debugoptDEP (no help text available)
912 debugoptEXP (no help text available)
912 debugoptEXP (no help text available)
913 debugpathcomplete
913 debugpathcomplete
914 complete part or all of a tracked path
914 complete part or all of a tracked path
915 debugpickmergetool
915 debugpickmergetool
916 examine which merge tool is chosen for specified file
916 examine which merge tool is chosen for specified file
917 debugpushkey access the pushkey key/value protocol
917 debugpushkey access the pushkey key/value protocol
918 debugpvec (no help text available)
918 debugpvec (no help text available)
919 debugrebuilddirstate
919 debugrebuilddirstate
920 rebuild the dirstate as it would look like for the given
920 rebuild the dirstate as it would look like for the given
921 revision
921 revision
922 debugrebuildfncache
922 debugrebuildfncache
923 rebuild the fncache file
923 rebuild the fncache file
924 debugrename dump rename information
924 debugrename dump rename information
925 debugrevlog show data and statistics about a revlog
925 debugrevlog show data and statistics about a revlog
926 debugrevspec parse and apply a revision specification
926 debugrevspec parse and apply a revision specification
927 debugsetparents
927 debugsetparents
928 manually set the parents of the current working directory
928 manually set the parents of the current working directory
929 debugsub (no help text available)
929 debugsub (no help text available)
930 debugsuccessorssets
930 debugsuccessorssets
931 show set of successors for revision
931 show set of successors for revision
932 debugtemplate
932 debugtemplate
933 parse and apply a template
933 parse and apply a template
934 debugupdatecaches
934 debugupdatecaches
935 warm all known caches in the repository
935 warm all known caches in the repository
936 debugupgraderepo
936 debugupgraderepo
937 upgrade a repository to use different features
937 upgrade a repository to use different features
938 debugwalk show how files match on given patterns
938 debugwalk show how files match on given patterns
939 debugwireargs
939 debugwireargs
940 (no help text available)
940 (no help text available)
941
941
942 (use 'hg help -v debug' to show built-in aliases and global options)
942 (use 'hg help -v debug' to show built-in aliases and global options)
943
943
944 internals topic renders index of available sub-topics
944 internals topic renders index of available sub-topics
945
945
946 $ hg help internals
946 $ hg help internals
947 Technical implementation topics
947 Technical implementation topics
948 """""""""""""""""""""""""""""""
948 """""""""""""""""""""""""""""""
949
949
950 To access a subtopic, use "hg help internals.{subtopic-name}"
950 To access a subtopic, use "hg help internals.{subtopic-name}"
951
951
952 bundles Bundles
952 bundles Bundles
953 censor Censor
953 censor Censor
954 changegroups Changegroups
954 changegroups Changegroups
955 requirements Repository Requirements
955 requirements Repository Requirements
956 revlogs Revision Logs
956 revlogs Revision Logs
957 wireprotocol Wire Protocol
957 wireprotocol Wire Protocol
958
958
959 sub-topics can be accessed
959 sub-topics can be accessed
960
960
961 $ hg help internals.changegroups
961 $ hg help internals.changegroups
962 Changegroups
962 Changegroups
963 """"""""""""
963 """"""""""""
964
964
965 Changegroups are representations of repository revlog data, specifically
965 Changegroups are representations of repository revlog data, specifically
966 the changelog data, root/flat manifest data, treemanifest data, and
966 the changelog data, root/flat manifest data, treemanifest data, and
967 filelogs.
967 filelogs.
968
968
969 There are 3 versions of changegroups: "1", "2", and "3". From a high-
969 There are 3 versions of changegroups: "1", "2", and "3". From a high-
970 level, versions "1" and "2" are almost exactly the same, with the only
970 level, versions "1" and "2" are almost exactly the same, with the only
971 difference being an additional item in the *delta header*. Version "3"
971 difference being an additional item in the *delta header*. Version "3"
972 adds support for revlog flags in the *delta header* and optionally
972 adds support for revlog flags in the *delta header* and optionally
973 exchanging treemanifests (enabled by setting an option on the
973 exchanging treemanifests (enabled by setting an option on the
974 "changegroup" part in the bundle2).
974 "changegroup" part in the bundle2).
975
975
976 Changegroups when not exchanging treemanifests consist of 3 logical
976 Changegroups when not exchanging treemanifests consist of 3 logical
977 segments:
977 segments:
978
978
979 +---------------------------------+
979 +---------------------------------+
980 | | | |
980 | | | |
981 | changeset | manifest | filelogs |
981 | changeset | manifest | filelogs |
982 | | | |
982 | | | |
983 | | | |
983 | | | |
984 +---------------------------------+
984 +---------------------------------+
985
985
986 When exchanging treemanifests, there are 4 logical segments:
986 When exchanging treemanifests, there are 4 logical segments:
987
987
988 +-------------------------------------------------+
988 +-------------------------------------------------+
989 | | | | |
989 | | | | |
990 | changeset | root | treemanifests | filelogs |
990 | changeset | root | treemanifests | filelogs |
991 | | manifest | | |
991 | | manifest | | |
992 | | | | |
992 | | | | |
993 +-------------------------------------------------+
993 +-------------------------------------------------+
994
994
995 The principle building block of each segment is a *chunk*. A *chunk* is a
995 The principle building block of each segment is a *chunk*. A *chunk* is a
996 framed piece of data:
996 framed piece of data:
997
997
998 +---------------------------------------+
998 +---------------------------------------+
999 | | |
999 | | |
1000 | length | data |
1000 | length | data |
1001 | (4 bytes) | (<length - 4> bytes) |
1001 | (4 bytes) | (<length - 4> bytes) |
1002 | | |
1002 | | |
1003 +---------------------------------------+
1003 +---------------------------------------+
1004
1004
1005 All integers are big-endian signed integers. Each chunk starts with a
1005 All integers are big-endian signed integers. Each chunk starts with a
1006 32-bit integer indicating the length of the entire chunk (including the
1006 32-bit integer indicating the length of the entire chunk (including the
1007 length field itself).
1007 length field itself).
1008
1008
1009 There is a special case chunk that has a value of 0 for the length
1009 There is a special case chunk that has a value of 0 for the length
1010 ("0x00000000"). We call this an *empty chunk*.
1010 ("0x00000000"). We call this an *empty chunk*.
1011
1011
1012 Delta Groups
1012 Delta Groups
1013 ============
1013 ============
1014
1014
1015 A *delta group* expresses the content of a revlog as a series of deltas,
1015 A *delta group* expresses the content of a revlog as a series of deltas,
1016 or patches against previous revisions.
1016 or patches against previous revisions.
1017
1017
1018 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1018 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1019 to signal the end of the delta group:
1019 to signal the end of the delta group:
1020
1020
1021 +------------------------------------------------------------------------+
1021 +------------------------------------------------------------------------+
1022 | | | | | |
1022 | | | | | |
1023 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1023 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1024 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1024 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1025 | | | | | |
1025 | | | | | |
1026 +------------------------------------------------------------------------+
1026 +------------------------------------------------------------------------+
1027
1027
1028 Each *chunk*'s data consists of the following:
1028 Each *chunk*'s data consists of the following:
1029
1029
1030 +---------------------------------------+
1030 +---------------------------------------+
1031 | | |
1031 | | |
1032 | delta header | delta data |
1032 | delta header | delta data |
1033 | (various by version) | (various) |
1033 | (various by version) | (various) |
1034 | | |
1034 | | |
1035 +---------------------------------------+
1035 +---------------------------------------+
1036
1036
1037 The *delta data* is a series of *delta*s that describe a diff from an
1037 The *delta data* is a series of *delta*s that describe a diff from an
1038 existing entry (either that the recipient already has, or previously
1038 existing entry (either that the recipient already has, or previously
1039 specified in the bundle/changegroup).
1039 specified in the bundle/changegroup).
1040
1040
1041 The *delta header* is different between versions "1", "2", and "3" of the
1041 The *delta header* is different between versions "1", "2", and "3" of the
1042 changegroup format.
1042 changegroup format.
1043
1043
1044 Version 1 (headerlen=80):
1044 Version 1 (headerlen=80):
1045
1045
1046 +------------------------------------------------------+
1046 +------------------------------------------------------+
1047 | | | | |
1047 | | | | |
1048 | node | p1 node | p2 node | link node |
1048 | node | p1 node | p2 node | link node |
1049 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1049 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1050 | | | | |
1050 | | | | |
1051 +------------------------------------------------------+
1051 +------------------------------------------------------+
1052
1052
1053 Version 2 (headerlen=100):
1053 Version 2 (headerlen=100):
1054
1054
1055 +------------------------------------------------------------------+
1055 +------------------------------------------------------------------+
1056 | | | | | |
1056 | | | | | |
1057 | node | p1 node | p2 node | base node | link node |
1057 | node | p1 node | p2 node | base node | link node |
1058 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1058 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1059 | | | | | |
1059 | | | | | |
1060 +------------------------------------------------------------------+
1060 +------------------------------------------------------------------+
1061
1061
1062 Version 3 (headerlen=102):
1062 Version 3 (headerlen=102):
1063
1063
1064 +------------------------------------------------------------------------------+
1064 +------------------------------------------------------------------------------+
1065 | | | | | | |
1065 | | | | | | |
1066 | node | p1 node | p2 node | base node | link node | flags |
1066 | node | p1 node | p2 node | base node | link node | flags |
1067 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1067 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1068 | | | | | | |
1068 | | | | | | |
1069 +------------------------------------------------------------------------------+
1069 +------------------------------------------------------------------------------+
1070
1070
1071 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1071 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1072 contain a series of *delta*s, densely packed (no separators). These deltas
1072 contain a series of *delta*s, densely packed (no separators). These deltas
1073 describe a diff from an existing entry (either that the recipient already
1073 describe a diff from an existing entry (either that the recipient already
1074 has, or previously specified in the bundle/changegroup). The format is
1074 has, or previously specified in the bundle/changegroup). The format is
1075 described more fully in "hg help internals.bdiff", but briefly:
1075 described more fully in "hg help internals.bdiff", but briefly:
1076
1076
1077 +---------------------------------------------------------------+
1077 +---------------------------------------------------------------+
1078 | | | | |
1078 | | | | |
1079 | start offset | end offset | new length | content |
1079 | start offset | end offset | new length | content |
1080 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1080 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1081 | | | | |
1081 | | | | |
1082 +---------------------------------------------------------------+
1082 +---------------------------------------------------------------+
1083
1083
1084 Please note that the length field in the delta data does *not* include
1084 Please note that the length field in the delta data does *not* include
1085 itself.
1085 itself.
1086
1086
1087 In version 1, the delta is always applied against the previous node from
1087 In version 1, the delta is always applied against the previous node from
1088 the changegroup or the first parent if this is the first entry in the
1088 the changegroup or the first parent if this is the first entry in the
1089 changegroup.
1089 changegroup.
1090
1090
1091 In version 2 and up, the delta base node is encoded in the entry in the
1091 In version 2 and up, the delta base node is encoded in the entry in the
1092 changegroup. This allows the delta to be expressed against any parent,
1092 changegroup. This allows the delta to be expressed against any parent,
1093 which can result in smaller deltas and more efficient encoding of data.
1093 which can result in smaller deltas and more efficient encoding of data.
1094
1094
1095 Changeset Segment
1095 Changeset Segment
1096 =================
1096 =================
1097
1097
1098 The *changeset segment* consists of a single *delta group* holding
1098 The *changeset segment* consists of a single *delta group* holding
1099 changelog data. The *empty chunk* at the end of the *delta group* denotes
1099 changelog data. The *empty chunk* at the end of the *delta group* denotes
1100 the boundary to the *manifest segment*.
1100 the boundary to the *manifest segment*.
1101
1101
1102 Manifest Segment
1102 Manifest Segment
1103 ================
1103 ================
1104
1104
1105 The *manifest segment* consists of a single *delta group* holding manifest
1105 The *manifest segment* consists of a single *delta group* holding manifest
1106 data. If treemanifests are in use, it contains only the manifest for the
1106 data. If treemanifests are in use, it contains only the manifest for the
1107 root directory of the repository. Otherwise, it contains the entire
1107 root directory of the repository. Otherwise, it contains the entire
1108 manifest data. The *empty chunk* at the end of the *delta group* denotes
1108 manifest data. The *empty chunk* at the end of the *delta group* denotes
1109 the boundary to the next segment (either the *treemanifests segment* or
1109 the boundary to the next segment (either the *treemanifests segment* or
1110 the *filelogs segment*, depending on version and the request options).
1110 the *filelogs segment*, depending on version and the request options).
1111
1111
1112 Treemanifests Segment
1112 Treemanifests Segment
1113 ---------------------
1113 ---------------------
1114
1114
1115 The *treemanifests segment* only exists in changegroup version "3", and
1115 The *treemanifests segment* only exists in changegroup version "3", and
1116 only if the 'treemanifest' param is part of the bundle2 changegroup part
1116 only if the 'treemanifest' param is part of the bundle2 changegroup part
1117 (it is not possible to use changegroup version 3 outside of bundle2).
1117 (it is not possible to use changegroup version 3 outside of bundle2).
1118 Aside from the filenames in the *treemanifests segment* containing a
1118 Aside from the filenames in the *treemanifests segment* containing a
1119 trailing "/" character, it behaves identically to the *filelogs segment*
1119 trailing "/" character, it behaves identically to the *filelogs segment*
1120 (see below). The final sub-segment is followed by an *empty chunk*
1120 (see below). The final sub-segment is followed by an *empty chunk*
1121 (logically, a sub-segment with filename size 0). This denotes the boundary
1121 (logically, a sub-segment with filename size 0). This denotes the boundary
1122 to the *filelogs segment*.
1122 to the *filelogs segment*.
1123
1123
1124 Filelogs Segment
1124 Filelogs Segment
1125 ================
1125 ================
1126
1126
1127 The *filelogs segment* consists of multiple sub-segments, each
1127 The *filelogs segment* consists of multiple sub-segments, each
1128 corresponding to an individual file whose data is being described:
1128 corresponding to an individual file whose data is being described:
1129
1129
1130 +--------------------------------------------------+
1130 +--------------------------------------------------+
1131 | | | | | |
1131 | | | | | |
1132 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1132 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1133 | | | | | (4 bytes) |
1133 | | | | | (4 bytes) |
1134 | | | | | |
1134 | | | | | |
1135 +--------------------------------------------------+
1135 +--------------------------------------------------+
1136
1136
1137 The final filelog sub-segment is followed by an *empty chunk* (logically,
1137 The final filelog sub-segment is followed by an *empty chunk* (logically,
1138 a sub-segment with filename size 0). This denotes the end of the segment
1138 a sub-segment with filename size 0). This denotes the end of the segment
1139 and of the overall changegroup.
1139 and of the overall changegroup.
1140
1140
1141 Each filelog sub-segment consists of the following:
1141 Each filelog sub-segment consists of the following:
1142
1142
1143 +------------------------------------------------------+
1143 +------------------------------------------------------+
1144 | | | |
1144 | | | |
1145 | filename length | filename | delta group |
1145 | filename length | filename | delta group |
1146 | (4 bytes) | (<length - 4> bytes) | (various) |
1146 | (4 bytes) | (<length - 4> bytes) | (various) |
1147 | | | |
1147 | | | |
1148 +------------------------------------------------------+
1148 +------------------------------------------------------+
1149
1149
1150 That is, a *chunk* consisting of the filename (not terminated or padded)
1150 That is, a *chunk* consisting of the filename (not terminated or padded)
1151 followed by N chunks constituting the *delta group* for this file. The
1151 followed by N chunks constituting the *delta group* for this file. The
1152 *empty chunk* at the end of each *delta group* denotes the boundary to the
1152 *empty chunk* at the end of each *delta group* denotes the boundary to the
1153 next filelog sub-segment.
1153 next filelog sub-segment.
1154
1154
1155 Test list of commands with command with no help text
1155 Test list of commands with command with no help text
1156
1156
1157 $ hg help helpext
1157 $ hg help helpext
1158 helpext extension - no help text available
1158 helpext extension - no help text available
1159
1159
1160 list of commands:
1160 list of commands:
1161
1161
1162 nohelp (no help text available)
1162 nohelp (no help text available)
1163
1163
1164 (use 'hg help -v helpext' to show built-in aliases and global options)
1164 (use 'hg help -v helpext' to show built-in aliases and global options)
1165
1165
1166
1166
1167 test advanced, deprecated and experimental options are hidden in command help
1167 test advanced, deprecated and experimental options are hidden in command help
1168 $ hg help debugoptADV
1168 $ hg help debugoptADV
1169 hg debugoptADV
1169 hg debugoptADV
1170
1170
1171 (no help text available)
1171 (no help text available)
1172
1172
1173 options:
1173 options:
1174
1174
1175 (some details hidden, use --verbose to show complete help)
1175 (some details hidden, use --verbose to show complete help)
1176 $ hg help debugoptDEP
1176 $ hg help debugoptDEP
1177 hg debugoptDEP
1177 hg debugoptDEP
1178
1178
1179 (no help text available)
1179 (no help text available)
1180
1180
1181 options:
1181 options:
1182
1182
1183 (some details hidden, use --verbose to show complete help)
1183 (some details hidden, use --verbose to show complete help)
1184
1184
1185 $ hg help debugoptEXP
1185 $ hg help debugoptEXP
1186 hg debugoptEXP
1186 hg debugoptEXP
1187
1187
1188 (no help text available)
1188 (no help text available)
1189
1189
1190 options:
1190 options:
1191
1191
1192 (some details hidden, use --verbose to show complete help)
1192 (some details hidden, use --verbose to show complete help)
1193
1193
1194 test advanced, deprecated and experimental options are shown with -v
1194 test advanced, deprecated and experimental options are shown with -v
1195 $ hg help -v debugoptADV | grep aopt
1195 $ hg help -v debugoptADV | grep aopt
1196 --aopt option is (ADVANCED)
1196 --aopt option is (ADVANCED)
1197 $ hg help -v debugoptDEP | grep dopt
1197 $ hg help -v debugoptDEP | grep dopt
1198 --dopt option is (DEPRECATED)
1198 --dopt option is (DEPRECATED)
1199 $ hg help -v debugoptEXP | grep eopt
1199 $ hg help -v debugoptEXP | grep eopt
1200 --eopt option is (EXPERIMENTAL)
1200 --eopt option is (EXPERIMENTAL)
1201
1201
1202 #if gettext
1202 #if gettext
1203 test deprecated option is hidden with translation with untranslated description
1203 test deprecated option is hidden with translation with untranslated description
1204 (use many globy for not failing on changed transaction)
1204 (use many globy for not failing on changed transaction)
1205 $ LANGUAGE=sv hg help debugoptDEP
1205 $ LANGUAGE=sv hg help debugoptDEP
1206 hg debugoptDEP
1206 hg debugoptDEP
1207
1207
1208 (*) (glob)
1208 (*) (glob)
1209
1209
1210 options:
1210 options:
1211
1211
1212 (some details hidden, use --verbose to show complete help)
1212 (some details hidden, use --verbose to show complete help)
1213 #endif
1213 #endif
1214
1214
1215 Test commands that collide with topics (issue4240)
1215 Test commands that collide with topics (issue4240)
1216
1216
1217 $ hg config -hq
1217 $ hg config -hq
1218 hg config [-u] [NAME]...
1218 hg config [-u] [NAME]...
1219
1219
1220 show combined config settings from all hgrc files
1220 show combined config settings from all hgrc files
1221 $ hg showconfig -hq
1221 $ hg showconfig -hq
1222 hg config [-u] [NAME]...
1222 hg config [-u] [NAME]...
1223
1223
1224 show combined config settings from all hgrc files
1224 show combined config settings from all hgrc files
1225
1225
1226 Test a help topic
1226 Test a help topic
1227
1227
1228 $ hg help dates
1228 $ hg help dates
1229 Date Formats
1229 Date Formats
1230 """"""""""""
1230 """"""""""""
1231
1231
1232 Some commands allow the user to specify a date, e.g.:
1232 Some commands allow the user to specify a date, e.g.:
1233
1233
1234 - backout, commit, import, tag: Specify the commit date.
1234 - backout, commit, import, tag: Specify the commit date.
1235 - log, revert, update: Select revision(s) by date.
1235 - log, revert, update: Select revision(s) by date.
1236
1236
1237 Many date formats are valid. Here are some examples:
1237 Many date formats are valid. Here are some examples:
1238
1238
1239 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1239 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1240 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1240 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1241 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1241 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1242 - "Dec 6" (midnight)
1242 - "Dec 6" (midnight)
1243 - "13:18" (today assumed)
1243 - "13:18" (today assumed)
1244 - "3:39" (3:39AM assumed)
1244 - "3:39" (3:39AM assumed)
1245 - "3:39pm" (15:39)
1245 - "3:39pm" (15:39)
1246 - "2006-12-06 13:18:29" (ISO 8601 format)
1246 - "2006-12-06 13:18:29" (ISO 8601 format)
1247 - "2006-12-6 13:18"
1247 - "2006-12-6 13:18"
1248 - "2006-12-6"
1248 - "2006-12-6"
1249 - "12-6"
1249 - "12-6"
1250 - "12/6"
1250 - "12/6"
1251 - "12/6/6" (Dec 6 2006)
1251 - "12/6/6" (Dec 6 2006)
1252 - "today" (midnight)
1252 - "today" (midnight)
1253 - "yesterday" (midnight)
1253 - "yesterday" (midnight)
1254 - "now" - right now
1254 - "now" - right now
1255
1255
1256 Lastly, there is Mercurial's internal format:
1256 Lastly, there is Mercurial's internal format:
1257
1257
1258 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1258 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1259
1259
1260 This is the internal representation format for dates. The first number is
1260 This is the internal representation format for dates. The first number is
1261 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1261 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1262 is the offset of the local timezone, in seconds west of UTC (negative if
1262 is the offset of the local timezone, in seconds west of UTC (negative if
1263 the timezone is east of UTC).
1263 the timezone is east of UTC).
1264
1264
1265 The log command also accepts date ranges:
1265 The log command also accepts date ranges:
1266
1266
1267 - "<DATE" - at or before a given date/time
1267 - "<DATE" - at or before a given date/time
1268 - ">DATE" - on or after a given date/time
1268 - ">DATE" - on or after a given date/time
1269 - "DATE to DATE" - a date range, inclusive
1269 - "DATE to DATE" - a date range, inclusive
1270 - "-DAYS" - within a given number of days of today
1270 - "-DAYS" - within a given number of days of today
1271
1271
1272 Test repeated config section name
1272 Test repeated config section name
1273
1273
1274 $ hg help config.host
1274 $ hg help config.host
1275 "http_proxy.host"
1275 "http_proxy.host"
1276 Host name and (optional) port of the proxy server, for example
1276 Host name and (optional) port of the proxy server, for example
1277 "myproxy:8000".
1277 "myproxy:8000".
1278
1278
1279 "smtp.host"
1279 "smtp.host"
1280 Host name of mail server, e.g. "mail.example.com".
1280 Host name of mail server, e.g. "mail.example.com".
1281
1281
1282 Unrelated trailing paragraphs shouldn't be included
1282 Unrelated trailing paragraphs shouldn't be included
1283
1283
1284 $ hg help config.extramsg | grep '^$'
1284 $ hg help config.extramsg | grep '^$'
1285
1285
1286
1286
1287 Test capitalized section name
1287 Test capitalized section name
1288
1288
1289 $ hg help scripting.HGPLAIN > /dev/null
1289 $ hg help scripting.HGPLAIN > /dev/null
1290
1290
1291 Help subsection:
1291 Help subsection:
1292
1292
1293 $ hg help config.charsets |grep "Email example:" > /dev/null
1293 $ hg help config.charsets |grep "Email example:" > /dev/null
1294 [1]
1294 [1]
1295
1295
1296 Show nested definitions
1296 Show nested definitions
1297 ("profiling.type"[break]"ls"[break]"stat"[break])
1297 ("profiling.type"[break]"ls"[break]"stat"[break])
1298
1298
1299 $ hg help config.type | egrep '^$'|wc -l
1299 $ hg help config.type | egrep '^$'|wc -l
1300 \s*3 (re)
1300 \s*3 (re)
1301
1301
1302 Separate sections from subsections
1302 Separate sections from subsections
1303
1303
1304 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1304 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1305 "format"
1305 "format"
1306 --------
1306 --------
1307
1307
1308 "usegeneraldelta"
1308 "usegeneraldelta"
1309
1309
1310 "dotencode"
1310 "dotencode"
1311
1311
1312 "usefncache"
1312 "usefncache"
1313
1313
1314 "usestore"
1314 "usestore"
1315
1315
1316 "profiling"
1316 "profiling"
1317 -----------
1317 -----------
1318
1318
1319 "format"
1319 "format"
1320
1320
1321 "progress"
1321 "progress"
1322 ----------
1322 ----------
1323
1323
1324 "format"
1324 "format"
1325
1325
1326
1326
1327 Last item in help config.*:
1327 Last item in help config.*:
1328
1328
1329 $ hg help config.`hg help config|grep '^ "'| \
1329 $ hg help config.`hg help config|grep '^ "'| \
1330 > tail -1|sed 's![ "]*!!g'`| \
1330 > tail -1|sed 's![ "]*!!g'`| \
1331 > grep 'hg help -c config' > /dev/null
1331 > grep 'hg help -c config' > /dev/null
1332 [1]
1332 [1]
1333
1333
1334 note to use help -c for general hg help config:
1334 note to use help -c for general hg help config:
1335
1335
1336 $ hg help config |grep 'hg help -c config' > /dev/null
1336 $ hg help config |grep 'hg help -c config' > /dev/null
1337
1337
1338 Test templating help
1338 Test templating help
1339
1339
1340 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1340 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1341 desc String. The text of the changeset description.
1341 desc String. The text of the changeset description.
1342 diffstat String. Statistics of changes with the following format:
1342 diffstat String. Statistics of changes with the following format:
1343 firstline Any text. Returns the first line of text.
1343 firstline Any text. Returns the first line of text.
1344 nonempty Any text. Returns '(none)' if the string is empty.
1344 nonempty Any text. Returns '(none)' if the string is empty.
1345
1345
1346 Test deprecated items
1346 Test deprecated items
1347
1347
1348 $ hg help -v templating | grep currentbookmark
1348 $ hg help -v templating | grep currentbookmark
1349 currentbookmark
1349 currentbookmark
1350 $ hg help templating | (grep currentbookmark || true)
1350 $ hg help templating | (grep currentbookmark || true)
1351
1351
1352 Test help hooks
1352 Test help hooks
1353
1353
1354 $ cat > helphook1.py <<EOF
1354 $ cat > helphook1.py <<EOF
1355 > from mercurial import help
1355 > from mercurial import help
1356 >
1356 >
1357 > def rewrite(ui, topic, doc):
1357 > def rewrite(ui, topic, doc):
1358 > return doc + '\nhelphook1\n'
1358 > return doc + '\nhelphook1\n'
1359 >
1359 >
1360 > def extsetup(ui):
1360 > def extsetup(ui):
1361 > help.addtopichook('revisions', rewrite)
1361 > help.addtopichook('revisions', rewrite)
1362 > EOF
1362 > EOF
1363 $ cat > helphook2.py <<EOF
1363 $ cat > helphook2.py <<EOF
1364 > from mercurial import help
1364 > from mercurial import help
1365 >
1365 >
1366 > def rewrite(ui, topic, doc):
1366 > def rewrite(ui, topic, doc):
1367 > return doc + '\nhelphook2\n'
1367 > return doc + '\nhelphook2\n'
1368 >
1368 >
1369 > def extsetup(ui):
1369 > def extsetup(ui):
1370 > help.addtopichook('revisions', rewrite)
1370 > help.addtopichook('revisions', rewrite)
1371 > EOF
1371 > EOF
1372 $ echo '[extensions]' >> $HGRCPATH
1372 $ echo '[extensions]' >> $HGRCPATH
1373 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1373 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1374 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1374 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1375 $ hg help revsets | grep helphook
1375 $ hg help revsets | grep helphook
1376 helphook1
1376 helphook1
1377 helphook2
1377 helphook2
1378
1378
1379 help -c should only show debug --debug
1379 help -c should only show debug --debug
1380
1380
1381 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1381 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1382 [1]
1382 [1]
1383
1383
1384 help -c should only show deprecated for -v
1384 help -c should only show deprecated for -v
1385
1385
1386 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1386 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1387 [1]
1387 [1]
1388
1388
1389 Test -s / --system
1389 Test -s / --system
1390
1390
1391 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1391 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1392 > wc -l | sed -e 's/ //g'
1392 > wc -l | sed -e 's/ //g'
1393 0
1393 0
1394 $ hg help config.files --system unix | grep 'USER' | \
1394 $ hg help config.files --system unix | grep 'USER' | \
1395 > wc -l | sed -e 's/ //g'
1395 > wc -l | sed -e 's/ //g'
1396 0
1396 0
1397
1397
1398 Test -e / -c / -k combinations
1398 Test -e / -c / -k combinations
1399
1399
1400 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1400 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1401 Commands:
1401 Commands:
1402 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1402 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1403 Extensions:
1403 Extensions:
1404 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1404 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1405 Topics:
1405 Topics:
1406 Commands:
1406 Commands:
1407 Extensions:
1407 Extensions:
1408 Extension Commands:
1408 Extension Commands:
1409 $ hg help -c schemes
1409 $ hg help -c schemes
1410 abort: no such help topic: schemes
1410 abort: no such help topic: schemes
1411 (try 'hg help --keyword schemes')
1411 (try 'hg help --keyword schemes')
1412 [255]
1412 [255]
1413 $ hg help -e schemes |head -1
1413 $ hg help -e schemes |head -1
1414 schemes extension - extend schemes with shortcuts to repository swarms
1414 schemes extension - extend schemes with shortcuts to repository swarms
1415 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1415 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1416 Commands:
1416 Commands:
1417 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1417 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1418 Extensions:
1418 Extensions:
1419 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1419 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1420 Extensions:
1420 Extensions:
1421 Commands:
1421 Commands:
1422 $ hg help -c commit > /dev/null
1422 $ hg help -c commit > /dev/null
1423 $ hg help -e -c commit > /dev/null
1423 $ hg help -e -c commit > /dev/null
1424 $ hg help -e commit > /dev/null
1424 $ hg help -e commit > /dev/null
1425 abort: no such help topic: commit
1425 abort: no such help topic: commit
1426 (try 'hg help --keyword commit')
1426 (try 'hg help --keyword commit')
1427 [255]
1427 [255]
1428
1428
1429 Test keyword search help
1429 Test keyword search help
1430
1430
1431 $ cat > prefixedname.py <<EOF
1431 $ cat > prefixedname.py <<EOF
1432 > '''matched against word "clone"
1432 > '''matched against word "clone"
1433 > '''
1433 > '''
1434 > EOF
1434 > EOF
1435 $ echo '[extensions]' >> $HGRCPATH
1435 $ echo '[extensions]' >> $HGRCPATH
1436 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1436 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1437 $ hg help -k clone
1437 $ hg help -k clone
1438 Topics:
1438 Topics:
1439
1439
1440 config Configuration Files
1440 config Configuration Files
1441 extensions Using Additional Features
1441 extensions Using Additional Features
1442 glossary Glossary
1442 glossary Glossary
1443 phases Working with Phases
1443 phases Working with Phases
1444 subrepos Subrepositories
1444 subrepos Subrepositories
1445 urls URL Paths
1445 urls URL Paths
1446
1446
1447 Commands:
1447 Commands:
1448
1448
1449 bookmarks create a new bookmark or list existing bookmarks
1449 bookmarks create a new bookmark or list existing bookmarks
1450 clone make a copy of an existing repository
1450 clone make a copy of an existing repository
1451 paths show aliases for remote repositories
1451 paths show aliases for remote repositories
1452 update update working directory (or switch revisions)
1452 update update working directory (or switch revisions)
1453
1453
1454 Extensions:
1454 Extensions:
1455
1455
1456 clonebundles advertise pre-generated bundles to seed clones
1456 clonebundles advertise pre-generated bundles to seed clones
1457 prefixedname matched against word "clone"
1457 prefixedname matched against word "clone"
1458 relink recreates hardlinks between repository clones
1458 relink recreates hardlinks between repository clones
1459
1459
1460 Extension Commands:
1460 Extension Commands:
1461
1461
1462 qclone clone main and patch repository at same time
1462 qclone clone main and patch repository at same time
1463
1463
1464 Test unfound topic
1464 Test unfound topic
1465
1465
1466 $ hg help nonexistingtopicthatwillneverexisteverever
1466 $ hg help nonexistingtopicthatwillneverexisteverever
1467 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1467 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1468 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1468 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1469 [255]
1469 [255]
1470
1470
1471 Test unfound keyword
1471 Test unfound keyword
1472
1472
1473 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1473 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1474 abort: no matches
1474 abort: no matches
1475 (try 'hg help' for a list of topics)
1475 (try 'hg help' for a list of topics)
1476 [255]
1476 [255]
1477
1477
1478 Test omit indicating for help
1478 Test omit indicating for help
1479
1479
1480 $ cat > addverboseitems.py <<EOF
1480 $ cat > addverboseitems.py <<EOF
1481 > '''extension to test omit indicating.
1481 > '''extension to test omit indicating.
1482 >
1482 >
1483 > This paragraph is never omitted (for extension)
1483 > This paragraph is never omitted (for extension)
1484 >
1484 >
1485 > .. container:: verbose
1485 > .. container:: verbose
1486 >
1486 >
1487 > This paragraph is omitted,
1487 > This paragraph is omitted,
1488 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1488 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1489 >
1489 >
1490 > This paragraph is never omitted, too (for extension)
1490 > This paragraph is never omitted, too (for extension)
1491 > '''
1491 > '''
1492 >
1492 >
1493 > from mercurial import help, commands
1493 > from mercurial import help, commands
1494 > testtopic = """This paragraph is never omitted (for topic).
1494 > testtopic = """This paragraph is never omitted (for topic).
1495 >
1495 >
1496 > .. container:: verbose
1496 > .. container:: verbose
1497 >
1497 >
1498 > This paragraph is omitted,
1498 > This paragraph is omitted,
1499 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1499 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1500 >
1500 >
1501 > This paragraph is never omitted, too (for topic)
1501 > This paragraph is never omitted, too (for topic)
1502 > """
1502 > """
1503 > def extsetup(ui):
1503 > def extsetup(ui):
1504 > help.helptable.append((["topic-containing-verbose"],
1504 > help.helptable.append((["topic-containing-verbose"],
1505 > "This is the topic to test omit indicating.",
1505 > "This is the topic to test omit indicating.",
1506 > lambda ui: testtopic))
1506 > lambda ui: testtopic))
1507 > EOF
1507 > EOF
1508 $ echo '[extensions]' >> $HGRCPATH
1508 $ echo '[extensions]' >> $HGRCPATH
1509 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1509 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1510 $ hg help addverboseitems
1510 $ hg help addverboseitems
1511 addverboseitems extension - extension to test omit indicating.
1511 addverboseitems extension - extension to test omit indicating.
1512
1512
1513 This paragraph is never omitted (for extension)
1513 This paragraph is never omitted (for extension)
1514
1514
1515 This paragraph is never omitted, too (for extension)
1515 This paragraph is never omitted, too (for extension)
1516
1516
1517 (some details hidden, use --verbose to show complete help)
1517 (some details hidden, use --verbose to show complete help)
1518
1518
1519 no commands defined
1519 no commands defined
1520 $ hg help -v addverboseitems
1520 $ hg help -v addverboseitems
1521 addverboseitems extension - extension to test omit indicating.
1521 addverboseitems extension - extension to test omit indicating.
1522
1522
1523 This paragraph is never omitted (for extension)
1523 This paragraph is never omitted (for extension)
1524
1524
1525 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1525 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1526 extension)
1526 extension)
1527
1527
1528 This paragraph is never omitted, too (for extension)
1528 This paragraph is never omitted, too (for extension)
1529
1529
1530 no commands defined
1530 no commands defined
1531 $ hg help topic-containing-verbose
1531 $ hg help topic-containing-verbose
1532 This is the topic to test omit indicating.
1532 This is the topic to test omit indicating.
1533 """"""""""""""""""""""""""""""""""""""""""
1533 """"""""""""""""""""""""""""""""""""""""""
1534
1534
1535 This paragraph is never omitted (for topic).
1535 This paragraph is never omitted (for topic).
1536
1536
1537 This paragraph is never omitted, too (for topic)
1537 This paragraph is never omitted, too (for topic)
1538
1538
1539 (some details hidden, use --verbose to show complete help)
1539 (some details hidden, use --verbose to show complete help)
1540 $ hg help -v topic-containing-verbose
1540 $ hg help -v topic-containing-verbose
1541 This is the topic to test omit indicating.
1541 This is the topic to test omit indicating.
1542 """"""""""""""""""""""""""""""""""""""""""
1542 """"""""""""""""""""""""""""""""""""""""""
1543
1543
1544 This paragraph is never omitted (for topic).
1544 This paragraph is never omitted (for topic).
1545
1545
1546 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1546 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1547 topic)
1547 topic)
1548
1548
1549 This paragraph is never omitted, too (for topic)
1549 This paragraph is never omitted, too (for topic)
1550
1550
1551 Test section lookup
1551 Test section lookup
1552
1552
1553 $ hg help revset.merge
1553 $ hg help revset.merge
1554 "merge()"
1554 "merge()"
1555 Changeset is a merge changeset.
1555 Changeset is a merge changeset.
1556
1556
1557 $ hg help glossary.dag
1557 $ hg help glossary.dag
1558 DAG
1558 DAG
1559 The repository of changesets of a distributed version control system
1559 The repository of changesets of a distributed version control system
1560 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1560 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1561 of nodes and edges, where nodes correspond to changesets and edges
1561 of nodes and edges, where nodes correspond to changesets and edges
1562 imply a parent -> child relation. This graph can be visualized by
1562 imply a parent -> child relation. This graph can be visualized by
1563 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1563 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1564 limited by the requirement for children to have at most two parents.
1564 limited by the requirement for children to have at most two parents.
1565
1565
1566
1566
1567 $ hg help hgrc.paths
1567 $ hg help hgrc.paths
1568 "paths"
1568 "paths"
1569 -------
1569 -------
1570
1570
1571 Assigns symbolic names and behavior to repositories.
1571 Assigns symbolic names and behavior to repositories.
1572
1572
1573 Options are symbolic names defining the URL or directory that is the
1573 Options are symbolic names defining the URL or directory that is the
1574 location of the repository. Example:
1574 location of the repository. Example:
1575
1575
1576 [paths]
1576 [paths]
1577 my_server = https://example.com/my_repo
1577 my_server = https://example.com/my_repo
1578 local_path = /home/me/repo
1578 local_path = /home/me/repo
1579
1579
1580 These symbolic names can be used from the command line. To pull from
1580 These symbolic names can be used from the command line. To pull from
1581 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1581 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1582 local_path'.
1582 local_path'.
1583
1583
1584 Options containing colons (":") denote sub-options that can influence
1584 Options containing colons (":") denote sub-options that can influence
1585 behavior for that specific path. Example:
1585 behavior for that specific path. Example:
1586
1586
1587 [paths]
1587 [paths]
1588 my_server = https://example.com/my_path
1588 my_server = https://example.com/my_path
1589 my_server:pushurl = ssh://example.com/my_path
1589 my_server:pushurl = ssh://example.com/my_path
1590
1590
1591 The following sub-options can be defined:
1591 The following sub-options can be defined:
1592
1592
1593 "pushurl"
1593 "pushurl"
1594 The URL to use for push operations. If not defined, the location
1594 The URL to use for push operations. If not defined, the location
1595 defined by the path's main entry is used.
1595 defined by the path's main entry is used.
1596
1596
1597 "pushrev"
1597 "pushrev"
1598 A revset defining which revisions to push by default.
1598 A revset defining which revisions to push by default.
1599
1599
1600 When 'hg push' is executed without a "-r" argument, the revset defined
1600 When 'hg push' is executed without a "-r" argument, the revset defined
1601 by this sub-option is evaluated to determine what to push.
1601 by this sub-option is evaluated to determine what to push.
1602
1602
1603 For example, a value of "." will push the working directory's revision
1603 For example, a value of "." will push the working directory's revision
1604 by default.
1604 by default.
1605
1605
1606 Revsets specifying bookmarks will not result in the bookmark being
1606 Revsets specifying bookmarks will not result in the bookmark being
1607 pushed.
1607 pushed.
1608
1608
1609 The following special named paths exist:
1609 The following special named paths exist:
1610
1610
1611 "default"
1611 "default"
1612 The URL or directory to use when no source or remote is specified.
1612 The URL or directory to use when no source or remote is specified.
1613
1613
1614 'hg clone' will automatically define this path to the location the
1614 'hg clone' will automatically define this path to the location the
1615 repository was cloned from.
1615 repository was cloned from.
1616
1616
1617 "default-push"
1617 "default-push"
1618 (deprecated) The URL or directory for the default 'hg push' location.
1618 (deprecated) The URL or directory for the default 'hg push' location.
1619 "default:pushurl" should be used instead.
1619 "default:pushurl" should be used instead.
1620
1620
1621 $ hg help glossary.mcguffin
1621 $ hg help glossary.mcguffin
1622 abort: help section not found: glossary.mcguffin
1622 abort: help section not found: glossary.mcguffin
1623 [255]
1623 [255]
1624
1624
1625 $ hg help glossary.mc.guffin
1625 $ hg help glossary.mc.guffin
1626 abort: help section not found: glossary.mc.guffin
1626 abort: help section not found: glossary.mc.guffin
1627 [255]
1627 [255]
1628
1628
1629 $ hg help template.files
1629 $ hg help template.files
1630 files List of strings. All files modified, added, or removed by
1630 files List of strings. All files modified, added, or removed by
1631 this changeset.
1631 this changeset.
1632 files(pattern)
1632 files(pattern)
1633 All files of the current changeset matching the pattern. See
1633 All files of the current changeset matching the pattern. See
1634 'hg help patterns'.
1634 'hg help patterns'.
1635
1635
1636 Test section lookup by translated message
1636 Test section lookup by translated message
1637
1637
1638 str.lower() instead of encoding.lower(str) on translated message might
1638 str.lower() instead of encoding.lower(str) on translated message might
1639 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1639 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1640 as the second or later byte of multi-byte character.
1640 as the second or later byte of multi-byte character.
1641
1641
1642 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1642 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1643 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1643 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1644 replacement makes message meaningless.
1644 replacement makes message meaningless.
1645
1645
1646 This tests that section lookup by translated string isn't broken by
1646 This tests that section lookup by translated string isn't broken by
1647 such str.lower().
1647 such str.lower().
1648
1648
1649 $ python <<EOF
1649 $ python <<EOF
1650 > def escape(s):
1650 > def escape(s):
1651 > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932'))
1651 > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932'))
1652 > # translation of "record" in ja_JP.cp932
1652 > # translation of "record" in ja_JP.cp932
1653 > upper = "\x8bL\x98^"
1653 > upper = "\x8bL\x98^"
1654 > # str.lower()-ed section name should be treated as different one
1654 > # str.lower()-ed section name should be treated as different one
1655 > lower = "\x8bl\x98^"
1655 > lower = "\x8bl\x98^"
1656 > with open('ambiguous.py', 'w') as fp:
1656 > with open('ambiguous.py', 'w') as fp:
1657 > fp.write("""# ambiguous section names in ja_JP.cp932
1657 > fp.write("""# ambiguous section names in ja_JP.cp932
1658 > u'''summary of extension
1658 > u'''summary of extension
1659 >
1659 >
1660 > %s
1660 > %s
1661 > ----
1661 > ----
1662 >
1662 >
1663 > Upper name should show only this message
1663 > Upper name should show only this message
1664 >
1664 >
1665 > %s
1665 > %s
1666 > ----
1666 > ----
1667 >
1667 >
1668 > Lower name should show only this message
1668 > Lower name should show only this message
1669 >
1669 >
1670 > subsequent section
1670 > subsequent section
1671 > ------------------
1671 > ------------------
1672 >
1672 >
1673 > This should be hidden at 'hg help ambiguous' with section name.
1673 > This should be hidden at 'hg help ambiguous' with section name.
1674 > '''
1674 > '''
1675 > """ % (escape(upper), escape(lower)))
1675 > """ % (escape(upper), escape(lower)))
1676 > EOF
1676 > EOF
1677
1677
1678 $ cat >> $HGRCPATH <<EOF
1678 $ cat >> $HGRCPATH <<EOF
1679 > [extensions]
1679 > [extensions]
1680 > ambiguous = ./ambiguous.py
1680 > ambiguous = ./ambiguous.py
1681 > EOF
1681 > EOF
1682
1682
1683 $ python <<EOF | sh
1683 $ python <<EOF | sh
1684 > upper = "\x8bL\x98^"
1684 > upper = "\x8bL\x98^"
1685 > print "hg --encoding cp932 help -e ambiguous.%s" % upper
1685 > print "hg --encoding cp932 help -e ambiguous.%s" % upper
1686 > EOF
1686 > EOF
1687 \x8bL\x98^ (esc)
1687 \x8bL\x98^ (esc)
1688 ----
1688 ----
1689
1689
1690 Upper name should show only this message
1690 Upper name should show only this message
1691
1691
1692
1692
1693 $ python <<EOF | sh
1693 $ python <<EOF | sh
1694 > lower = "\x8bl\x98^"
1694 > lower = "\x8bl\x98^"
1695 > print "hg --encoding cp932 help -e ambiguous.%s" % lower
1695 > print "hg --encoding cp932 help -e ambiguous.%s" % lower
1696 > EOF
1696 > EOF
1697 \x8bl\x98^ (esc)
1697 \x8bl\x98^ (esc)
1698 ----
1698 ----
1699
1699
1700 Lower name should show only this message
1700 Lower name should show only this message
1701
1701
1702
1702
1703 $ cat >> $HGRCPATH <<EOF
1703 $ cat >> $HGRCPATH <<EOF
1704 > [extensions]
1704 > [extensions]
1705 > ambiguous = !
1705 > ambiguous = !
1706 > EOF
1706 > EOF
1707
1707
1708 Show help content of disabled extensions
1708 Show help content of disabled extensions
1709
1709
1710 $ cat >> $HGRCPATH <<EOF
1710 $ cat >> $HGRCPATH <<EOF
1711 > [extensions]
1711 > [extensions]
1712 > ambiguous = !./ambiguous.py
1712 > ambiguous = !./ambiguous.py
1713 > EOF
1713 > EOF
1714 $ hg help -e ambiguous
1714 $ hg help -e ambiguous
1715 ambiguous extension - (no help text available)
1715 ambiguous extension - (no help text available)
1716
1716
1717 (use 'hg help extensions' for information on enabling extensions)
1717 (use 'hg help extensions' for information on enabling extensions)
1718
1718
1719 Test dynamic list of merge tools only shows up once
1719 Test dynamic list of merge tools only shows up once
1720 $ hg help merge-tools
1720 $ hg help merge-tools
1721 Merge Tools
1721 Merge Tools
1722 """""""""""
1722 """""""""""
1723
1723
1724 To merge files Mercurial uses merge tools.
1724 To merge files Mercurial uses merge tools.
1725
1725
1726 A merge tool combines two different versions of a file into a merged file.
1726 A merge tool combines two different versions of a file into a merged file.
1727 Merge tools are given the two files and the greatest common ancestor of
1727 Merge tools are given the two files and the greatest common ancestor of
1728 the two file versions, so they can determine the changes made on both
1728 the two file versions, so they can determine the changes made on both
1729 branches.
1729 branches.
1730
1730
1731 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1731 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1732 backout' and in several extensions.
1732 backout' and in several extensions.
1733
1733
1734 Usually, the merge tool tries to automatically reconcile the files by
1734 Usually, the merge tool tries to automatically reconcile the files by
1735 combining all non-overlapping changes that occurred separately in the two
1735 combining all non-overlapping changes that occurred separately in the two
1736 different evolutions of the same initial base file. Furthermore, some
1736 different evolutions of the same initial base file. Furthermore, some
1737 interactive merge programs make it easier to manually resolve conflicting
1737 interactive merge programs make it easier to manually resolve conflicting
1738 merges, either in a graphical way, or by inserting some conflict markers.
1738 merges, either in a graphical way, or by inserting some conflict markers.
1739 Mercurial does not include any interactive merge programs but relies on
1739 Mercurial does not include any interactive merge programs but relies on
1740 external tools for that.
1740 external tools for that.
1741
1741
1742 Available merge tools
1742 Available merge tools
1743 =====================
1743 =====================
1744
1744
1745 External merge tools and their properties are configured in the merge-
1745 External merge tools and their properties are configured in the merge-
1746 tools configuration section - see hgrc(5) - but they can often just be
1746 tools configuration section - see hgrc(5) - but they can often just be
1747 named by their executable.
1747 named by their executable.
1748
1748
1749 A merge tool is generally usable if its executable can be found on the
1749 A merge tool is generally usable if its executable can be found on the
1750 system and if it can handle the merge. The executable is found if it is an
1750 system and if it can handle the merge. The executable is found if it is an
1751 absolute or relative executable path or the name of an application in the
1751 absolute or relative executable path or the name of an application in the
1752 executable search path. The tool is assumed to be able to handle the merge
1752 executable search path. The tool is assumed to be able to handle the merge
1753 if it can handle symlinks if the file is a symlink, if it can handle
1753 if it can handle symlinks if the file is a symlink, if it can handle
1754 binary files if the file is binary, and if a GUI is available if the tool
1754 binary files if the file is binary, and if a GUI is available if the tool
1755 requires a GUI.
1755 requires a GUI.
1756
1756
1757 There are some internal merge tools which can be used. The internal merge
1757 There are some internal merge tools which can be used. The internal merge
1758 tools are:
1758 tools are:
1759
1759
1760 ":dump"
1760 ":dump"
1761 Creates three versions of the files to merge, containing the contents of
1761 Creates three versions of the files to merge, containing the contents of
1762 local, other and base. These files can then be used to perform a merge
1762 local, other and base. These files can then be used to perform a merge
1763 manually. If the file to be merged is named "a.txt", these files will
1763 manually. If the file to be merged is named "a.txt", these files will
1764 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1764 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1765 they will be placed in the same directory as "a.txt".
1765 they will be placed in the same directory as "a.txt".
1766
1766
1767 This implies permerge. Therefore, files aren't dumped, if premerge runs
1767 This implies permerge. Therefore, files aren't dumped, if premerge runs
1768 successfully. Use :forcedump to forcibly write files out.
1768 successfully. Use :forcedump to forcibly write files out.
1769
1769
1770 ":fail"
1770 ":fail"
1771 Rather than attempting to merge files that were modified on both
1771 Rather than attempting to merge files that were modified on both
1772 branches, it marks them as unresolved. The resolve command must be used
1772 branches, it marks them as unresolved. The resolve command must be used
1773 to resolve these conflicts.
1773 to resolve these conflicts.
1774
1774
1775 ":forcedump"
1775 ":forcedump"
1776 Creates three versions of the files as same as :dump, but omits
1776 Creates three versions of the files as same as :dump, but omits
1777 premerge.
1777 premerge.
1778
1778
1779 ":local"
1779 ":local"
1780 Uses the local 'p1()' version of files as the merged version.
1780 Uses the local 'p1()' version of files as the merged version.
1781
1781
1782 ":merge"
1782 ":merge"
1783 Uses the internal non-interactive simple merge algorithm for merging
1783 Uses the internal non-interactive simple merge algorithm for merging
1784 files. It will fail if there are any conflicts and leave markers in the
1784 files. It will fail if there are any conflicts and leave markers in the
1785 partially merged file. Markers will have two sections, one for each side
1785 partially merged file. Markers will have two sections, one for each side
1786 of merge.
1786 of merge.
1787
1787
1788 ":merge-local"
1788 ":merge-local"
1789 Like :merge, but resolve all conflicts non-interactively in favor of the
1789 Like :merge, but resolve all conflicts non-interactively in favor of the
1790 local 'p1()' changes.
1790 local 'p1()' changes.
1791
1791
1792 ":merge-other"
1792 ":merge-other"
1793 Like :merge, but resolve all conflicts non-interactively in favor of the
1793 Like :merge, but resolve all conflicts non-interactively in favor of the
1794 other 'p2()' changes.
1794 other 'p2()' changes.
1795
1795
1796 ":merge3"
1796 ":merge3"
1797 Uses the internal non-interactive simple merge algorithm for merging
1797 Uses the internal non-interactive simple merge algorithm for merging
1798 files. It will fail if there are any conflicts and leave markers in the
1798 files. It will fail if there are any conflicts and leave markers in the
1799 partially merged file. Marker will have three sections, one from each
1799 partially merged file. Marker will have three sections, one from each
1800 side of the merge and one for the base content.
1800 side of the merge and one for the base content.
1801
1801
1802 ":other"
1802 ":other"
1803 Uses the other 'p2()' version of files as the merged version.
1803 Uses the other 'p2()' version of files as the merged version.
1804
1804
1805 ":prompt"
1805 ":prompt"
1806 Asks the user which of the local 'p1()' or the other 'p2()' version to
1806 Asks the user which of the local 'p1()' or the other 'p2()' version to
1807 keep as the merged version.
1807 keep as the merged version.
1808
1808
1809 ":tagmerge"
1809 ":tagmerge"
1810 Uses the internal tag merge algorithm (experimental).
1810 Uses the internal tag merge algorithm (experimental).
1811
1811
1812 ":union"
1812 ":union"
1813 Uses the internal non-interactive simple merge algorithm for merging
1813 Uses the internal non-interactive simple merge algorithm for merging
1814 files. It will use both left and right sides for conflict regions. No
1814 files. It will use both left and right sides for conflict regions. No
1815 markers are inserted.
1815 markers are inserted.
1816
1816
1817 Internal tools are always available and do not require a GUI but will by
1817 Internal tools are always available and do not require a GUI but will by
1818 default not handle symlinks or binary files.
1818 default not handle symlinks or binary files.
1819
1819
1820 Choosing a merge tool
1820 Choosing a merge tool
1821 =====================
1821 =====================
1822
1822
1823 Mercurial uses these rules when deciding which merge tool to use:
1823 Mercurial uses these rules when deciding which merge tool to use:
1824
1824
1825 1. If a tool has been specified with the --tool option to merge or
1825 1. If a tool has been specified with the --tool option to merge or
1826 resolve, it is used. If it is the name of a tool in the merge-tools
1826 resolve, it is used. If it is the name of a tool in the merge-tools
1827 configuration, its configuration is used. Otherwise the specified tool
1827 configuration, its configuration is used. Otherwise the specified tool
1828 must be executable by the shell.
1828 must be executable by the shell.
1829 2. If the "HGMERGE" environment variable is present, its value is used and
1829 2. If the "HGMERGE" environment variable is present, its value is used and
1830 must be executable by the shell.
1830 must be executable by the shell.
1831 3. If the filename of the file to be merged matches any of the patterns in
1831 3. If the filename of the file to be merged matches any of the patterns in
1832 the merge-patterns configuration section, the first usable merge tool
1832 the merge-patterns configuration section, the first usable merge tool
1833 corresponding to a matching pattern is used. Here, binary capabilities
1833 corresponding to a matching pattern is used. Here, binary capabilities
1834 of the merge tool are not considered.
1834 of the merge tool are not considered.
1835 4. If ui.merge is set it will be considered next. If the value is not the
1835 4. If ui.merge is set it will be considered next. If the value is not the
1836 name of a configured tool, the specified value is used and must be
1836 name of a configured tool, the specified value is used and must be
1837 executable by the shell. Otherwise the named tool is used if it is
1837 executable by the shell. Otherwise the named tool is used if it is
1838 usable.
1838 usable.
1839 5. If any usable merge tools are present in the merge-tools configuration
1839 5. If any usable merge tools are present in the merge-tools configuration
1840 section, the one with the highest priority is used.
1840 section, the one with the highest priority is used.
1841 6. If a program named "hgmerge" can be found on the system, it is used -
1841 6. If a program named "hgmerge" can be found on the system, it is used -
1842 but it will by default not be used for symlinks and binary files.
1842 but it will by default not be used for symlinks and binary files.
1843 7. If the file to be merged is not binary and is not a symlink, then
1843 7. If the file to be merged is not binary and is not a symlink, then
1844 internal ":merge" is used.
1844 internal ":merge" is used.
1845 8. Otherwise, ":prompt" is used.
1845 8. Otherwise, ":prompt" is used.
1846
1846
1847 Note:
1847 Note:
1848 After selecting a merge program, Mercurial will by default attempt to
1848 After selecting a merge program, Mercurial will by default attempt to
1849 merge the files using a simple merge algorithm first. Only if it
1849 merge the files using a simple merge algorithm first. Only if it
1850 doesn't succeed because of conflicting changes Mercurial will actually
1850 doesn't succeed because of conflicting changes Mercurial will actually
1851 execute the merge program. Whether to use the simple merge algorithm
1851 execute the merge program. Whether to use the simple merge algorithm
1852 first can be controlled by the premerge setting of the merge tool.
1852 first can be controlled by the premerge setting of the merge tool.
1853 Premerge is enabled by default unless the file is binary or a symlink.
1853 Premerge is enabled by default unless the file is binary or a symlink.
1854
1854
1855 See the merge-tools and ui sections of hgrc(5) for details on the
1855 See the merge-tools and ui sections of hgrc(5) for details on the
1856 configuration of merge tools.
1856 configuration of merge tools.
1857
1857
1858 Compression engines listed in `hg help bundlespec`
1858 Compression engines listed in `hg help bundlespec`
1859
1859
1860 $ hg help bundlespec | grep gzip
1860 $ hg help bundlespec | grep gzip
1861 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
1861 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
1862 An algorithm that produces smaller bundles than "gzip".
1862 An algorithm that produces smaller bundles than "gzip".
1863 This engine will likely produce smaller bundles than "gzip" but will be
1863 This engine will likely produce smaller bundles than "gzip" but will be
1864 "gzip"
1864 "gzip"
1865 better compression than "gzip". It also frequently yields better (?)
1865 better compression than "gzip". It also frequently yields better (?)
1866
1866
1867 Test usage of section marks in help documents
1867 Test usage of section marks in help documents
1868
1868
1869 $ cd "$TESTDIR"/../doc
1869 $ cd "$TESTDIR"/../doc
1870 $ python check-seclevel.py
1870 $ python check-seclevel.py
1871 $ cd $TESTTMP
1871 $ cd $TESTTMP
1872
1872
1873 #if serve
1873 #if serve
1874
1874
1875 Test the help pages in hgweb.
1875 Test the help pages in hgweb.
1876
1876
1877 Dish up an empty repo; serve it cold.
1877 Dish up an empty repo; serve it cold.
1878
1878
1879 $ hg init "$TESTTMP/test"
1879 $ hg init "$TESTTMP/test"
1880 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1880 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1881 $ cat hg.pid >> $DAEMON_PIDS
1881 $ cat hg.pid >> $DAEMON_PIDS
1882
1882
1883 $ get-with-headers.py $LOCALIP:$HGPORT "help"
1883 $ get-with-headers.py $LOCALIP:$HGPORT "help"
1884 200 Script output follows
1884 200 Script output follows
1885
1885
1886 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1886 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1887 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1887 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1888 <head>
1888 <head>
1889 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1889 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1890 <meta name="robots" content="index, nofollow" />
1890 <meta name="robots" content="index, nofollow" />
1891 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1891 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1892 <script type="text/javascript" src="/static/mercurial.js"></script>
1892 <script type="text/javascript" src="/static/mercurial.js"></script>
1893
1893
1894 <title>Help: Index</title>
1894 <title>Help: Index</title>
1895 </head>
1895 </head>
1896 <body>
1896 <body>
1897
1897
1898 <div class="container">
1898 <div class="container">
1899 <div class="menu">
1899 <div class="menu">
1900 <div class="logo">
1900 <div class="logo">
1901 <a href="https://mercurial-scm.org/">
1901 <a href="https://mercurial-scm.org/">
1902 <img src="/static/hglogo.png" alt="mercurial" /></a>
1902 <img src="/static/hglogo.png" alt="mercurial" /></a>
1903 </div>
1903 </div>
1904 <ul>
1904 <ul>
1905 <li><a href="/shortlog">log</a></li>
1905 <li><a href="/shortlog">log</a></li>
1906 <li><a href="/graph">graph</a></li>
1906 <li><a href="/graph">graph</a></li>
1907 <li><a href="/tags">tags</a></li>
1907 <li><a href="/tags">tags</a></li>
1908 <li><a href="/bookmarks">bookmarks</a></li>
1908 <li><a href="/bookmarks">bookmarks</a></li>
1909 <li><a href="/branches">branches</a></li>
1909 <li><a href="/branches">branches</a></li>
1910 </ul>
1910 </ul>
1911 <ul>
1911 <ul>
1912 <li class="active">help</li>
1912 <li class="active">help</li>
1913 </ul>
1913 </ul>
1914 </div>
1914 </div>
1915
1915
1916 <div class="main">
1916 <div class="main">
1917 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1917 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1918 <form class="search" action="/log">
1918 <form class="search" action="/log">
1919
1919
1920 <p><input name="rev" id="search1" type="text" size="30" /></p>
1920 <p><input name="rev" id="search1" type="text" size="30" /></p>
1921 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1921 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1922 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1922 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1923 </form>
1923 </form>
1924 <table class="bigtable">
1924 <table class="bigtable">
1925 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
1925 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
1926
1926
1927 <tr><td>
1927 <tr><td>
1928 <a href="/help/bundlespec">
1928 <a href="/help/bundlespec">
1929 bundlespec
1929 bundlespec
1930 </a>
1930 </a>
1931 </td><td>
1931 </td><td>
1932 Bundle File Formats
1932 Bundle File Formats
1933 </td></tr>
1933 </td></tr>
1934 <tr><td>
1934 <tr><td>
1935 <a href="/help/color">
1935 <a href="/help/color">
1936 color
1936 color
1937 </a>
1937 </a>
1938 </td><td>
1938 </td><td>
1939 Colorizing Outputs
1939 Colorizing Outputs
1940 </td></tr>
1940 </td></tr>
1941 <tr><td>
1941 <tr><td>
1942 <a href="/help/config">
1942 <a href="/help/config">
1943 config
1943 config
1944 </a>
1944 </a>
1945 </td><td>
1945 </td><td>
1946 Configuration Files
1946 Configuration Files
1947 </td></tr>
1947 </td></tr>
1948 <tr><td>
1948 <tr><td>
1949 <a href="/help/dates">
1949 <a href="/help/dates">
1950 dates
1950 dates
1951 </a>
1951 </a>
1952 </td><td>
1952 </td><td>
1953 Date Formats
1953 Date Formats
1954 </td></tr>
1954 </td></tr>
1955 <tr><td>
1955 <tr><td>
1956 <a href="/help/diffs">
1956 <a href="/help/diffs">
1957 diffs
1957 diffs
1958 </a>
1958 </a>
1959 </td><td>
1959 </td><td>
1960 Diff Formats
1960 Diff Formats
1961 </td></tr>
1961 </td></tr>
1962 <tr><td>
1962 <tr><td>
1963 <a href="/help/environment">
1963 <a href="/help/environment">
1964 environment
1964 environment
1965 </a>
1965 </a>
1966 </td><td>
1966 </td><td>
1967 Environment Variables
1967 Environment Variables
1968 </td></tr>
1968 </td></tr>
1969 <tr><td>
1969 <tr><td>
1970 <a href="/help/extensions">
1970 <a href="/help/extensions">
1971 extensions
1971 extensions
1972 </a>
1972 </a>
1973 </td><td>
1973 </td><td>
1974 Using Additional Features
1974 Using Additional Features
1975 </td></tr>
1975 </td></tr>
1976 <tr><td>
1976 <tr><td>
1977 <a href="/help/filesets">
1977 <a href="/help/filesets">
1978 filesets
1978 filesets
1979 </a>
1979 </a>
1980 </td><td>
1980 </td><td>
1981 Specifying File Sets
1981 Specifying File Sets
1982 </td></tr>
1982 </td></tr>
1983 <tr><td>
1983 <tr><td>
1984 <a href="/help/glossary">
1984 <a href="/help/glossary">
1985 glossary
1985 glossary
1986 </a>
1986 </a>
1987 </td><td>
1987 </td><td>
1988 Glossary
1988 Glossary
1989 </td></tr>
1989 </td></tr>
1990 <tr><td>
1990 <tr><td>
1991 <a href="/help/hgignore">
1991 <a href="/help/hgignore">
1992 hgignore
1992 hgignore
1993 </a>
1993 </a>
1994 </td><td>
1994 </td><td>
1995 Syntax for Mercurial Ignore Files
1995 Syntax for Mercurial Ignore Files
1996 </td></tr>
1996 </td></tr>
1997 <tr><td>
1997 <tr><td>
1998 <a href="/help/hgweb">
1998 <a href="/help/hgweb">
1999 hgweb
1999 hgweb
2000 </a>
2000 </a>
2001 </td><td>
2001 </td><td>
2002 Configuring hgweb
2002 Configuring hgweb
2003 </td></tr>
2003 </td></tr>
2004 <tr><td>
2004 <tr><td>
2005 <a href="/help/internals">
2005 <a href="/help/internals">
2006 internals
2006 internals
2007 </a>
2007 </a>
2008 </td><td>
2008 </td><td>
2009 Technical implementation topics
2009 Technical implementation topics
2010 </td></tr>
2010 </td></tr>
2011 <tr><td>
2011 <tr><td>
2012 <a href="/help/merge-tools">
2012 <a href="/help/merge-tools">
2013 merge-tools
2013 merge-tools
2014 </a>
2014 </a>
2015 </td><td>
2015 </td><td>
2016 Merge Tools
2016 Merge Tools
2017 </td></tr>
2017 </td></tr>
2018 <tr><td>
2018 <tr><td>
2019 <a href="/help/pager">
2019 <a href="/help/pager">
2020 pager
2020 pager
2021 </a>
2021 </a>
2022 </td><td>
2022 </td><td>
2023 Pager Support
2023 Pager Support
2024 </td></tr>
2024 </td></tr>
2025 <tr><td>
2025 <tr><td>
2026 <a href="/help/patterns">
2026 <a href="/help/patterns">
2027 patterns
2027 patterns
2028 </a>
2028 </a>
2029 </td><td>
2029 </td><td>
2030 File Name Patterns
2030 File Name Patterns
2031 </td></tr>
2031 </td></tr>
2032 <tr><td>
2032 <tr><td>
2033 <a href="/help/phases">
2033 <a href="/help/phases">
2034 phases
2034 phases
2035 </a>
2035 </a>
2036 </td><td>
2036 </td><td>
2037 Working with Phases
2037 Working with Phases
2038 </td></tr>
2038 </td></tr>
2039 <tr><td>
2039 <tr><td>
2040 <a href="/help/revisions">
2040 <a href="/help/revisions">
2041 revisions
2041 revisions
2042 </a>
2042 </a>
2043 </td><td>
2043 </td><td>
2044 Specifying Revisions
2044 Specifying Revisions
2045 </td></tr>
2045 </td></tr>
2046 <tr><td>
2046 <tr><td>
2047 <a href="/help/scripting">
2047 <a href="/help/scripting">
2048 scripting
2048 scripting
2049 </a>
2049 </a>
2050 </td><td>
2050 </td><td>
2051 Using Mercurial from scripts and automation
2051 Using Mercurial from scripts and automation
2052 </td></tr>
2052 </td></tr>
2053 <tr><td>
2053 <tr><td>
2054 <a href="/help/subrepos">
2054 <a href="/help/subrepos">
2055 subrepos
2055 subrepos
2056 </a>
2056 </a>
2057 </td><td>
2057 </td><td>
2058 Subrepositories
2058 Subrepositories
2059 </td></tr>
2059 </td></tr>
2060 <tr><td>
2060 <tr><td>
2061 <a href="/help/templating">
2061 <a href="/help/templating">
2062 templating
2062 templating
2063 </a>
2063 </a>
2064 </td><td>
2064 </td><td>
2065 Template Usage
2065 Template Usage
2066 </td></tr>
2066 </td></tr>
2067 <tr><td>
2067 <tr><td>
2068 <a href="/help/urls">
2068 <a href="/help/urls">
2069 urls
2069 urls
2070 </a>
2070 </a>
2071 </td><td>
2071 </td><td>
2072 URL Paths
2072 URL Paths
2073 </td></tr>
2073 </td></tr>
2074 <tr><td>
2074 <tr><td>
2075 <a href="/help/topic-containing-verbose">
2075 <a href="/help/topic-containing-verbose">
2076 topic-containing-verbose
2076 topic-containing-verbose
2077 </a>
2077 </a>
2078 </td><td>
2078 </td><td>
2079 This is the topic to test omit indicating.
2079 This is the topic to test omit indicating.
2080 </td></tr>
2080 </td></tr>
2081
2081
2082
2082
2083 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2083 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2084
2084
2085 <tr><td>
2085 <tr><td>
2086 <a href="/help/add">
2086 <a href="/help/add">
2087 add
2087 add
2088 </a>
2088 </a>
2089 </td><td>
2089 </td><td>
2090 add the specified files on the next commit
2090 add the specified files on the next commit
2091 </td></tr>
2091 </td></tr>
2092 <tr><td>
2092 <tr><td>
2093 <a href="/help/annotate">
2093 <a href="/help/annotate">
2094 annotate
2094 annotate
2095 </a>
2095 </a>
2096 </td><td>
2096 </td><td>
2097 show changeset information by line for each file
2097 show changeset information by line for each file
2098 </td></tr>
2098 </td></tr>
2099 <tr><td>
2099 <tr><td>
2100 <a href="/help/clone">
2100 <a href="/help/clone">
2101 clone
2101 clone
2102 </a>
2102 </a>
2103 </td><td>
2103 </td><td>
2104 make a copy of an existing repository
2104 make a copy of an existing repository
2105 </td></tr>
2105 </td></tr>
2106 <tr><td>
2106 <tr><td>
2107 <a href="/help/commit">
2107 <a href="/help/commit">
2108 commit
2108 commit
2109 </a>
2109 </a>
2110 </td><td>
2110 </td><td>
2111 commit the specified files or all outstanding changes
2111 commit the specified files or all outstanding changes
2112 </td></tr>
2112 </td></tr>
2113 <tr><td>
2113 <tr><td>
2114 <a href="/help/diff">
2114 <a href="/help/diff">
2115 diff
2115 diff
2116 </a>
2116 </a>
2117 </td><td>
2117 </td><td>
2118 diff repository (or selected files)
2118 diff repository (or selected files)
2119 </td></tr>
2119 </td></tr>
2120 <tr><td>
2120 <tr><td>
2121 <a href="/help/export">
2121 <a href="/help/export">
2122 export
2122 export
2123 </a>
2123 </a>
2124 </td><td>
2124 </td><td>
2125 dump the header and diffs for one or more changesets
2125 dump the header and diffs for one or more changesets
2126 </td></tr>
2126 </td></tr>
2127 <tr><td>
2127 <tr><td>
2128 <a href="/help/forget">
2128 <a href="/help/forget">
2129 forget
2129 forget
2130 </a>
2130 </a>
2131 </td><td>
2131 </td><td>
2132 forget the specified files on the next commit
2132 forget the specified files on the next commit
2133 </td></tr>
2133 </td></tr>
2134 <tr><td>
2134 <tr><td>
2135 <a href="/help/init">
2135 <a href="/help/init">
2136 init
2136 init
2137 </a>
2137 </a>
2138 </td><td>
2138 </td><td>
2139 create a new repository in the given directory
2139 create a new repository in the given directory
2140 </td></tr>
2140 </td></tr>
2141 <tr><td>
2141 <tr><td>
2142 <a href="/help/log">
2142 <a href="/help/log">
2143 log
2143 log
2144 </a>
2144 </a>
2145 </td><td>
2145 </td><td>
2146 show revision history of entire repository or files
2146 show revision history of entire repository or files
2147 </td></tr>
2147 </td></tr>
2148 <tr><td>
2148 <tr><td>
2149 <a href="/help/merge">
2149 <a href="/help/merge">
2150 merge
2150 merge
2151 </a>
2151 </a>
2152 </td><td>
2152 </td><td>
2153 merge another revision into working directory
2153 merge another revision into working directory
2154 </td></tr>
2154 </td></tr>
2155 <tr><td>
2155 <tr><td>
2156 <a href="/help/pull">
2156 <a href="/help/pull">
2157 pull
2157 pull
2158 </a>
2158 </a>
2159 </td><td>
2159 </td><td>
2160 pull changes from the specified source
2160 pull changes from the specified source
2161 </td></tr>
2161 </td></tr>
2162 <tr><td>
2162 <tr><td>
2163 <a href="/help/push">
2163 <a href="/help/push">
2164 push
2164 push
2165 </a>
2165 </a>
2166 </td><td>
2166 </td><td>
2167 push changes to the specified destination
2167 push changes to the specified destination
2168 </td></tr>
2168 </td></tr>
2169 <tr><td>
2169 <tr><td>
2170 <a href="/help/remove">
2170 <a href="/help/remove">
2171 remove
2171 remove
2172 </a>
2172 </a>
2173 </td><td>
2173 </td><td>
2174 remove the specified files on the next commit
2174 remove the specified files on the next commit
2175 </td></tr>
2175 </td></tr>
2176 <tr><td>
2176 <tr><td>
2177 <a href="/help/serve">
2177 <a href="/help/serve">
2178 serve
2178 serve
2179 </a>
2179 </a>
2180 </td><td>
2180 </td><td>
2181 start stand-alone webserver
2181 start stand-alone webserver
2182 </td></tr>
2182 </td></tr>
2183 <tr><td>
2183 <tr><td>
2184 <a href="/help/status">
2184 <a href="/help/status">
2185 status
2185 status
2186 </a>
2186 </a>
2187 </td><td>
2187 </td><td>
2188 show changed files in the working directory
2188 show changed files in the working directory
2189 </td></tr>
2189 </td></tr>
2190 <tr><td>
2190 <tr><td>
2191 <a href="/help/summary">
2191 <a href="/help/summary">
2192 summary
2192 summary
2193 </a>
2193 </a>
2194 </td><td>
2194 </td><td>
2195 summarize working directory state
2195 summarize working directory state
2196 </td></tr>
2196 </td></tr>
2197 <tr><td>
2197 <tr><td>
2198 <a href="/help/update">
2198 <a href="/help/update">
2199 update
2199 update
2200 </a>
2200 </a>
2201 </td><td>
2201 </td><td>
2202 update working directory (or switch revisions)
2202 update working directory (or switch revisions)
2203 </td></tr>
2203 </td></tr>
2204
2204
2205
2205
2206
2206
2207 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2207 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2208
2208
2209 <tr><td>
2209 <tr><td>
2210 <a href="/help/addremove">
2210 <a href="/help/addremove">
2211 addremove
2211 addremove
2212 </a>
2212 </a>
2213 </td><td>
2213 </td><td>
2214 add all new files, delete all missing files
2214 add all new files, delete all missing files
2215 </td></tr>
2215 </td></tr>
2216 <tr><td>
2216 <tr><td>
2217 <a href="/help/archive">
2217 <a href="/help/archive">
2218 archive
2218 archive
2219 </a>
2219 </a>
2220 </td><td>
2220 </td><td>
2221 create an unversioned archive of a repository revision
2221 create an unversioned archive of a repository revision
2222 </td></tr>
2222 </td></tr>
2223 <tr><td>
2223 <tr><td>
2224 <a href="/help/backout">
2224 <a href="/help/backout">
2225 backout
2225 backout
2226 </a>
2226 </a>
2227 </td><td>
2227 </td><td>
2228 reverse effect of earlier changeset
2228 reverse effect of earlier changeset
2229 </td></tr>
2229 </td></tr>
2230 <tr><td>
2230 <tr><td>
2231 <a href="/help/bisect">
2231 <a href="/help/bisect">
2232 bisect
2232 bisect
2233 </a>
2233 </a>
2234 </td><td>
2234 </td><td>
2235 subdivision search of changesets
2235 subdivision search of changesets
2236 </td></tr>
2236 </td></tr>
2237 <tr><td>
2237 <tr><td>
2238 <a href="/help/bookmarks">
2238 <a href="/help/bookmarks">
2239 bookmarks
2239 bookmarks
2240 </a>
2240 </a>
2241 </td><td>
2241 </td><td>
2242 create a new bookmark or list existing bookmarks
2242 create a new bookmark or list existing bookmarks
2243 </td></tr>
2243 </td></tr>
2244 <tr><td>
2244 <tr><td>
2245 <a href="/help/branch">
2245 <a href="/help/branch">
2246 branch
2246 branch
2247 </a>
2247 </a>
2248 </td><td>
2248 </td><td>
2249 set or show the current branch name
2249 set or show the current branch name
2250 </td></tr>
2250 </td></tr>
2251 <tr><td>
2251 <tr><td>
2252 <a href="/help/branches">
2252 <a href="/help/branches">
2253 branches
2253 branches
2254 </a>
2254 </a>
2255 </td><td>
2255 </td><td>
2256 list repository named branches
2256 list repository named branches
2257 </td></tr>
2257 </td></tr>
2258 <tr><td>
2258 <tr><td>
2259 <a href="/help/bundle">
2259 <a href="/help/bundle">
2260 bundle
2260 bundle
2261 </a>
2261 </a>
2262 </td><td>
2262 </td><td>
2263 create a bundle file
2263 create a bundle file
2264 </td></tr>
2264 </td></tr>
2265 <tr><td>
2265 <tr><td>
2266 <a href="/help/cat">
2266 <a href="/help/cat">
2267 cat
2267 cat
2268 </a>
2268 </a>
2269 </td><td>
2269 </td><td>
2270 output the current or given revision of files
2270 output the current or given revision of files
2271 </td></tr>
2271 </td></tr>
2272 <tr><td>
2272 <tr><td>
2273 <a href="/help/config">
2273 <a href="/help/config">
2274 config
2274 config
2275 </a>
2275 </a>
2276 </td><td>
2276 </td><td>
2277 show combined config settings from all hgrc files
2277 show combined config settings from all hgrc files
2278 </td></tr>
2278 </td></tr>
2279 <tr><td>
2279 <tr><td>
2280 <a href="/help/copy">
2280 <a href="/help/copy">
2281 copy
2281 copy
2282 </a>
2282 </a>
2283 </td><td>
2283 </td><td>
2284 mark files as copied for the next commit
2284 mark files as copied for the next commit
2285 </td></tr>
2285 </td></tr>
2286 <tr><td>
2286 <tr><td>
2287 <a href="/help/files">
2287 <a href="/help/files">
2288 files
2288 files
2289 </a>
2289 </a>
2290 </td><td>
2290 </td><td>
2291 list tracked files
2291 list tracked files
2292 </td></tr>
2292 </td></tr>
2293 <tr><td>
2293 <tr><td>
2294 <a href="/help/graft">
2294 <a href="/help/graft">
2295 graft
2295 graft
2296 </a>
2296 </a>
2297 </td><td>
2297 </td><td>
2298 copy changes from other branches onto the current branch
2298 copy changes from other branches onto the current branch
2299 </td></tr>
2299 </td></tr>
2300 <tr><td>
2300 <tr><td>
2301 <a href="/help/grep">
2301 <a href="/help/grep">
2302 grep
2302 grep
2303 </a>
2303 </a>
2304 </td><td>
2304 </td><td>
2305 search revision history for a pattern in specified files
2305 search revision history for a pattern in specified files
2306 </td></tr>
2306 </td></tr>
2307 <tr><td>
2307 <tr><td>
2308 <a href="/help/heads">
2308 <a href="/help/heads">
2309 heads
2309 heads
2310 </a>
2310 </a>
2311 </td><td>
2311 </td><td>
2312 show branch heads
2312 show branch heads
2313 </td></tr>
2313 </td></tr>
2314 <tr><td>
2314 <tr><td>
2315 <a href="/help/help">
2315 <a href="/help/help">
2316 help
2316 help
2317 </a>
2317 </a>
2318 </td><td>
2318 </td><td>
2319 show help for a given topic or a help overview
2319 show help for a given topic or a help overview
2320 </td></tr>
2320 </td></tr>
2321 <tr><td>
2321 <tr><td>
2322 <a href="/help/hgalias">
2322 <a href="/help/hgalias">
2323 hgalias
2323 hgalias
2324 </a>
2324 </a>
2325 </td><td>
2325 </td><td>
2326 summarize working directory state
2326 summarize working directory state
2327 </td></tr>
2327 </td></tr>
2328 <tr><td>
2328 <tr><td>
2329 <a href="/help/identify">
2329 <a href="/help/identify">
2330 identify
2330 identify
2331 </a>
2331 </a>
2332 </td><td>
2332 </td><td>
2333 identify the working directory or specified revision
2333 identify the working directory or specified revision
2334 </td></tr>
2334 </td></tr>
2335 <tr><td>
2335 <tr><td>
2336 <a href="/help/import">
2336 <a href="/help/import">
2337 import
2337 import
2338 </a>
2338 </a>
2339 </td><td>
2339 </td><td>
2340 import an ordered set of patches
2340 import an ordered set of patches
2341 </td></tr>
2341 </td></tr>
2342 <tr><td>
2342 <tr><td>
2343 <a href="/help/incoming">
2343 <a href="/help/incoming">
2344 incoming
2344 incoming
2345 </a>
2345 </a>
2346 </td><td>
2346 </td><td>
2347 show new changesets found in source
2347 show new changesets found in source
2348 </td></tr>
2348 </td></tr>
2349 <tr><td>
2349 <tr><td>
2350 <a href="/help/manifest">
2350 <a href="/help/manifest">
2351 manifest
2351 manifest
2352 </a>
2352 </a>
2353 </td><td>
2353 </td><td>
2354 output the current or given revision of the project manifest
2354 output the current or given revision of the project manifest
2355 </td></tr>
2355 </td></tr>
2356 <tr><td>
2356 <tr><td>
2357 <a href="/help/nohelp">
2357 <a href="/help/nohelp">
2358 nohelp
2358 nohelp
2359 </a>
2359 </a>
2360 </td><td>
2360 </td><td>
2361 (no help text available)
2361 (no help text available)
2362 </td></tr>
2362 </td></tr>
2363 <tr><td>
2363 <tr><td>
2364 <a href="/help/outgoing">
2364 <a href="/help/outgoing">
2365 outgoing
2365 outgoing
2366 </a>
2366 </a>
2367 </td><td>
2367 </td><td>
2368 show changesets not found in the destination
2368 show changesets not found in the destination
2369 </td></tr>
2369 </td></tr>
2370 <tr><td>
2370 <tr><td>
2371 <a href="/help/paths">
2371 <a href="/help/paths">
2372 paths
2372 paths
2373 </a>
2373 </a>
2374 </td><td>
2374 </td><td>
2375 show aliases for remote repositories
2375 show aliases for remote repositories
2376 </td></tr>
2376 </td></tr>
2377 <tr><td>
2377 <tr><td>
2378 <a href="/help/phase">
2378 <a href="/help/phase">
2379 phase
2379 phase
2380 </a>
2380 </a>
2381 </td><td>
2381 </td><td>
2382 set or show the current phase name
2382 set or show the current phase name
2383 </td></tr>
2383 </td></tr>
2384 <tr><td>
2384 <tr><td>
2385 <a href="/help/recover">
2385 <a href="/help/recover">
2386 recover
2386 recover
2387 </a>
2387 </a>
2388 </td><td>
2388 </td><td>
2389 roll back an interrupted transaction
2389 roll back an interrupted transaction
2390 </td></tr>
2390 </td></tr>
2391 <tr><td>
2391 <tr><td>
2392 <a href="/help/rename">
2392 <a href="/help/rename">
2393 rename
2393 rename
2394 </a>
2394 </a>
2395 </td><td>
2395 </td><td>
2396 rename files; equivalent of copy + remove
2396 rename files; equivalent of copy + remove
2397 </td></tr>
2397 </td></tr>
2398 <tr><td>
2398 <tr><td>
2399 <a href="/help/resolve">
2399 <a href="/help/resolve">
2400 resolve
2400 resolve
2401 </a>
2401 </a>
2402 </td><td>
2402 </td><td>
2403 redo merges or set/view the merge status of files
2403 redo merges or set/view the merge status of files
2404 </td></tr>
2404 </td></tr>
2405 <tr><td>
2405 <tr><td>
2406 <a href="/help/revert">
2406 <a href="/help/revert">
2407 revert
2407 revert
2408 </a>
2408 </a>
2409 </td><td>
2409 </td><td>
2410 restore files to their checkout state
2410 restore files to their checkout state
2411 </td></tr>
2411 </td></tr>
2412 <tr><td>
2412 <tr><td>
2413 <a href="/help/root">
2413 <a href="/help/root">
2414 root
2414 root
2415 </a>
2415 </a>
2416 </td><td>
2416 </td><td>
2417 print the root (top) of the current working directory
2417 print the root (top) of the current working directory
2418 </td></tr>
2418 </td></tr>
2419 <tr><td>
2419 <tr><td>
2420 <a href="/help/shellalias">
2420 <a href="/help/shellalias">
2421 shellalias
2421 shellalias
2422 </a>
2422 </a>
2423 </td><td>
2423 </td><td>
2424 (no help text available)
2424 (no help text available)
2425 </td></tr>
2425 </td></tr>
2426 <tr><td>
2426 <tr><td>
2427 <a href="/help/tag">
2427 <a href="/help/tag">
2428 tag
2428 tag
2429 </a>
2429 </a>
2430 </td><td>
2430 </td><td>
2431 add one or more tags for the current or given revision
2431 add one or more tags for the current or given revision
2432 </td></tr>
2432 </td></tr>
2433 <tr><td>
2433 <tr><td>
2434 <a href="/help/tags">
2434 <a href="/help/tags">
2435 tags
2435 tags
2436 </a>
2436 </a>
2437 </td><td>
2437 </td><td>
2438 list repository tags
2438 list repository tags
2439 </td></tr>
2439 </td></tr>
2440 <tr><td>
2440 <tr><td>
2441 <a href="/help/unbundle">
2441 <a href="/help/unbundle">
2442 unbundle
2442 unbundle
2443 </a>
2443 </a>
2444 </td><td>
2444 </td><td>
2445 apply one or more bundle files
2445 apply one or more bundle files
2446 </td></tr>
2446 </td></tr>
2447 <tr><td>
2447 <tr><td>
2448 <a href="/help/verify">
2448 <a href="/help/verify">
2449 verify
2449 verify
2450 </a>
2450 </a>
2451 </td><td>
2451 </td><td>
2452 verify the integrity of the repository
2452 verify the integrity of the repository
2453 </td></tr>
2453 </td></tr>
2454 <tr><td>
2454 <tr><td>
2455 <a href="/help/version">
2455 <a href="/help/version">
2456 version
2456 version
2457 </a>
2457 </a>
2458 </td><td>
2458 </td><td>
2459 output version and copyright information
2459 output version and copyright information
2460 </td></tr>
2460 </td></tr>
2461
2461
2462
2462
2463 </table>
2463 </table>
2464 </div>
2464 </div>
2465 </div>
2465 </div>
2466
2466
2467
2467
2468
2468
2469 </body>
2469 </body>
2470 </html>
2470 </html>
2471
2471
2472
2472
2473 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2473 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2474 200 Script output follows
2474 200 Script output follows
2475
2475
2476 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2476 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2477 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2477 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2478 <head>
2478 <head>
2479 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2479 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2480 <meta name="robots" content="index, nofollow" />
2480 <meta name="robots" content="index, nofollow" />
2481 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2481 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2482 <script type="text/javascript" src="/static/mercurial.js"></script>
2482 <script type="text/javascript" src="/static/mercurial.js"></script>
2483
2483
2484 <title>Help: add</title>
2484 <title>Help: add</title>
2485 </head>
2485 </head>
2486 <body>
2486 <body>
2487
2487
2488 <div class="container">
2488 <div class="container">
2489 <div class="menu">
2489 <div class="menu">
2490 <div class="logo">
2490 <div class="logo">
2491 <a href="https://mercurial-scm.org/">
2491 <a href="https://mercurial-scm.org/">
2492 <img src="/static/hglogo.png" alt="mercurial" /></a>
2492 <img src="/static/hglogo.png" alt="mercurial" /></a>
2493 </div>
2493 </div>
2494 <ul>
2494 <ul>
2495 <li><a href="/shortlog">log</a></li>
2495 <li><a href="/shortlog">log</a></li>
2496 <li><a href="/graph">graph</a></li>
2496 <li><a href="/graph">graph</a></li>
2497 <li><a href="/tags">tags</a></li>
2497 <li><a href="/tags">tags</a></li>
2498 <li><a href="/bookmarks">bookmarks</a></li>
2498 <li><a href="/bookmarks">bookmarks</a></li>
2499 <li><a href="/branches">branches</a></li>
2499 <li><a href="/branches">branches</a></li>
2500 </ul>
2500 </ul>
2501 <ul>
2501 <ul>
2502 <li class="active"><a href="/help">help</a></li>
2502 <li class="active"><a href="/help">help</a></li>
2503 </ul>
2503 </ul>
2504 </div>
2504 </div>
2505
2505
2506 <div class="main">
2506 <div class="main">
2507 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2507 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2508 <h3>Help: add</h3>
2508 <h3>Help: add</h3>
2509
2509
2510 <form class="search" action="/log">
2510 <form class="search" action="/log">
2511
2511
2512 <p><input name="rev" id="search1" type="text" size="30" /></p>
2512 <p><input name="rev" id="search1" type="text" size="30" /></p>
2513 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2513 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2514 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2514 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2515 </form>
2515 </form>
2516 <div id="doc">
2516 <div id="doc">
2517 <p>
2517 <p>
2518 hg add [OPTION]... [FILE]...
2518 hg add [OPTION]... [FILE]...
2519 </p>
2519 </p>
2520 <p>
2520 <p>
2521 add the specified files on the next commit
2521 add the specified files on the next commit
2522 </p>
2522 </p>
2523 <p>
2523 <p>
2524 Schedule files to be version controlled and added to the
2524 Schedule files to be version controlled and added to the
2525 repository.
2525 repository.
2526 </p>
2526 </p>
2527 <p>
2527 <p>
2528 The files will be added to the repository at the next commit. To
2528 The files will be added to the repository at the next commit. To
2529 undo an add before that, see 'hg forget'.
2529 undo an add before that, see 'hg forget'.
2530 </p>
2530 </p>
2531 <p>
2531 <p>
2532 If no names are given, add all files to the repository (except
2532 If no names are given, add all files to the repository (except
2533 files matching &quot;.hgignore&quot;).
2533 files matching &quot;.hgignore&quot;).
2534 </p>
2534 </p>
2535 <p>
2535 <p>
2536 Examples:
2536 Examples:
2537 </p>
2537 </p>
2538 <ul>
2538 <ul>
2539 <li> New (unknown) files are added automatically by 'hg add':
2539 <li> New (unknown) files are added automatically by 'hg add':
2540 <pre>
2540 <pre>
2541 \$ ls (re)
2541 \$ ls (re)
2542 foo.c
2542 foo.c
2543 \$ hg status (re)
2543 \$ hg status (re)
2544 ? foo.c
2544 ? foo.c
2545 \$ hg add (re)
2545 \$ hg add (re)
2546 adding foo.c
2546 adding foo.c
2547 \$ hg status (re)
2547 \$ hg status (re)
2548 A foo.c
2548 A foo.c
2549 </pre>
2549 </pre>
2550 <li> Specific files to be added can be specified:
2550 <li> Specific files to be added can be specified:
2551 <pre>
2551 <pre>
2552 \$ ls (re)
2552 \$ ls (re)
2553 bar.c foo.c
2553 bar.c foo.c
2554 \$ hg status (re)
2554 \$ hg status (re)
2555 ? bar.c
2555 ? bar.c
2556 ? foo.c
2556 ? foo.c
2557 \$ hg add bar.c (re)
2557 \$ hg add bar.c (re)
2558 \$ hg status (re)
2558 \$ hg status (re)
2559 A bar.c
2559 A bar.c
2560 ? foo.c
2560 ? foo.c
2561 </pre>
2561 </pre>
2562 </ul>
2562 </ul>
2563 <p>
2563 <p>
2564 Returns 0 if all files are successfully added.
2564 Returns 0 if all files are successfully added.
2565 </p>
2565 </p>
2566 <p>
2566 <p>
2567 options ([+] can be repeated):
2567 options ([+] can be repeated):
2568 </p>
2568 </p>
2569 <table>
2569 <table>
2570 <tr><td>-I</td>
2570 <tr><td>-I</td>
2571 <td>--include PATTERN [+]</td>
2571 <td>--include PATTERN [+]</td>
2572 <td>include names matching the given patterns</td></tr>
2572 <td>include names matching the given patterns</td></tr>
2573 <tr><td>-X</td>
2573 <tr><td>-X</td>
2574 <td>--exclude PATTERN [+]</td>
2574 <td>--exclude PATTERN [+]</td>
2575 <td>exclude names matching the given patterns</td></tr>
2575 <td>exclude names matching the given patterns</td></tr>
2576 <tr><td>-S</td>
2576 <tr><td>-S</td>
2577 <td>--subrepos</td>
2577 <td>--subrepos</td>
2578 <td>recurse into subrepositories</td></tr>
2578 <td>recurse into subrepositories</td></tr>
2579 <tr><td>-n</td>
2579 <tr><td>-n</td>
2580 <td>--dry-run</td>
2580 <td>--dry-run</td>
2581 <td>do not perform actions, just print output</td></tr>
2581 <td>do not perform actions, just print output</td></tr>
2582 </table>
2582 </table>
2583 <p>
2583 <p>
2584 global options ([+] can be repeated):
2584 global options ([+] can be repeated):
2585 </p>
2585 </p>
2586 <table>
2586 <table>
2587 <tr><td>-R</td>
2587 <tr><td>-R</td>
2588 <td>--repository REPO</td>
2588 <td>--repository REPO</td>
2589 <td>repository root directory or name of overlay bundle file</td></tr>
2589 <td>repository root directory or name of overlay bundle file</td></tr>
2590 <tr><td></td>
2590 <tr><td></td>
2591 <td>--cwd DIR</td>
2591 <td>--cwd DIR</td>
2592 <td>change working directory</td></tr>
2592 <td>change working directory</td></tr>
2593 <tr><td>-y</td>
2593 <tr><td>-y</td>
2594 <td>--noninteractive</td>
2594 <td>--noninteractive</td>
2595 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2595 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2596 <tr><td>-q</td>
2596 <tr><td>-q</td>
2597 <td>--quiet</td>
2597 <td>--quiet</td>
2598 <td>suppress output</td></tr>
2598 <td>suppress output</td></tr>
2599 <tr><td>-v</td>
2599 <tr><td>-v</td>
2600 <td>--verbose</td>
2600 <td>--verbose</td>
2601 <td>enable additional output</td></tr>
2601 <td>enable additional output</td></tr>
2602 <tr><td></td>
2602 <tr><td></td>
2603 <td>--color TYPE</td>
2603 <td>--color TYPE</td>
2604 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2604 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2605 <tr><td></td>
2605 <tr><td></td>
2606 <td>--config CONFIG [+]</td>
2606 <td>--config CONFIG [+]</td>
2607 <td>set/override config option (use 'section.name=value')</td></tr>
2607 <td>set/override config option (use 'section.name=value')</td></tr>
2608 <tr><td></td>
2608 <tr><td></td>
2609 <td>--debug</td>
2609 <td>--debug</td>
2610 <td>enable debugging output</td></tr>
2610 <td>enable debugging output</td></tr>
2611 <tr><td></td>
2611 <tr><td></td>
2612 <td>--debugger</td>
2612 <td>--debugger</td>
2613 <td>start debugger</td></tr>
2613 <td>start debugger</td></tr>
2614 <tr><td></td>
2614 <tr><td></td>
2615 <td>--encoding ENCODE</td>
2615 <td>--encoding ENCODE</td>
2616 <td>set the charset encoding (default: ascii)</td></tr>
2616 <td>set the charset encoding (default: ascii)</td></tr>
2617 <tr><td></td>
2617 <tr><td></td>
2618 <td>--encodingmode MODE</td>
2618 <td>--encodingmode MODE</td>
2619 <td>set the charset encoding mode (default: strict)</td></tr>
2619 <td>set the charset encoding mode (default: strict)</td></tr>
2620 <tr><td></td>
2620 <tr><td></td>
2621 <td>--traceback</td>
2621 <td>--traceback</td>
2622 <td>always print a traceback on exception</td></tr>
2622 <td>always print a traceback on exception</td></tr>
2623 <tr><td></td>
2623 <tr><td></td>
2624 <td>--time</td>
2624 <td>--time</td>
2625 <td>time how long the command takes</td></tr>
2625 <td>time how long the command takes</td></tr>
2626 <tr><td></td>
2626 <tr><td></td>
2627 <td>--profile</td>
2627 <td>--profile</td>
2628 <td>print command execution profile</td></tr>
2628 <td>print command execution profile</td></tr>
2629 <tr><td></td>
2629 <tr><td></td>
2630 <td>--version</td>
2630 <td>--version</td>
2631 <td>output version information and exit</td></tr>
2631 <td>output version information and exit</td></tr>
2632 <tr><td>-h</td>
2632 <tr><td>-h</td>
2633 <td>--help</td>
2633 <td>--help</td>
2634 <td>display help and exit</td></tr>
2634 <td>display help and exit</td></tr>
2635 <tr><td></td>
2635 <tr><td></td>
2636 <td>--hidden</td>
2636 <td>--hidden</td>
2637 <td>consider hidden changesets</td></tr>
2637 <td>consider hidden changesets</td></tr>
2638 <tr><td></td>
2638 <tr><td></td>
2639 <td>--pager TYPE</td>
2639 <td>--pager TYPE</td>
2640 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2640 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2641 </table>
2641 </table>
2642
2642
2643 </div>
2643 </div>
2644 </div>
2644 </div>
2645 </div>
2645 </div>
2646
2646
2647
2647
2648
2648
2649 </body>
2649 </body>
2650 </html>
2650 </html>
2651
2651
2652
2652
2653 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2653 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2654 200 Script output follows
2654 200 Script output follows
2655
2655
2656 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2656 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2657 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2657 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2658 <head>
2658 <head>
2659 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2659 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2660 <meta name="robots" content="index, nofollow" />
2660 <meta name="robots" content="index, nofollow" />
2661 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2661 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2662 <script type="text/javascript" src="/static/mercurial.js"></script>
2662 <script type="text/javascript" src="/static/mercurial.js"></script>
2663
2663
2664 <title>Help: remove</title>
2664 <title>Help: remove</title>
2665 </head>
2665 </head>
2666 <body>
2666 <body>
2667
2667
2668 <div class="container">
2668 <div class="container">
2669 <div class="menu">
2669 <div class="menu">
2670 <div class="logo">
2670 <div class="logo">
2671 <a href="https://mercurial-scm.org/">
2671 <a href="https://mercurial-scm.org/">
2672 <img src="/static/hglogo.png" alt="mercurial" /></a>
2672 <img src="/static/hglogo.png" alt="mercurial" /></a>
2673 </div>
2673 </div>
2674 <ul>
2674 <ul>
2675 <li><a href="/shortlog">log</a></li>
2675 <li><a href="/shortlog">log</a></li>
2676 <li><a href="/graph">graph</a></li>
2676 <li><a href="/graph">graph</a></li>
2677 <li><a href="/tags">tags</a></li>
2677 <li><a href="/tags">tags</a></li>
2678 <li><a href="/bookmarks">bookmarks</a></li>
2678 <li><a href="/bookmarks">bookmarks</a></li>
2679 <li><a href="/branches">branches</a></li>
2679 <li><a href="/branches">branches</a></li>
2680 </ul>
2680 </ul>
2681 <ul>
2681 <ul>
2682 <li class="active"><a href="/help">help</a></li>
2682 <li class="active"><a href="/help">help</a></li>
2683 </ul>
2683 </ul>
2684 </div>
2684 </div>
2685
2685
2686 <div class="main">
2686 <div class="main">
2687 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2687 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2688 <h3>Help: remove</h3>
2688 <h3>Help: remove</h3>
2689
2689
2690 <form class="search" action="/log">
2690 <form class="search" action="/log">
2691
2691
2692 <p><input name="rev" id="search1" type="text" size="30" /></p>
2692 <p><input name="rev" id="search1" type="text" size="30" /></p>
2693 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2693 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2694 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2694 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2695 </form>
2695 </form>
2696 <div id="doc">
2696 <div id="doc">
2697 <p>
2697 <p>
2698 hg remove [OPTION]... FILE...
2698 hg remove [OPTION]... FILE...
2699 </p>
2699 </p>
2700 <p>
2700 <p>
2701 aliases: rm
2701 aliases: rm
2702 </p>
2702 </p>
2703 <p>
2703 <p>
2704 remove the specified files on the next commit
2704 remove the specified files on the next commit
2705 </p>
2705 </p>
2706 <p>
2706 <p>
2707 Schedule the indicated files for removal from the current branch.
2707 Schedule the indicated files for removal from the current branch.
2708 </p>
2708 </p>
2709 <p>
2709 <p>
2710 This command schedules the files to be removed at the next commit.
2710 This command schedules the files to be removed at the next commit.
2711 To undo a remove before that, see 'hg revert'. To undo added
2711 To undo a remove before that, see 'hg revert'. To undo added
2712 files, see 'hg forget'.
2712 files, see 'hg forget'.
2713 </p>
2713 </p>
2714 <p>
2714 <p>
2715 -A/--after can be used to remove only files that have already
2715 -A/--after can be used to remove only files that have already
2716 been deleted, -f/--force can be used to force deletion, and -Af
2716 been deleted, -f/--force can be used to force deletion, and -Af
2717 can be used to remove files from the next revision without
2717 can be used to remove files from the next revision without
2718 deleting them from the working directory.
2718 deleting them from the working directory.
2719 </p>
2719 </p>
2720 <p>
2720 <p>
2721 The following table details the behavior of remove for different
2721 The following table details the behavior of remove for different
2722 file states (columns) and option combinations (rows). The file
2722 file states (columns) and option combinations (rows). The file
2723 states are Added [A], Clean [C], Modified [M] and Missing [!]
2723 states are Added [A], Clean [C], Modified [M] and Missing [!]
2724 (as reported by 'hg status'). The actions are Warn, Remove
2724 (as reported by 'hg status'). The actions are Warn, Remove
2725 (from branch) and Delete (from disk):
2725 (from branch) and Delete (from disk):
2726 </p>
2726 </p>
2727 <table>
2727 <table>
2728 <tr><td>opt/state</td>
2728 <tr><td>opt/state</td>
2729 <td>A</td>
2729 <td>A</td>
2730 <td>C</td>
2730 <td>C</td>
2731 <td>M</td>
2731 <td>M</td>
2732 <td>!</td></tr>
2732 <td>!</td></tr>
2733 <tr><td>none</td>
2733 <tr><td>none</td>
2734 <td>W</td>
2734 <td>W</td>
2735 <td>RD</td>
2735 <td>RD</td>
2736 <td>W</td>
2736 <td>W</td>
2737 <td>R</td></tr>
2737 <td>R</td></tr>
2738 <tr><td>-f</td>
2738 <tr><td>-f</td>
2739 <td>R</td>
2739 <td>R</td>
2740 <td>RD</td>
2740 <td>RD</td>
2741 <td>RD</td>
2741 <td>RD</td>
2742 <td>R</td></tr>
2742 <td>R</td></tr>
2743 <tr><td>-A</td>
2743 <tr><td>-A</td>
2744 <td>W</td>
2744 <td>W</td>
2745 <td>W</td>
2745 <td>W</td>
2746 <td>W</td>
2746 <td>W</td>
2747 <td>R</td></tr>
2747 <td>R</td></tr>
2748 <tr><td>-Af</td>
2748 <tr><td>-Af</td>
2749 <td>R</td>
2749 <td>R</td>
2750 <td>R</td>
2750 <td>R</td>
2751 <td>R</td>
2751 <td>R</td>
2752 <td>R</td></tr>
2752 <td>R</td></tr>
2753 </table>
2753 </table>
2754 <p>
2754 <p>
2755 <b>Note:</b>
2755 <b>Note:</b>
2756 </p>
2756 </p>
2757 <p>
2757 <p>
2758 'hg remove' never deletes files in Added [A] state from the
2758 'hg remove' never deletes files in Added [A] state from the
2759 working directory, not even if &quot;--force&quot; is specified.
2759 working directory, not even if &quot;--force&quot; is specified.
2760 </p>
2760 </p>
2761 <p>
2761 <p>
2762 Returns 0 on success, 1 if any warnings encountered.
2762 Returns 0 on success, 1 if any warnings encountered.
2763 </p>
2763 </p>
2764 <p>
2764 <p>
2765 options ([+] can be repeated):
2765 options ([+] can be repeated):
2766 </p>
2766 </p>
2767 <table>
2767 <table>
2768 <tr><td>-A</td>
2768 <tr><td>-A</td>
2769 <td>--after</td>
2769 <td>--after</td>
2770 <td>record delete for missing files</td></tr>
2770 <td>record delete for missing files</td></tr>
2771 <tr><td>-f</td>
2771 <tr><td>-f</td>
2772 <td>--force</td>
2772 <td>--force</td>
2773 <td>forget added files, delete modified files</td></tr>
2773 <td>forget added files, delete modified files</td></tr>
2774 <tr><td>-S</td>
2774 <tr><td>-S</td>
2775 <td>--subrepos</td>
2775 <td>--subrepos</td>
2776 <td>recurse into subrepositories</td></tr>
2776 <td>recurse into subrepositories</td></tr>
2777 <tr><td>-I</td>
2777 <tr><td>-I</td>
2778 <td>--include PATTERN [+]</td>
2778 <td>--include PATTERN [+]</td>
2779 <td>include names matching the given patterns</td></tr>
2779 <td>include names matching the given patterns</td></tr>
2780 <tr><td>-X</td>
2780 <tr><td>-X</td>
2781 <td>--exclude PATTERN [+]</td>
2781 <td>--exclude PATTERN [+]</td>
2782 <td>exclude names matching the given patterns</td></tr>
2782 <td>exclude names matching the given patterns</td></tr>
2783 </table>
2783 </table>
2784 <p>
2784 <p>
2785 global options ([+] can be repeated):
2785 global options ([+] can be repeated):
2786 </p>
2786 </p>
2787 <table>
2787 <table>
2788 <tr><td>-R</td>
2788 <tr><td>-R</td>
2789 <td>--repository REPO</td>
2789 <td>--repository REPO</td>
2790 <td>repository root directory or name of overlay bundle file</td></tr>
2790 <td>repository root directory or name of overlay bundle file</td></tr>
2791 <tr><td></td>
2791 <tr><td></td>
2792 <td>--cwd DIR</td>
2792 <td>--cwd DIR</td>
2793 <td>change working directory</td></tr>
2793 <td>change working directory</td></tr>
2794 <tr><td>-y</td>
2794 <tr><td>-y</td>
2795 <td>--noninteractive</td>
2795 <td>--noninteractive</td>
2796 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2796 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2797 <tr><td>-q</td>
2797 <tr><td>-q</td>
2798 <td>--quiet</td>
2798 <td>--quiet</td>
2799 <td>suppress output</td></tr>
2799 <td>suppress output</td></tr>
2800 <tr><td>-v</td>
2800 <tr><td>-v</td>
2801 <td>--verbose</td>
2801 <td>--verbose</td>
2802 <td>enable additional output</td></tr>
2802 <td>enable additional output</td></tr>
2803 <tr><td></td>
2803 <tr><td></td>
2804 <td>--color TYPE</td>
2804 <td>--color TYPE</td>
2805 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2805 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2806 <tr><td></td>
2806 <tr><td></td>
2807 <td>--config CONFIG [+]</td>
2807 <td>--config CONFIG [+]</td>
2808 <td>set/override config option (use 'section.name=value')</td></tr>
2808 <td>set/override config option (use 'section.name=value')</td></tr>
2809 <tr><td></td>
2809 <tr><td></td>
2810 <td>--debug</td>
2810 <td>--debug</td>
2811 <td>enable debugging output</td></tr>
2811 <td>enable debugging output</td></tr>
2812 <tr><td></td>
2812 <tr><td></td>
2813 <td>--debugger</td>
2813 <td>--debugger</td>
2814 <td>start debugger</td></tr>
2814 <td>start debugger</td></tr>
2815 <tr><td></td>
2815 <tr><td></td>
2816 <td>--encoding ENCODE</td>
2816 <td>--encoding ENCODE</td>
2817 <td>set the charset encoding (default: ascii)</td></tr>
2817 <td>set the charset encoding (default: ascii)</td></tr>
2818 <tr><td></td>
2818 <tr><td></td>
2819 <td>--encodingmode MODE</td>
2819 <td>--encodingmode MODE</td>
2820 <td>set the charset encoding mode (default: strict)</td></tr>
2820 <td>set the charset encoding mode (default: strict)</td></tr>
2821 <tr><td></td>
2821 <tr><td></td>
2822 <td>--traceback</td>
2822 <td>--traceback</td>
2823 <td>always print a traceback on exception</td></tr>
2823 <td>always print a traceback on exception</td></tr>
2824 <tr><td></td>
2824 <tr><td></td>
2825 <td>--time</td>
2825 <td>--time</td>
2826 <td>time how long the command takes</td></tr>
2826 <td>time how long the command takes</td></tr>
2827 <tr><td></td>
2827 <tr><td></td>
2828 <td>--profile</td>
2828 <td>--profile</td>
2829 <td>print command execution profile</td></tr>
2829 <td>print command execution profile</td></tr>
2830 <tr><td></td>
2830 <tr><td></td>
2831 <td>--version</td>
2831 <td>--version</td>
2832 <td>output version information and exit</td></tr>
2832 <td>output version information and exit</td></tr>
2833 <tr><td>-h</td>
2833 <tr><td>-h</td>
2834 <td>--help</td>
2834 <td>--help</td>
2835 <td>display help and exit</td></tr>
2835 <td>display help and exit</td></tr>
2836 <tr><td></td>
2836 <tr><td></td>
2837 <td>--hidden</td>
2837 <td>--hidden</td>
2838 <td>consider hidden changesets</td></tr>
2838 <td>consider hidden changesets</td></tr>
2839 <tr><td></td>
2839 <tr><td></td>
2840 <td>--pager TYPE</td>
2840 <td>--pager TYPE</td>
2841 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2841 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2842 </table>
2842 </table>
2843
2843
2844 </div>
2844 </div>
2845 </div>
2845 </div>
2846 </div>
2846 </div>
2847
2847
2848
2848
2849
2849
2850 </body>
2850 </body>
2851 </html>
2851 </html>
2852
2852
2853
2853
2854 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
2854 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
2855 200 Script output follows
2855 200 Script output follows
2856
2856
2857 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2857 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2858 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2858 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2859 <head>
2859 <head>
2860 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2860 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2861 <meta name="robots" content="index, nofollow" />
2861 <meta name="robots" content="index, nofollow" />
2862 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2862 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2863 <script type="text/javascript" src="/static/mercurial.js"></script>
2863 <script type="text/javascript" src="/static/mercurial.js"></script>
2864
2864
2865 <title>Help: dates</title>
2865 <title>Help: dates</title>
2866 </head>
2866 </head>
2867 <body>
2867 <body>
2868
2868
2869 <div class="container">
2869 <div class="container">
2870 <div class="menu">
2870 <div class="menu">
2871 <div class="logo">
2871 <div class="logo">
2872 <a href="https://mercurial-scm.org/">
2872 <a href="https://mercurial-scm.org/">
2873 <img src="/static/hglogo.png" alt="mercurial" /></a>
2873 <img src="/static/hglogo.png" alt="mercurial" /></a>
2874 </div>
2874 </div>
2875 <ul>
2875 <ul>
2876 <li><a href="/shortlog">log</a></li>
2876 <li><a href="/shortlog">log</a></li>
2877 <li><a href="/graph">graph</a></li>
2877 <li><a href="/graph">graph</a></li>
2878 <li><a href="/tags">tags</a></li>
2878 <li><a href="/tags">tags</a></li>
2879 <li><a href="/bookmarks">bookmarks</a></li>
2879 <li><a href="/bookmarks">bookmarks</a></li>
2880 <li><a href="/branches">branches</a></li>
2880 <li><a href="/branches">branches</a></li>
2881 </ul>
2881 </ul>
2882 <ul>
2882 <ul>
2883 <li class="active"><a href="/help">help</a></li>
2883 <li class="active"><a href="/help">help</a></li>
2884 </ul>
2884 </ul>
2885 </div>
2885 </div>
2886
2886
2887 <div class="main">
2887 <div class="main">
2888 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2888 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2889 <h3>Help: dates</h3>
2889 <h3>Help: dates</h3>
2890
2890
2891 <form class="search" action="/log">
2891 <form class="search" action="/log">
2892
2892
2893 <p><input name="rev" id="search1" type="text" size="30" /></p>
2893 <p><input name="rev" id="search1" type="text" size="30" /></p>
2894 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2894 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2895 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2895 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2896 </form>
2896 </form>
2897 <div id="doc">
2897 <div id="doc">
2898 <h1>Date Formats</h1>
2898 <h1>Date Formats</h1>
2899 <p>
2899 <p>
2900 Some commands allow the user to specify a date, e.g.:
2900 Some commands allow the user to specify a date, e.g.:
2901 </p>
2901 </p>
2902 <ul>
2902 <ul>
2903 <li> backout, commit, import, tag: Specify the commit date.
2903 <li> backout, commit, import, tag: Specify the commit date.
2904 <li> log, revert, update: Select revision(s) by date.
2904 <li> log, revert, update: Select revision(s) by date.
2905 </ul>
2905 </ul>
2906 <p>
2906 <p>
2907 Many date formats are valid. Here are some examples:
2907 Many date formats are valid. Here are some examples:
2908 </p>
2908 </p>
2909 <ul>
2909 <ul>
2910 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
2910 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
2911 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
2911 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
2912 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
2912 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
2913 <li> &quot;Dec 6&quot; (midnight)
2913 <li> &quot;Dec 6&quot; (midnight)
2914 <li> &quot;13:18&quot; (today assumed)
2914 <li> &quot;13:18&quot; (today assumed)
2915 <li> &quot;3:39&quot; (3:39AM assumed)
2915 <li> &quot;3:39&quot; (3:39AM assumed)
2916 <li> &quot;3:39pm&quot; (15:39)
2916 <li> &quot;3:39pm&quot; (15:39)
2917 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
2917 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
2918 <li> &quot;2006-12-6 13:18&quot;
2918 <li> &quot;2006-12-6 13:18&quot;
2919 <li> &quot;2006-12-6&quot;
2919 <li> &quot;2006-12-6&quot;
2920 <li> &quot;12-6&quot;
2920 <li> &quot;12-6&quot;
2921 <li> &quot;12/6&quot;
2921 <li> &quot;12/6&quot;
2922 <li> &quot;12/6/6&quot; (Dec 6 2006)
2922 <li> &quot;12/6/6&quot; (Dec 6 2006)
2923 <li> &quot;today&quot; (midnight)
2923 <li> &quot;today&quot; (midnight)
2924 <li> &quot;yesterday&quot; (midnight)
2924 <li> &quot;yesterday&quot; (midnight)
2925 <li> &quot;now&quot; - right now
2925 <li> &quot;now&quot; - right now
2926 </ul>
2926 </ul>
2927 <p>
2927 <p>
2928 Lastly, there is Mercurial's internal format:
2928 Lastly, there is Mercurial's internal format:
2929 </p>
2929 </p>
2930 <ul>
2930 <ul>
2931 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
2931 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
2932 </ul>
2932 </ul>
2933 <p>
2933 <p>
2934 This is the internal representation format for dates. The first number
2934 This is the internal representation format for dates. The first number
2935 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
2935 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
2936 second is the offset of the local timezone, in seconds west of UTC
2936 second is the offset of the local timezone, in seconds west of UTC
2937 (negative if the timezone is east of UTC).
2937 (negative if the timezone is east of UTC).
2938 </p>
2938 </p>
2939 <p>
2939 <p>
2940 The log command also accepts date ranges:
2940 The log command also accepts date ranges:
2941 </p>
2941 </p>
2942 <ul>
2942 <ul>
2943 <li> &quot;&lt;DATE&quot; - at or before a given date/time
2943 <li> &quot;&lt;DATE&quot; - at or before a given date/time
2944 <li> &quot;&gt;DATE&quot; - on or after a given date/time
2944 <li> &quot;&gt;DATE&quot; - on or after a given date/time
2945 <li> &quot;DATE to DATE&quot; - a date range, inclusive
2945 <li> &quot;DATE to DATE&quot; - a date range, inclusive
2946 <li> &quot;-DAYS&quot; - within a given number of days of today
2946 <li> &quot;-DAYS&quot; - within a given number of days of today
2947 </ul>
2947 </ul>
2948
2948
2949 </div>
2949 </div>
2950 </div>
2950 </div>
2951 </div>
2951 </div>
2952
2952
2953
2953
2954
2954
2955 </body>
2955 </body>
2956 </html>
2956 </html>
2957
2957
2958
2958
2959 Sub-topic indexes rendered properly
2959 Sub-topic indexes rendered properly
2960
2960
2961 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
2961 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
2962 200 Script output follows
2962 200 Script output follows
2963
2963
2964 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2964 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2965 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2965 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2966 <head>
2966 <head>
2967 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2967 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2968 <meta name="robots" content="index, nofollow" />
2968 <meta name="robots" content="index, nofollow" />
2969 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2969 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2970 <script type="text/javascript" src="/static/mercurial.js"></script>
2970 <script type="text/javascript" src="/static/mercurial.js"></script>
2971
2971
2972 <title>Help: internals</title>
2972 <title>Help: internals</title>
2973 </head>
2973 </head>
2974 <body>
2974 <body>
2975
2975
2976 <div class="container">
2976 <div class="container">
2977 <div class="menu">
2977 <div class="menu">
2978 <div class="logo">
2978 <div class="logo">
2979 <a href="https://mercurial-scm.org/">
2979 <a href="https://mercurial-scm.org/">
2980 <img src="/static/hglogo.png" alt="mercurial" /></a>
2980 <img src="/static/hglogo.png" alt="mercurial" /></a>
2981 </div>
2981 </div>
2982 <ul>
2982 <ul>
2983 <li><a href="/shortlog">log</a></li>
2983 <li><a href="/shortlog">log</a></li>
2984 <li><a href="/graph">graph</a></li>
2984 <li><a href="/graph">graph</a></li>
2985 <li><a href="/tags">tags</a></li>
2985 <li><a href="/tags">tags</a></li>
2986 <li><a href="/bookmarks">bookmarks</a></li>
2986 <li><a href="/bookmarks">bookmarks</a></li>
2987 <li><a href="/branches">branches</a></li>
2987 <li><a href="/branches">branches</a></li>
2988 </ul>
2988 </ul>
2989 <ul>
2989 <ul>
2990 <li><a href="/help">help</a></li>
2990 <li><a href="/help">help</a></li>
2991 </ul>
2991 </ul>
2992 </div>
2992 </div>
2993
2993
2994 <div class="main">
2994 <div class="main">
2995 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2995 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2996 <form class="search" action="/log">
2996 <form class="search" action="/log">
2997
2997
2998 <p><input name="rev" id="search1" type="text" size="30" /></p>
2998 <p><input name="rev" id="search1" type="text" size="30" /></p>
2999 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2999 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3000 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3000 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3001 </form>
3001 </form>
3002 <table class="bigtable">
3002 <table class="bigtable">
3003 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
3003 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
3004
3004
3005 <tr><td>
3005 <tr><td>
3006 <a href="/help/internals.bundles">
3006 <a href="/help/internals.bundles">
3007 bundles
3007 bundles
3008 </a>
3008 </a>
3009 </td><td>
3009 </td><td>
3010 Bundles
3010 Bundles
3011 </td></tr>
3011 </td></tr>
3012 <tr><td>
3012 <tr><td>
3013 <a href="/help/internals.censor">
3013 <a href="/help/internals.censor">
3014 censor
3014 censor
3015 </a>
3015 </a>
3016 </td><td>
3016 </td><td>
3017 Censor
3017 Censor
3018 </td></tr>
3018 </td></tr>
3019 <tr><td>
3019 <tr><td>
3020 <a href="/help/internals.changegroups">
3020 <a href="/help/internals.changegroups">
3021 changegroups
3021 changegroups
3022 </a>
3022 </a>
3023 </td><td>
3023 </td><td>
3024 Changegroups
3024 Changegroups
3025 </td></tr>
3025 </td></tr>
3026 <tr><td>
3026 <tr><td>
3027 <a href="/help/internals.requirements">
3027 <a href="/help/internals.requirements">
3028 requirements
3028 requirements
3029 </a>
3029 </a>
3030 </td><td>
3030 </td><td>
3031 Repository Requirements
3031 Repository Requirements
3032 </td></tr>
3032 </td></tr>
3033 <tr><td>
3033 <tr><td>
3034 <a href="/help/internals.revlogs">
3034 <a href="/help/internals.revlogs">
3035 revlogs
3035 revlogs
3036 </a>
3036 </a>
3037 </td><td>
3037 </td><td>
3038 Revision Logs
3038 Revision Logs
3039 </td></tr>
3039 </td></tr>
3040 <tr><td>
3040 <tr><td>
3041 <a href="/help/internals.wireprotocol">
3041 <a href="/help/internals.wireprotocol">
3042 wireprotocol
3042 wireprotocol
3043 </a>
3043 </a>
3044 </td><td>
3044 </td><td>
3045 Wire Protocol
3045 Wire Protocol
3046 </td></tr>
3046 </td></tr>
3047
3047
3048
3048
3049
3049
3050
3050
3051
3051
3052 </table>
3052 </table>
3053 </div>
3053 </div>
3054 </div>
3054 </div>
3055
3055
3056
3056
3057
3057
3058 </body>
3058 </body>
3059 </html>
3059 </html>
3060
3060
3061
3061
3062 Sub-topic topics rendered properly
3062 Sub-topic topics rendered properly
3063
3063
3064 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3064 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3065 200 Script output follows
3065 200 Script output follows
3066
3066
3067 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3067 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3068 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3068 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3069 <head>
3069 <head>
3070 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3070 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3071 <meta name="robots" content="index, nofollow" />
3071 <meta name="robots" content="index, nofollow" />
3072 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3072 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3073 <script type="text/javascript" src="/static/mercurial.js"></script>
3073 <script type="text/javascript" src="/static/mercurial.js"></script>
3074
3074
3075 <title>Help: internals.changegroups</title>
3075 <title>Help: internals.changegroups</title>
3076 </head>
3076 </head>
3077 <body>
3077 <body>
3078
3078
3079 <div class="container">
3079 <div class="container">
3080 <div class="menu">
3080 <div class="menu">
3081 <div class="logo">
3081 <div class="logo">
3082 <a href="https://mercurial-scm.org/">
3082 <a href="https://mercurial-scm.org/">
3083 <img src="/static/hglogo.png" alt="mercurial" /></a>
3083 <img src="/static/hglogo.png" alt="mercurial" /></a>
3084 </div>
3084 </div>
3085 <ul>
3085 <ul>
3086 <li><a href="/shortlog">log</a></li>
3086 <li><a href="/shortlog">log</a></li>
3087 <li><a href="/graph">graph</a></li>
3087 <li><a href="/graph">graph</a></li>
3088 <li><a href="/tags">tags</a></li>
3088 <li><a href="/tags">tags</a></li>
3089 <li><a href="/bookmarks">bookmarks</a></li>
3089 <li><a href="/bookmarks">bookmarks</a></li>
3090 <li><a href="/branches">branches</a></li>
3090 <li><a href="/branches">branches</a></li>
3091 </ul>
3091 </ul>
3092 <ul>
3092 <ul>
3093 <li class="active"><a href="/help">help</a></li>
3093 <li class="active"><a href="/help">help</a></li>
3094 </ul>
3094 </ul>
3095 </div>
3095 </div>
3096
3096
3097 <div class="main">
3097 <div class="main">
3098 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3098 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3099 <h3>Help: internals.changegroups</h3>
3099 <h3>Help: internals.changegroups</h3>
3100
3100
3101 <form class="search" action="/log">
3101 <form class="search" action="/log">
3102
3102
3103 <p><input name="rev" id="search1" type="text" size="30" /></p>
3103 <p><input name="rev" id="search1" type="text" size="30" /></p>
3104 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3104 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3105 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3105 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3106 </form>
3106 </form>
3107 <div id="doc">
3107 <div id="doc">
3108 <h1>Changegroups</h1>
3108 <h1>Changegroups</h1>
3109 <p>
3109 <p>
3110 Changegroups are representations of repository revlog data, specifically
3110 Changegroups are representations of repository revlog data, specifically
3111 the changelog data, root/flat manifest data, treemanifest data, and
3111 the changelog data, root/flat manifest data, treemanifest data, and
3112 filelogs.
3112 filelogs.
3113 </p>
3113 </p>
3114 <p>
3114 <p>
3115 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3115 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3116 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3116 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3117 only difference being an additional item in the *delta header*. Version
3117 only difference being an additional item in the *delta header*. Version
3118 &quot;3&quot; adds support for revlog flags in the *delta header* and optionally
3118 &quot;3&quot; adds support for revlog flags in the *delta header* and optionally
3119 exchanging treemanifests (enabled by setting an option on the
3119 exchanging treemanifests (enabled by setting an option on the
3120 &quot;changegroup&quot; part in the bundle2).
3120 &quot;changegroup&quot; part in the bundle2).
3121 </p>
3121 </p>
3122 <p>
3122 <p>
3123 Changegroups when not exchanging treemanifests consist of 3 logical
3123 Changegroups when not exchanging treemanifests consist of 3 logical
3124 segments:
3124 segments:
3125 </p>
3125 </p>
3126 <pre>
3126 <pre>
3127 +---------------------------------+
3127 +---------------------------------+
3128 | | | |
3128 | | | |
3129 | changeset | manifest | filelogs |
3129 | changeset | manifest | filelogs |
3130 | | | |
3130 | | | |
3131 | | | |
3131 | | | |
3132 +---------------------------------+
3132 +---------------------------------+
3133 </pre>
3133 </pre>
3134 <p>
3134 <p>
3135 When exchanging treemanifests, there are 4 logical segments:
3135 When exchanging treemanifests, there are 4 logical segments:
3136 </p>
3136 </p>
3137 <pre>
3137 <pre>
3138 +-------------------------------------------------+
3138 +-------------------------------------------------+
3139 | | | | |
3139 | | | | |
3140 | changeset | root | treemanifests | filelogs |
3140 | changeset | root | treemanifests | filelogs |
3141 | | manifest | | |
3141 | | manifest | | |
3142 | | | | |
3142 | | | | |
3143 +-------------------------------------------------+
3143 +-------------------------------------------------+
3144 </pre>
3144 </pre>
3145 <p>
3145 <p>
3146 The principle building block of each segment is a *chunk*. A *chunk*
3146 The principle building block of each segment is a *chunk*. A *chunk*
3147 is a framed piece of data:
3147 is a framed piece of data:
3148 </p>
3148 </p>
3149 <pre>
3149 <pre>
3150 +---------------------------------------+
3150 +---------------------------------------+
3151 | | |
3151 | | |
3152 | length | data |
3152 | length | data |
3153 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3153 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3154 | | |
3154 | | |
3155 +---------------------------------------+
3155 +---------------------------------------+
3156 </pre>
3156 </pre>
3157 <p>
3157 <p>
3158 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3158 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3159 integer indicating the length of the entire chunk (including the length field
3159 integer indicating the length of the entire chunk (including the length field
3160 itself).
3160 itself).
3161 </p>
3161 </p>
3162 <p>
3162 <p>
3163 There is a special case chunk that has a value of 0 for the length
3163 There is a special case chunk that has a value of 0 for the length
3164 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3164 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3165 </p>
3165 </p>
3166 <h2>Delta Groups</h2>
3166 <h2>Delta Groups</h2>
3167 <p>
3167 <p>
3168 A *delta group* expresses the content of a revlog as a series of deltas,
3168 A *delta group* expresses the content of a revlog as a series of deltas,
3169 or patches against previous revisions.
3169 or patches against previous revisions.
3170 </p>
3170 </p>
3171 <p>
3171 <p>
3172 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3172 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3173 to signal the end of the delta group:
3173 to signal the end of the delta group:
3174 </p>
3174 </p>
3175 <pre>
3175 <pre>
3176 +------------------------------------------------------------------------+
3176 +------------------------------------------------------------------------+
3177 | | | | | |
3177 | | | | | |
3178 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3178 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3179 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3179 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3180 | | | | | |
3180 | | | | | |
3181 +------------------------------------------------------------------------+
3181 +------------------------------------------------------------------------+
3182 </pre>
3182 </pre>
3183 <p>
3183 <p>
3184 Each *chunk*'s data consists of the following:
3184 Each *chunk*'s data consists of the following:
3185 </p>
3185 </p>
3186 <pre>
3186 <pre>
3187 +---------------------------------------+
3187 +---------------------------------------+
3188 | | |
3188 | | |
3189 | delta header | delta data |
3189 | delta header | delta data |
3190 | (various by version) | (various) |
3190 | (various by version) | (various) |
3191 | | |
3191 | | |
3192 +---------------------------------------+
3192 +---------------------------------------+
3193 </pre>
3193 </pre>
3194 <p>
3194 <p>
3195 The *delta data* is a series of *delta*s that describe a diff from an existing
3195 The *delta data* is a series of *delta*s that describe a diff from an existing
3196 entry (either that the recipient already has, or previously specified in the
3196 entry (either that the recipient already has, or previously specified in the
3197 bundle/changegroup).
3197 bundle/changegroup).
3198 </p>
3198 </p>
3199 <p>
3199 <p>
3200 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3200 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3201 &quot;3&quot; of the changegroup format.
3201 &quot;3&quot; of the changegroup format.
3202 </p>
3202 </p>
3203 <p>
3203 <p>
3204 Version 1 (headerlen=80):
3204 Version 1 (headerlen=80):
3205 </p>
3205 </p>
3206 <pre>
3206 <pre>
3207 +------------------------------------------------------+
3207 +------------------------------------------------------+
3208 | | | | |
3208 | | | | |
3209 | node | p1 node | p2 node | link node |
3209 | node | p1 node | p2 node | link node |
3210 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3210 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3211 | | | | |
3211 | | | | |
3212 +------------------------------------------------------+
3212 +------------------------------------------------------+
3213 </pre>
3213 </pre>
3214 <p>
3214 <p>
3215 Version 2 (headerlen=100):
3215 Version 2 (headerlen=100):
3216 </p>
3216 </p>
3217 <pre>
3217 <pre>
3218 +------------------------------------------------------------------+
3218 +------------------------------------------------------------------+
3219 | | | | | |
3219 | | | | | |
3220 | node | p1 node | p2 node | base node | link node |
3220 | node | p1 node | p2 node | base node | link node |
3221 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3221 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3222 | | | | | |
3222 | | | | | |
3223 +------------------------------------------------------------------+
3223 +------------------------------------------------------------------+
3224 </pre>
3224 </pre>
3225 <p>
3225 <p>
3226 Version 3 (headerlen=102):
3226 Version 3 (headerlen=102):
3227 </p>
3227 </p>
3228 <pre>
3228 <pre>
3229 +------------------------------------------------------------------------------+
3229 +------------------------------------------------------------------------------+
3230 | | | | | | |
3230 | | | | | | |
3231 | node | p1 node | p2 node | base node | link node | flags |
3231 | node | p1 node | p2 node | base node | link node | flags |
3232 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3232 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3233 | | | | | | |
3233 | | | | | | |
3234 +------------------------------------------------------------------------------+
3234 +------------------------------------------------------------------------------+
3235 </pre>
3235 </pre>
3236 <p>
3236 <p>
3237 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3237 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3238 series of *delta*s, densely packed (no separators). These deltas describe a diff
3238 series of *delta*s, densely packed (no separators). These deltas describe a diff
3239 from an existing entry (either that the recipient already has, or previously
3239 from an existing entry (either that the recipient already has, or previously
3240 specified in the bundle/changegroup). The format is described more fully in
3240 specified in the bundle/changegroup). The format is described more fully in
3241 &quot;hg help internals.bdiff&quot;, but briefly:
3241 &quot;hg help internals.bdiff&quot;, but briefly:
3242 </p>
3242 </p>
3243 <pre>
3243 <pre>
3244 +---------------------------------------------------------------+
3244 +---------------------------------------------------------------+
3245 | | | | |
3245 | | | | |
3246 | start offset | end offset | new length | content |
3246 | start offset | end offset | new length | content |
3247 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3247 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3248 | | | | |
3248 | | | | |
3249 +---------------------------------------------------------------+
3249 +---------------------------------------------------------------+
3250 </pre>
3250 </pre>
3251 <p>
3251 <p>
3252 Please note that the length field in the delta data does *not* include itself.
3252 Please note that the length field in the delta data does *not* include itself.
3253 </p>
3253 </p>
3254 <p>
3254 <p>
3255 In version 1, the delta is always applied against the previous node from
3255 In version 1, the delta is always applied against the previous node from
3256 the changegroup or the first parent if this is the first entry in the
3256 the changegroup or the first parent if this is the first entry in the
3257 changegroup.
3257 changegroup.
3258 </p>
3258 </p>
3259 <p>
3259 <p>
3260 In version 2 and up, the delta base node is encoded in the entry in the
3260 In version 2 and up, the delta base node is encoded in the entry in the
3261 changegroup. This allows the delta to be expressed against any parent,
3261 changegroup. This allows the delta to be expressed against any parent,
3262 which can result in smaller deltas and more efficient encoding of data.
3262 which can result in smaller deltas and more efficient encoding of data.
3263 </p>
3263 </p>
3264 <h2>Changeset Segment</h2>
3264 <h2>Changeset Segment</h2>
3265 <p>
3265 <p>
3266 The *changeset segment* consists of a single *delta group* holding
3266 The *changeset segment* consists of a single *delta group* holding
3267 changelog data. The *empty chunk* at the end of the *delta group* denotes
3267 changelog data. The *empty chunk* at the end of the *delta group* denotes
3268 the boundary to the *manifest segment*.
3268 the boundary to the *manifest segment*.
3269 </p>
3269 </p>
3270 <h2>Manifest Segment</h2>
3270 <h2>Manifest Segment</h2>
3271 <p>
3271 <p>
3272 The *manifest segment* consists of a single *delta group* holding manifest
3272 The *manifest segment* consists of a single *delta group* holding manifest
3273 data. If treemanifests are in use, it contains only the manifest for the
3273 data. If treemanifests are in use, it contains only the manifest for the
3274 root directory of the repository. Otherwise, it contains the entire
3274 root directory of the repository. Otherwise, it contains the entire
3275 manifest data. The *empty chunk* at the end of the *delta group* denotes
3275 manifest data. The *empty chunk* at the end of the *delta group* denotes
3276 the boundary to the next segment (either the *treemanifests segment* or the
3276 the boundary to the next segment (either the *treemanifests segment* or the
3277 *filelogs segment*, depending on version and the request options).
3277 *filelogs segment*, depending on version and the request options).
3278 </p>
3278 </p>
3279 <h3>Treemanifests Segment</h3>
3279 <h3>Treemanifests Segment</h3>
3280 <p>
3280 <p>
3281 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3281 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3282 only if the 'treemanifest' param is part of the bundle2 changegroup part
3282 only if the 'treemanifest' param is part of the bundle2 changegroup part
3283 (it is not possible to use changegroup version 3 outside of bundle2).
3283 (it is not possible to use changegroup version 3 outside of bundle2).
3284 Aside from the filenames in the *treemanifests segment* containing a
3284 Aside from the filenames in the *treemanifests segment* containing a
3285 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3285 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3286 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3286 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3287 a sub-segment with filename size 0). This denotes the boundary to the
3287 a sub-segment with filename size 0). This denotes the boundary to the
3288 *filelogs segment*.
3288 *filelogs segment*.
3289 </p>
3289 </p>
3290 <h2>Filelogs Segment</h2>
3290 <h2>Filelogs Segment</h2>
3291 <p>
3291 <p>
3292 The *filelogs segment* consists of multiple sub-segments, each
3292 The *filelogs segment* consists of multiple sub-segments, each
3293 corresponding to an individual file whose data is being described:
3293 corresponding to an individual file whose data is being described:
3294 </p>
3294 </p>
3295 <pre>
3295 <pre>
3296 +--------------------------------------------------+
3296 +--------------------------------------------------+
3297 | | | | | |
3297 | | | | | |
3298 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3298 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3299 | | | | | (4 bytes) |
3299 | | | | | (4 bytes) |
3300 | | | | | |
3300 | | | | | |
3301 +--------------------------------------------------+
3301 +--------------------------------------------------+
3302 </pre>
3302 </pre>
3303 <p>
3303 <p>
3304 The final filelog sub-segment is followed by an *empty chunk* (logically,
3304 The final filelog sub-segment is followed by an *empty chunk* (logically,
3305 a sub-segment with filename size 0). This denotes the end of the segment
3305 a sub-segment with filename size 0). This denotes the end of the segment
3306 and of the overall changegroup.
3306 and of the overall changegroup.
3307 </p>
3307 </p>
3308 <p>
3308 <p>
3309 Each filelog sub-segment consists of the following:
3309 Each filelog sub-segment consists of the following:
3310 </p>
3310 </p>
3311 <pre>
3311 <pre>
3312 +------------------------------------------------------+
3312 +------------------------------------------------------+
3313 | | | |
3313 | | | |
3314 | filename length | filename | delta group |
3314 | filename length | filename | delta group |
3315 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3315 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3316 | | | |
3316 | | | |
3317 +------------------------------------------------------+
3317 +------------------------------------------------------+
3318 </pre>
3318 </pre>
3319 <p>
3319 <p>
3320 That is, a *chunk* consisting of the filename (not terminated or padded)
3320 That is, a *chunk* consisting of the filename (not terminated or padded)
3321 followed by N chunks constituting the *delta group* for this file. The
3321 followed by N chunks constituting the *delta group* for this file. The
3322 *empty chunk* at the end of each *delta group* denotes the boundary to the
3322 *empty chunk* at the end of each *delta group* denotes the boundary to the
3323 next filelog sub-segment.
3323 next filelog sub-segment.
3324 </p>
3324 </p>
3325
3325
3326 </div>
3326 </div>
3327 </div>
3327 </div>
3328 </div>
3328 </div>
3329
3329
3330
3330
3331
3331
3332 </body>
3332 </body>
3333 </html>
3333 </html>
3334
3334
3335
3335
3336 $ killdaemons.py
3336 $ killdaemons.py
3337
3337
3338 #endif
3338 #endif
General Comments 0
You need to be logged in to leave comments. Login now