##// END OF EJS Templates
help: describe about choice of :prompt as a fallback merge tool explicitly...
FUJIWARA Katsunori -
r32179:247bb7a2 stable
parent child Browse files
Show More
@@ -1,85 +1,85 b''
1 To merge files Mercurial uses merge tools.
1 To merge files Mercurial uses merge tools.
2
2
3 A merge tool combines two different versions of a file into a merged
3 A merge tool combines two different versions of a file into a merged
4 file. Merge tools are given the two files and the greatest common
4 file. Merge tools are given the two files and the greatest common
5 ancestor of the two file versions, so they can determine the changes
5 ancestor of the two file versions, so they can determine the changes
6 made on both branches.
6 made on both branches.
7
7
8 Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,
8 Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,
9 :hg:`backout` and in several extensions.
9 :hg:`backout` and in several extensions.
10
10
11 Usually, the merge tool tries to automatically reconcile the files by
11 Usually, the merge tool tries to automatically reconcile the files by
12 combining all non-overlapping changes that occurred separately in
12 combining all non-overlapping changes that occurred separately in
13 the two different evolutions of the same initial base file. Furthermore, some
13 the two different evolutions of the same initial base file. Furthermore, some
14 interactive merge programs make it easier to manually resolve
14 interactive merge programs make it easier to manually resolve
15 conflicting merges, either in a graphical way, or by inserting some
15 conflicting merges, either in a graphical way, or by inserting some
16 conflict markers. Mercurial does not include any interactive merge
16 conflict markers. Mercurial does not include any interactive merge
17 programs but relies on external tools for that.
17 programs but relies on external tools for that.
18
18
19 Available merge tools
19 Available merge tools
20 =====================
20 =====================
21
21
22 External merge tools and their properties are configured in the
22 External merge tools and their properties are configured in the
23 merge-tools configuration section - see hgrc(5) - but they can often just
23 merge-tools configuration section - see hgrc(5) - but they can often just
24 be named by their executable.
24 be named by their executable.
25
25
26 A merge tool is generally usable if its executable can be found on the
26 A merge tool is generally usable if its executable can be found on the
27 system and if it can handle the merge. The executable is found if it
27 system and if it can handle the merge. The executable is found if it
28 is an absolute or relative executable path or the name of an
28 is an absolute or relative executable path or the name of an
29 application in the executable search path. The tool is assumed to be
29 application in the executable search path. The tool is assumed to be
30 able to handle the merge if it can handle symlinks if the file is a
30 able to handle the merge if it can handle symlinks if the file is a
31 symlink, if it can handle binary files if the file is binary, and if a
31 symlink, if it can handle binary files if the file is binary, and if a
32 GUI is available if the tool requires a GUI.
32 GUI is available if the tool requires a GUI.
33
33
34 There are some internal merge tools which can be used. The internal
34 There are some internal merge tools which can be used. The internal
35 merge tools are:
35 merge tools are:
36
36
37 .. internaltoolsmarker
37 .. internaltoolsmarker
38
38
39 Internal tools are always available and do not require a GUI but will by default
39 Internal tools are always available and do not require a GUI but will by default
40 not handle symlinks or binary files.
40 not handle symlinks or binary files.
41
41
42 Choosing a merge tool
42 Choosing a merge tool
43 =====================
43 =====================
44
44
45 Mercurial uses these rules when deciding which merge tool to use:
45 Mercurial uses these rules when deciding which merge tool to use:
46
46
47 1. If a tool has been specified with the --tool option to merge or resolve, it
47 1. If a tool has been specified with the --tool option to merge or resolve, it
48 is used. If it is the name of a tool in the merge-tools configuration, its
48 is used. If it is the name of a tool in the merge-tools configuration, its
49 configuration is used. Otherwise the specified tool must be executable by
49 configuration is used. Otherwise the specified tool must be executable by
50 the shell.
50 the shell.
51
51
52 2. If the ``HGMERGE`` environment variable is present, its value is used and
52 2. If the ``HGMERGE`` environment variable is present, its value is used and
53 must be executable by the shell.
53 must be executable by the shell.
54
54
55 3. If the filename of the file to be merged matches any of the patterns in the
55 3. If the filename of the file to be merged matches any of the patterns in the
56 merge-patterns configuration section, the first usable merge tool
56 merge-patterns configuration section, the first usable merge tool
57 corresponding to a matching pattern is used. Here, binary capabilities of the
57 corresponding to a matching pattern is used. Here, binary capabilities of the
58 merge tool are not considered.
58 merge tool are not considered.
59
59
60 4. If ui.merge is set it will be considered next. If the value is not the name
60 4. If ui.merge is set it will be considered next. If the value is not the name
61 of a configured tool, the specified value is used and must be executable by
61 of a configured tool, the specified value is used and must be executable by
62 the shell. Otherwise the named tool is used if it is usable.
62 the shell. Otherwise the named tool is used if it is usable.
63
63
64 5. If any usable merge tools are present in the merge-tools configuration
64 5. If any usable merge tools are present in the merge-tools configuration
65 section, the one with the highest priority is used.
65 section, the one with the highest priority is used.
66
66
67 6. If a program named ``hgmerge`` can be found on the system, it is used - but
67 6. If a program named ``hgmerge`` can be found on the system, it is used - but
68 it will by default not be used for symlinks and binary files.
68 it will by default not be used for symlinks and binary files.
69
69
70 7. If the file to be merged is not binary and is not a symlink, then
70 7. If the file to be merged is not binary and is not a symlink, then
71 internal ``:merge`` is used.
71 internal ``:merge`` is used.
72
72
73 8. The merge of the file fails and must be resolved before commit.
73 8. Otherwise, ``:prompt`` is used.
74
74
75 .. note::
75 .. note::
76
76
77 After selecting a merge program, Mercurial will by default attempt
77 After selecting a merge program, Mercurial will by default attempt
78 to merge the files using a simple merge algorithm first. Only if it doesn't
78 to merge the files using a simple merge algorithm first. Only if it doesn't
79 succeed because of conflicting changes Mercurial will actually execute the
79 succeed because of conflicting changes Mercurial will actually execute the
80 merge program. Whether to use the simple merge algorithm first can be
80 merge program. Whether to use the simple merge algorithm first can be
81 controlled by the premerge setting of the merge tool. Premerge is enabled by
81 controlled by the premerge setting of the merge tool. Premerge is enabled by
82 default unless the file is binary or a symlink.
82 default unless the file is binary or a symlink.
83
83
84 See the merge-tools and ui sections of hgrc(5) for details on the
84 See the merge-tools and ui sections of hgrc(5) for details on the
85 configuration of merge tools.
85 configuration of merge tools.
@@ -1,3327 +1,3327 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 cmdutil, commands
683 > from mercurial import cmdutil, commands
684 >
684 >
685 > cmdtable = {}
685 > cmdtable = {}
686 > command = cmdutil.command(cmdtable)
686 > command = cmdutil.command(cmdtable)
687 >
687 >
688 > @command('nohelp',
688 > @command('nohelp',
689 > [('', 'longdesc', 3, 'x'*90),
689 > [('', 'longdesc', 3, 'x'*90),
690 > ('n', '', None, 'normal desc'),
690 > ('n', '', None, 'normal desc'),
691 > ('', 'newline', '', 'line1\nline2')],
691 > ('', 'newline', '', 'line1\nline2')],
692 > 'hg nohelp',
692 > 'hg nohelp',
693 > norepo=True)
693 > norepo=True)
694 > @command('debugoptADV', [('', 'aopt', None, 'option is (ADVANCED)')])
694 > @command('debugoptADV', [('', 'aopt', None, 'option is (ADVANCED)')])
695 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
695 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
696 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
696 > @command('debugoptEXP', [('', 'eopt', None, '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('alias', 'shellalias', '!echo hi', 'helpext')
702 > ui.setconfig('alias', 'hgalias', 'summary', 'helpext')
702 > ui.setconfig('alias', 'hgalias', 'summary', '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 debugpushkey access the pushkey key/value protocol
915 debugpushkey access the pushkey key/value protocol
916 debugpvec (no help text available)
916 debugpvec (no help text available)
917 debugrebuilddirstate
917 debugrebuilddirstate
918 rebuild the dirstate as it would look like for the given
918 rebuild the dirstate as it would look like for the given
919 revision
919 revision
920 debugrebuildfncache
920 debugrebuildfncache
921 rebuild the fncache file
921 rebuild the fncache file
922 debugrename dump rename information
922 debugrename dump rename information
923 debugrevlog show data and statistics about a revlog
923 debugrevlog show data and statistics about a revlog
924 debugrevspec parse and apply a revision specification
924 debugrevspec parse and apply a revision specification
925 debugsetparents
925 debugsetparents
926 manually set the parents of the current working directory
926 manually set the parents of the current working directory
927 debugsub (no help text available)
927 debugsub (no help text available)
928 debugsuccessorssets
928 debugsuccessorssets
929 show set of successors for revision
929 show set of successors for revision
930 debugtemplate
930 debugtemplate
931 parse and apply a template
931 parse and apply a template
932 debugupgraderepo
932 debugupgraderepo
933 upgrade a repository to use different features
933 upgrade a repository to use different features
934 debugwalk show how files match on given patterns
934 debugwalk show how files match on given patterns
935 debugwireargs
935 debugwireargs
936 (no help text available)
936 (no help text available)
937
937
938 (use 'hg help -v debug' to show built-in aliases and global options)
938 (use 'hg help -v debug' to show built-in aliases and global options)
939
939
940 internals topic renders index of available sub-topics
940 internals topic renders index of available sub-topics
941
941
942 $ hg help internals
942 $ hg help internals
943 Technical implementation topics
943 Technical implementation topics
944 """""""""""""""""""""""""""""""
944 """""""""""""""""""""""""""""""
945
945
946 To access a subtopic, use "hg help internals.{subtopic-name}"
946 To access a subtopic, use "hg help internals.{subtopic-name}"
947
947
948 bundles Bundles
948 bundles Bundles
949 censor Censor
949 censor Censor
950 changegroups Changegroups
950 changegroups Changegroups
951 requirements Repository Requirements
951 requirements Repository Requirements
952 revlogs Revision Logs
952 revlogs Revision Logs
953 wireprotocol Wire Protocol
953 wireprotocol Wire Protocol
954
954
955 sub-topics can be accessed
955 sub-topics can be accessed
956
956
957 $ hg help internals.changegroups
957 $ hg help internals.changegroups
958 Changegroups
958 Changegroups
959 """"""""""""
959 """"""""""""
960
960
961 Changegroups are representations of repository revlog data, specifically
961 Changegroups are representations of repository revlog data, specifically
962 the changelog data, root/flat manifest data, treemanifest data, and
962 the changelog data, root/flat manifest data, treemanifest data, and
963 filelogs.
963 filelogs.
964
964
965 There are 3 versions of changegroups: "1", "2", and "3". From a high-
965 There are 3 versions of changegroups: "1", "2", and "3". From a high-
966 level, versions "1" and "2" are almost exactly the same, with the only
966 level, versions "1" and "2" are almost exactly the same, with the only
967 difference being an additional item in the *delta header*. Version "3"
967 difference being an additional item in the *delta header*. Version "3"
968 adds support for revlog flags in the *delta header* and optionally
968 adds support for revlog flags in the *delta header* and optionally
969 exchanging treemanifests (enabled by setting an option on the
969 exchanging treemanifests (enabled by setting an option on the
970 "changegroup" part in the bundle2).
970 "changegroup" part in the bundle2).
971
971
972 Changegroups when not exchanging treemanifests consist of 3 logical
972 Changegroups when not exchanging treemanifests consist of 3 logical
973 segments:
973 segments:
974
974
975 +---------------------------------+
975 +---------------------------------+
976 | | | |
976 | | | |
977 | changeset | manifest | filelogs |
977 | changeset | manifest | filelogs |
978 | | | |
978 | | | |
979 | | | |
979 | | | |
980 +---------------------------------+
980 +---------------------------------+
981
981
982 When exchanging treemanifests, there are 4 logical segments:
982 When exchanging treemanifests, there are 4 logical segments:
983
983
984 +-------------------------------------------------+
984 +-------------------------------------------------+
985 | | | | |
985 | | | | |
986 | changeset | root | treemanifests | filelogs |
986 | changeset | root | treemanifests | filelogs |
987 | | manifest | | |
987 | | manifest | | |
988 | | | | |
988 | | | | |
989 +-------------------------------------------------+
989 +-------------------------------------------------+
990
990
991 The principle building block of each segment is a *chunk*. A *chunk* is a
991 The principle building block of each segment is a *chunk*. A *chunk* is a
992 framed piece of data:
992 framed piece of data:
993
993
994 +---------------------------------------+
994 +---------------------------------------+
995 | | |
995 | | |
996 | length | data |
996 | length | data |
997 | (4 bytes) | (<length - 4> bytes) |
997 | (4 bytes) | (<length - 4> bytes) |
998 | | |
998 | | |
999 +---------------------------------------+
999 +---------------------------------------+
1000
1000
1001 All integers are big-endian signed integers. Each chunk starts with a
1001 All integers are big-endian signed integers. Each chunk starts with a
1002 32-bit integer indicating the length of the entire chunk (including the
1002 32-bit integer indicating the length of the entire chunk (including the
1003 length field itself).
1003 length field itself).
1004
1004
1005 There is a special case chunk that has a value of 0 for the length
1005 There is a special case chunk that has a value of 0 for the length
1006 ("0x00000000"). We call this an *empty chunk*.
1006 ("0x00000000"). We call this an *empty chunk*.
1007
1007
1008 Delta Groups
1008 Delta Groups
1009 ============
1009 ============
1010
1010
1011 A *delta group* expresses the content of a revlog as a series of deltas,
1011 A *delta group* expresses the content of a revlog as a series of deltas,
1012 or patches against previous revisions.
1012 or patches against previous revisions.
1013
1013
1014 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1014 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1015 to signal the end of the delta group:
1015 to signal the end of the delta group:
1016
1016
1017 +------------------------------------------------------------------------+
1017 +------------------------------------------------------------------------+
1018 | | | | | |
1018 | | | | | |
1019 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1019 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1020 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1020 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1021 | | | | | |
1021 | | | | | |
1022 +------------------------------------------------------------------------+
1022 +------------------------------------------------------------------------+
1023
1023
1024 Each *chunk*'s data consists of the following:
1024 Each *chunk*'s data consists of the following:
1025
1025
1026 +---------------------------------------+
1026 +---------------------------------------+
1027 | | |
1027 | | |
1028 | delta header | delta data |
1028 | delta header | delta data |
1029 | (various by version) | (various) |
1029 | (various by version) | (various) |
1030 | | |
1030 | | |
1031 +---------------------------------------+
1031 +---------------------------------------+
1032
1032
1033 The *delta data* is a series of *delta*s that describe a diff from an
1033 The *delta data* is a series of *delta*s that describe a diff from an
1034 existing entry (either that the recipient already has, or previously
1034 existing entry (either that the recipient already has, or previously
1035 specified in the bundle/changegroup).
1035 specified in the bundle/changegroup).
1036
1036
1037 The *delta header* is different between versions "1", "2", and "3" of the
1037 The *delta header* is different between versions "1", "2", and "3" of the
1038 changegroup format.
1038 changegroup format.
1039
1039
1040 Version 1 (headerlen=80):
1040 Version 1 (headerlen=80):
1041
1041
1042 +------------------------------------------------------+
1042 +------------------------------------------------------+
1043 | | | | |
1043 | | | | |
1044 | node | p1 node | p2 node | link node |
1044 | node | p1 node | p2 node | link node |
1045 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1045 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1046 | | | | |
1046 | | | | |
1047 +------------------------------------------------------+
1047 +------------------------------------------------------+
1048
1048
1049 Version 2 (headerlen=100):
1049 Version 2 (headerlen=100):
1050
1050
1051 +------------------------------------------------------------------+
1051 +------------------------------------------------------------------+
1052 | | | | | |
1052 | | | | | |
1053 | node | p1 node | p2 node | base node | link node |
1053 | node | p1 node | p2 node | base node | link node |
1054 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1054 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1055 | | | | | |
1055 | | | | | |
1056 +------------------------------------------------------------------+
1056 +------------------------------------------------------------------+
1057
1057
1058 Version 3 (headerlen=102):
1058 Version 3 (headerlen=102):
1059
1059
1060 +------------------------------------------------------------------------------+
1060 +------------------------------------------------------------------------------+
1061 | | | | | | |
1061 | | | | | | |
1062 | node | p1 node | p2 node | base node | link node | flags |
1062 | node | p1 node | p2 node | base node | link node | flags |
1063 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1063 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1064 | | | | | | |
1064 | | | | | | |
1065 +------------------------------------------------------------------------------+
1065 +------------------------------------------------------------------------------+
1066
1066
1067 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1067 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1068 contain a series of *delta*s, densely packed (no separators). These deltas
1068 contain a series of *delta*s, densely packed (no separators). These deltas
1069 describe a diff from an existing entry (either that the recipient already
1069 describe a diff from an existing entry (either that the recipient already
1070 has, or previously specified in the bundle/changegroup). The format is
1070 has, or previously specified in the bundle/changegroup). The format is
1071 described more fully in "hg help internals.bdiff", but briefly:
1071 described more fully in "hg help internals.bdiff", but briefly:
1072
1072
1073 +---------------------------------------------------------------+
1073 +---------------------------------------------------------------+
1074 | | | | |
1074 | | | | |
1075 | start offset | end offset | new length | content |
1075 | start offset | end offset | new length | content |
1076 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1076 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1077 | | | | |
1077 | | | | |
1078 +---------------------------------------------------------------+
1078 +---------------------------------------------------------------+
1079
1079
1080 Please note that the length field in the delta data does *not* include
1080 Please note that the length field in the delta data does *not* include
1081 itself.
1081 itself.
1082
1082
1083 In version 1, the delta is always applied against the previous node from
1083 In version 1, the delta is always applied against the previous node from
1084 the changegroup or the first parent if this is the first entry in the
1084 the changegroup or the first parent if this is the first entry in the
1085 changegroup.
1085 changegroup.
1086
1086
1087 In version 2 and up, the delta base node is encoded in the entry in the
1087 In version 2 and up, the delta base node is encoded in the entry in the
1088 changegroup. This allows the delta to be expressed against any parent,
1088 changegroup. This allows the delta to be expressed against any parent,
1089 which can result in smaller deltas and more efficient encoding of data.
1089 which can result in smaller deltas and more efficient encoding of data.
1090
1090
1091 Changeset Segment
1091 Changeset Segment
1092 =================
1092 =================
1093
1093
1094 The *changeset segment* consists of a single *delta group* holding
1094 The *changeset segment* consists of a single *delta group* holding
1095 changelog data. The *empty chunk* at the end of the *delta group* denotes
1095 changelog data. The *empty chunk* at the end of the *delta group* denotes
1096 the boundary to the *manifest segment*.
1096 the boundary to the *manifest segment*.
1097
1097
1098 Manifest Segment
1098 Manifest Segment
1099 ================
1099 ================
1100
1100
1101 The *manifest segment* consists of a single *delta group* holding manifest
1101 The *manifest segment* consists of a single *delta group* holding manifest
1102 data. If treemanifests are in use, it contains only the manifest for the
1102 data. If treemanifests are in use, it contains only the manifest for the
1103 root directory of the repository. Otherwise, it contains the entire
1103 root directory of the repository. Otherwise, it contains the entire
1104 manifest data. The *empty chunk* at the end of the *delta group* denotes
1104 manifest data. The *empty chunk* at the end of the *delta group* denotes
1105 the boundary to the next segment (either the *treemanifests segment* or
1105 the boundary to the next segment (either the *treemanifests segment* or
1106 the *filelogs segment*, depending on version and the request options).
1106 the *filelogs segment*, depending on version and the request options).
1107
1107
1108 Treemanifests Segment
1108 Treemanifests Segment
1109 ---------------------
1109 ---------------------
1110
1110
1111 The *treemanifests segment* only exists in changegroup version "3", and
1111 The *treemanifests segment* only exists in changegroup version "3", and
1112 only if the 'treemanifest' param is part of the bundle2 changegroup part
1112 only if the 'treemanifest' param is part of the bundle2 changegroup part
1113 (it is not possible to use changegroup version 3 outside of bundle2).
1113 (it is not possible to use changegroup version 3 outside of bundle2).
1114 Aside from the filenames in the *treemanifests segment* containing a
1114 Aside from the filenames in the *treemanifests segment* containing a
1115 trailing "/" character, it behaves identically to the *filelogs segment*
1115 trailing "/" character, it behaves identically to the *filelogs segment*
1116 (see below). The final sub-segment is followed by an *empty chunk*
1116 (see below). The final sub-segment is followed by an *empty chunk*
1117 (logically, a sub-segment with filename size 0). This denotes the boundary
1117 (logically, a sub-segment with filename size 0). This denotes the boundary
1118 to the *filelogs segment*.
1118 to the *filelogs segment*.
1119
1119
1120 Filelogs Segment
1120 Filelogs Segment
1121 ================
1121 ================
1122
1122
1123 The *filelogs segment* consists of multiple sub-segments, each
1123 The *filelogs segment* consists of multiple sub-segments, each
1124 corresponding to an individual file whose data is being described:
1124 corresponding to an individual file whose data is being described:
1125
1125
1126 +--------------------------------------------------+
1126 +--------------------------------------------------+
1127 | | | | | |
1127 | | | | | |
1128 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1128 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1129 | | | | | (4 bytes) |
1129 | | | | | (4 bytes) |
1130 | | | | | |
1130 | | | | | |
1131 +--------------------------------------------------+
1131 +--------------------------------------------------+
1132
1132
1133 The final filelog sub-segment is followed by an *empty chunk* (logically,
1133 The final filelog sub-segment is followed by an *empty chunk* (logically,
1134 a sub-segment with filename size 0). This denotes the end of the segment
1134 a sub-segment with filename size 0). This denotes the end of the segment
1135 and of the overall changegroup.
1135 and of the overall changegroup.
1136
1136
1137 Each filelog sub-segment consists of the following:
1137 Each filelog sub-segment consists of the following:
1138
1138
1139 +------------------------------------------------------+
1139 +------------------------------------------------------+
1140 | | | |
1140 | | | |
1141 | filename length | filename | delta group |
1141 | filename length | filename | delta group |
1142 | (4 bytes) | (<length - 4> bytes) | (various) |
1142 | (4 bytes) | (<length - 4> bytes) | (various) |
1143 | | | |
1143 | | | |
1144 +------------------------------------------------------+
1144 +------------------------------------------------------+
1145
1145
1146 That is, a *chunk* consisting of the filename (not terminated or padded)
1146 That is, a *chunk* consisting of the filename (not terminated or padded)
1147 followed by N chunks constituting the *delta group* for this file. The
1147 followed by N chunks constituting the *delta group* for this file. The
1148 *empty chunk* at the end of each *delta group* denotes the boundary to the
1148 *empty chunk* at the end of each *delta group* denotes the boundary to the
1149 next filelog sub-segment.
1149 next filelog sub-segment.
1150
1150
1151 Test list of commands with command with no help text
1151 Test list of commands with command with no help text
1152
1152
1153 $ hg help helpext
1153 $ hg help helpext
1154 helpext extension - no help text available
1154 helpext extension - no help text available
1155
1155
1156 list of commands:
1156 list of commands:
1157
1157
1158 nohelp (no help text available)
1158 nohelp (no help text available)
1159
1159
1160 (use 'hg help -v helpext' to show built-in aliases and global options)
1160 (use 'hg help -v helpext' to show built-in aliases and global options)
1161
1161
1162
1162
1163 test advanced, deprecated and experimental options are hidden in command help
1163 test advanced, deprecated and experimental options are hidden in command help
1164 $ hg help debugoptADV
1164 $ hg help debugoptADV
1165 hg debugoptADV
1165 hg debugoptADV
1166
1166
1167 (no help text available)
1167 (no help text available)
1168
1168
1169 options:
1169 options:
1170
1170
1171 (some details hidden, use --verbose to show complete help)
1171 (some details hidden, use --verbose to show complete help)
1172 $ hg help debugoptDEP
1172 $ hg help debugoptDEP
1173 hg debugoptDEP
1173 hg debugoptDEP
1174
1174
1175 (no help text available)
1175 (no help text available)
1176
1176
1177 options:
1177 options:
1178
1178
1179 (some details hidden, use --verbose to show complete help)
1179 (some details hidden, use --verbose to show complete help)
1180
1180
1181 $ hg help debugoptEXP
1181 $ hg help debugoptEXP
1182 hg debugoptEXP
1182 hg debugoptEXP
1183
1183
1184 (no help text available)
1184 (no help text available)
1185
1185
1186 options:
1186 options:
1187
1187
1188 (some details hidden, use --verbose to show complete help)
1188 (some details hidden, use --verbose to show complete help)
1189
1189
1190 test advanced, deprecated and experimental options are shown with -v
1190 test advanced, deprecated and experimental options are shown with -v
1191 $ hg help -v debugoptADV | grep aopt
1191 $ hg help -v debugoptADV | grep aopt
1192 --aopt option is (ADVANCED)
1192 --aopt option is (ADVANCED)
1193 $ hg help -v debugoptDEP | grep dopt
1193 $ hg help -v debugoptDEP | grep dopt
1194 --dopt option is (DEPRECATED)
1194 --dopt option is (DEPRECATED)
1195 $ hg help -v debugoptEXP | grep eopt
1195 $ hg help -v debugoptEXP | grep eopt
1196 --eopt option is (EXPERIMENTAL)
1196 --eopt option is (EXPERIMENTAL)
1197
1197
1198 #if gettext
1198 #if gettext
1199 test deprecated option is hidden with translation with untranslated description
1199 test deprecated option is hidden with translation with untranslated description
1200 (use many globy for not failing on changed transaction)
1200 (use many globy for not failing on changed transaction)
1201 $ LANGUAGE=sv hg help debugoptDEP
1201 $ LANGUAGE=sv hg help debugoptDEP
1202 hg debugoptDEP
1202 hg debugoptDEP
1203
1203
1204 (*) (glob)
1204 (*) (glob)
1205
1205
1206 options:
1206 options:
1207
1207
1208 (some details hidden, use --verbose to show complete help)
1208 (some details hidden, use --verbose to show complete help)
1209 #endif
1209 #endif
1210
1210
1211 Test commands that collide with topics (issue4240)
1211 Test commands that collide with topics (issue4240)
1212
1212
1213 $ hg config -hq
1213 $ hg config -hq
1214 hg config [-u] [NAME]...
1214 hg config [-u] [NAME]...
1215
1215
1216 show combined config settings from all hgrc files
1216 show combined config settings from all hgrc files
1217 $ hg showconfig -hq
1217 $ hg showconfig -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
1221
1222 Test a help topic
1222 Test a help topic
1223
1223
1224 $ hg help dates
1224 $ hg help dates
1225 Date Formats
1225 Date Formats
1226 """"""""""""
1226 """"""""""""
1227
1227
1228 Some commands allow the user to specify a date, e.g.:
1228 Some commands allow the user to specify a date, e.g.:
1229
1229
1230 - backout, commit, import, tag: Specify the commit date.
1230 - backout, commit, import, tag: Specify the commit date.
1231 - log, revert, update: Select revision(s) by date.
1231 - log, revert, update: Select revision(s) by date.
1232
1232
1233 Many date formats are valid. Here are some examples:
1233 Many date formats are valid. Here are some examples:
1234
1234
1235 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1235 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1236 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1236 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1237 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1237 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1238 - "Dec 6" (midnight)
1238 - "Dec 6" (midnight)
1239 - "13:18" (today assumed)
1239 - "13:18" (today assumed)
1240 - "3:39" (3:39AM assumed)
1240 - "3:39" (3:39AM assumed)
1241 - "3:39pm" (15:39)
1241 - "3:39pm" (15:39)
1242 - "2006-12-06 13:18:29" (ISO 8601 format)
1242 - "2006-12-06 13:18:29" (ISO 8601 format)
1243 - "2006-12-6 13:18"
1243 - "2006-12-6 13:18"
1244 - "2006-12-6"
1244 - "2006-12-6"
1245 - "12-6"
1245 - "12-6"
1246 - "12/6"
1246 - "12/6"
1247 - "12/6/6" (Dec 6 2006)
1247 - "12/6/6" (Dec 6 2006)
1248 - "today" (midnight)
1248 - "today" (midnight)
1249 - "yesterday" (midnight)
1249 - "yesterday" (midnight)
1250 - "now" - right now
1250 - "now" - right now
1251
1251
1252 Lastly, there is Mercurial's internal format:
1252 Lastly, there is Mercurial's internal format:
1253
1253
1254 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1254 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1255
1255
1256 This is the internal representation format for dates. The first number is
1256 This is the internal representation format for dates. The first number is
1257 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1257 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1258 is the offset of the local timezone, in seconds west of UTC (negative if
1258 is the offset of the local timezone, in seconds west of UTC (negative if
1259 the timezone is east of UTC).
1259 the timezone is east of UTC).
1260
1260
1261 The log command also accepts date ranges:
1261 The log command also accepts date ranges:
1262
1262
1263 - "<DATE" - at or before a given date/time
1263 - "<DATE" - at or before a given date/time
1264 - ">DATE" - on or after a given date/time
1264 - ">DATE" - on or after a given date/time
1265 - "DATE to DATE" - a date range, inclusive
1265 - "DATE to DATE" - a date range, inclusive
1266 - "-DAYS" - within a given number of days of today
1266 - "-DAYS" - within a given number of days of today
1267
1267
1268 Test repeated config section name
1268 Test repeated config section name
1269
1269
1270 $ hg help config.host
1270 $ hg help config.host
1271 "http_proxy.host"
1271 "http_proxy.host"
1272 Host name and (optional) port of the proxy server, for example
1272 Host name and (optional) port of the proxy server, for example
1273 "myproxy:8000".
1273 "myproxy:8000".
1274
1274
1275 "smtp.host"
1275 "smtp.host"
1276 Host name of mail server, e.g. "mail.example.com".
1276 Host name of mail server, e.g. "mail.example.com".
1277
1277
1278 Unrelated trailing paragraphs shouldn't be included
1278 Unrelated trailing paragraphs shouldn't be included
1279
1279
1280 $ hg help config.extramsg | grep '^$'
1280 $ hg help config.extramsg | grep '^$'
1281
1281
1282
1282
1283 Test capitalized section name
1283 Test capitalized section name
1284
1284
1285 $ hg help scripting.HGPLAIN > /dev/null
1285 $ hg help scripting.HGPLAIN > /dev/null
1286
1286
1287 Help subsection:
1287 Help subsection:
1288
1288
1289 $ hg help config.charsets |grep "Email example:" > /dev/null
1289 $ hg help config.charsets |grep "Email example:" > /dev/null
1290 [1]
1290 [1]
1291
1291
1292 Show nested definitions
1292 Show nested definitions
1293 ("profiling.type"[break]"ls"[break]"stat"[break])
1293 ("profiling.type"[break]"ls"[break]"stat"[break])
1294
1294
1295 $ hg help config.type | egrep '^$'|wc -l
1295 $ hg help config.type | egrep '^$'|wc -l
1296 \s*3 (re)
1296 \s*3 (re)
1297
1297
1298 Separate sections from subsections
1298 Separate sections from subsections
1299
1299
1300 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1300 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1301 "format"
1301 "format"
1302 --------
1302 --------
1303
1303
1304 "usegeneraldelta"
1304 "usegeneraldelta"
1305
1305
1306 "dotencode"
1306 "dotencode"
1307
1307
1308 "usefncache"
1308 "usefncache"
1309
1309
1310 "usestore"
1310 "usestore"
1311
1311
1312 "profiling"
1312 "profiling"
1313 -----------
1313 -----------
1314
1314
1315 "format"
1315 "format"
1316
1316
1317 "progress"
1317 "progress"
1318 ----------
1318 ----------
1319
1319
1320 "format"
1320 "format"
1321
1321
1322
1322
1323 Last item in help config.*:
1323 Last item in help config.*:
1324
1324
1325 $ hg help config.`hg help config|grep '^ "'| \
1325 $ hg help config.`hg help config|grep '^ "'| \
1326 > tail -1|sed 's![ "]*!!g'`| \
1326 > tail -1|sed 's![ "]*!!g'`| \
1327 > grep 'hg help -c config' > /dev/null
1327 > grep 'hg help -c config' > /dev/null
1328 [1]
1328 [1]
1329
1329
1330 note to use help -c for general hg help config:
1330 note to use help -c for general hg help config:
1331
1331
1332 $ hg help config |grep 'hg help -c config' > /dev/null
1332 $ hg help config |grep 'hg help -c config' > /dev/null
1333
1333
1334 Test templating help
1334 Test templating help
1335
1335
1336 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1336 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1337 desc String. The text of the changeset description.
1337 desc String. The text of the changeset description.
1338 diffstat String. Statistics of changes with the following format:
1338 diffstat String. Statistics of changes with the following format:
1339 firstline Any text. Returns the first line of text.
1339 firstline Any text. Returns the first line of text.
1340 nonempty Any text. Returns '(none)' if the string is empty.
1340 nonempty Any text. Returns '(none)' if the string is empty.
1341
1341
1342 Test deprecated items
1342 Test deprecated items
1343
1343
1344 $ hg help -v templating | grep currentbookmark
1344 $ hg help -v templating | grep currentbookmark
1345 currentbookmark
1345 currentbookmark
1346 $ hg help templating | (grep currentbookmark || true)
1346 $ hg help templating | (grep currentbookmark || true)
1347
1347
1348 Test help hooks
1348 Test help hooks
1349
1349
1350 $ cat > helphook1.py <<EOF
1350 $ cat > helphook1.py <<EOF
1351 > from mercurial import help
1351 > from mercurial import help
1352 >
1352 >
1353 > def rewrite(ui, topic, doc):
1353 > def rewrite(ui, topic, doc):
1354 > return doc + '\nhelphook1\n'
1354 > return doc + '\nhelphook1\n'
1355 >
1355 >
1356 > def extsetup(ui):
1356 > def extsetup(ui):
1357 > help.addtopichook('revisions', rewrite)
1357 > help.addtopichook('revisions', rewrite)
1358 > EOF
1358 > EOF
1359 $ cat > helphook2.py <<EOF
1359 $ cat > helphook2.py <<EOF
1360 > from mercurial import help
1360 > from mercurial import help
1361 >
1361 >
1362 > def rewrite(ui, topic, doc):
1362 > def rewrite(ui, topic, doc):
1363 > return doc + '\nhelphook2\n'
1363 > return doc + '\nhelphook2\n'
1364 >
1364 >
1365 > def extsetup(ui):
1365 > def extsetup(ui):
1366 > help.addtopichook('revisions', rewrite)
1366 > help.addtopichook('revisions', rewrite)
1367 > EOF
1367 > EOF
1368 $ echo '[extensions]' >> $HGRCPATH
1368 $ echo '[extensions]' >> $HGRCPATH
1369 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1369 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1370 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1370 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1371 $ hg help revsets | grep helphook
1371 $ hg help revsets | grep helphook
1372 helphook1
1372 helphook1
1373 helphook2
1373 helphook2
1374
1374
1375 help -c should only show debug --debug
1375 help -c should only show debug --debug
1376
1376
1377 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1377 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1378 [1]
1378 [1]
1379
1379
1380 help -c should only show deprecated for -v
1380 help -c should only show deprecated for -v
1381
1381
1382 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1382 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1383 [1]
1383 [1]
1384
1384
1385 Test -s / --system
1385 Test -s / --system
1386
1386
1387 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1387 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1388 > wc -l | sed -e 's/ //g'
1388 > wc -l | sed -e 's/ //g'
1389 0
1389 0
1390 $ hg help config.files --system unix | grep 'USER' | \
1390 $ hg help config.files --system unix | grep 'USER' | \
1391 > wc -l | sed -e 's/ //g'
1391 > wc -l | sed -e 's/ //g'
1392 0
1392 0
1393
1393
1394 Test -e / -c / -k combinations
1394 Test -e / -c / -k combinations
1395
1395
1396 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1396 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1397 Commands:
1397 Commands:
1398 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1398 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1399 Extensions:
1399 Extensions:
1400 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1400 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1401 Topics:
1401 Topics:
1402 Commands:
1402 Commands:
1403 Extensions:
1403 Extensions:
1404 Extension Commands:
1404 Extension Commands:
1405 $ hg help -c schemes
1405 $ hg help -c schemes
1406 abort: no such help topic: schemes
1406 abort: no such help topic: schemes
1407 (try 'hg help --keyword schemes')
1407 (try 'hg help --keyword schemes')
1408 [255]
1408 [255]
1409 $ hg help -e schemes |head -1
1409 $ hg help -e schemes |head -1
1410 schemes extension - extend schemes with shortcuts to repository swarms
1410 schemes extension - extend schemes with shortcuts to repository swarms
1411 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1411 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1412 Commands:
1412 Commands:
1413 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1413 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1414 Extensions:
1414 Extensions:
1415 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1415 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1416 Extensions:
1416 Extensions:
1417 Commands:
1417 Commands:
1418 $ hg help -c commit > /dev/null
1418 $ hg help -c commit > /dev/null
1419 $ hg help -e -c commit > /dev/null
1419 $ hg help -e -c commit > /dev/null
1420 $ hg help -e commit > /dev/null
1420 $ hg help -e commit > /dev/null
1421 abort: no such help topic: commit
1421 abort: no such help topic: commit
1422 (try 'hg help --keyword commit')
1422 (try 'hg help --keyword commit')
1423 [255]
1423 [255]
1424
1424
1425 Test keyword search help
1425 Test keyword search help
1426
1426
1427 $ cat > prefixedname.py <<EOF
1427 $ cat > prefixedname.py <<EOF
1428 > '''matched against word "clone"
1428 > '''matched against word "clone"
1429 > '''
1429 > '''
1430 > EOF
1430 > EOF
1431 $ echo '[extensions]' >> $HGRCPATH
1431 $ echo '[extensions]' >> $HGRCPATH
1432 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1432 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1433 $ hg help -k clone
1433 $ hg help -k clone
1434 Topics:
1434 Topics:
1435
1435
1436 config Configuration Files
1436 config Configuration Files
1437 extensions Using Additional Features
1437 extensions Using Additional Features
1438 glossary Glossary
1438 glossary Glossary
1439 phases Working with Phases
1439 phases Working with Phases
1440 subrepos Subrepositories
1440 subrepos Subrepositories
1441 urls URL Paths
1441 urls URL Paths
1442
1442
1443 Commands:
1443 Commands:
1444
1444
1445 bookmarks create a new bookmark or list existing bookmarks
1445 bookmarks create a new bookmark or list existing bookmarks
1446 clone make a copy of an existing repository
1446 clone make a copy of an existing repository
1447 paths show aliases for remote repositories
1447 paths show aliases for remote repositories
1448 update update working directory (or switch revisions)
1448 update update working directory (or switch revisions)
1449
1449
1450 Extensions:
1450 Extensions:
1451
1451
1452 clonebundles advertise pre-generated bundles to seed clones
1452 clonebundles advertise pre-generated bundles to seed clones
1453 prefixedname matched against word "clone"
1453 prefixedname matched against word "clone"
1454 relink recreates hardlinks between repository clones
1454 relink recreates hardlinks between repository clones
1455
1455
1456 Extension Commands:
1456 Extension Commands:
1457
1457
1458 qclone clone main and patch repository at same time
1458 qclone clone main and patch repository at same time
1459
1459
1460 Test unfound topic
1460 Test unfound topic
1461
1461
1462 $ hg help nonexistingtopicthatwillneverexisteverever
1462 $ hg help nonexistingtopicthatwillneverexisteverever
1463 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1463 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1464 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1464 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1465 [255]
1465 [255]
1466
1466
1467 Test unfound keyword
1467 Test unfound keyword
1468
1468
1469 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1469 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1470 abort: no matches
1470 abort: no matches
1471 (try 'hg help' for a list of topics)
1471 (try 'hg help' for a list of topics)
1472 [255]
1472 [255]
1473
1473
1474 Test omit indicating for help
1474 Test omit indicating for help
1475
1475
1476 $ cat > addverboseitems.py <<EOF
1476 $ cat > addverboseitems.py <<EOF
1477 > '''extension to test omit indicating.
1477 > '''extension to test omit indicating.
1478 >
1478 >
1479 > This paragraph is never omitted (for extension)
1479 > This paragraph is never omitted (for extension)
1480 >
1480 >
1481 > .. container:: verbose
1481 > .. container:: verbose
1482 >
1482 >
1483 > This paragraph is omitted,
1483 > This paragraph is omitted,
1484 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1484 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1485 >
1485 >
1486 > This paragraph is never omitted, too (for extension)
1486 > This paragraph is never omitted, too (for extension)
1487 > '''
1487 > '''
1488 >
1488 >
1489 > from mercurial import help, commands
1489 > from mercurial import help, commands
1490 > testtopic = """This paragraph is never omitted (for topic).
1490 > testtopic = """This paragraph is never omitted (for topic).
1491 >
1491 >
1492 > .. container:: verbose
1492 > .. container:: verbose
1493 >
1493 >
1494 > This paragraph is omitted,
1494 > This paragraph is omitted,
1495 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1495 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1496 >
1496 >
1497 > This paragraph is never omitted, too (for topic)
1497 > This paragraph is never omitted, too (for topic)
1498 > """
1498 > """
1499 > def extsetup(ui):
1499 > def extsetup(ui):
1500 > help.helptable.append((["topic-containing-verbose"],
1500 > help.helptable.append((["topic-containing-verbose"],
1501 > "This is the topic to test omit indicating.",
1501 > "This is the topic to test omit indicating.",
1502 > lambda ui: testtopic))
1502 > lambda ui: testtopic))
1503 > EOF
1503 > EOF
1504 $ echo '[extensions]' >> $HGRCPATH
1504 $ echo '[extensions]' >> $HGRCPATH
1505 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1505 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1506 $ hg help addverboseitems
1506 $ hg help addverboseitems
1507 addverboseitems extension - extension to test omit indicating.
1507 addverboseitems extension - extension to test omit indicating.
1508
1508
1509 This paragraph is never omitted (for extension)
1509 This paragraph is never omitted (for extension)
1510
1510
1511 This paragraph is never omitted, too (for extension)
1511 This paragraph is never omitted, too (for extension)
1512
1512
1513 (some details hidden, use --verbose to show complete help)
1513 (some details hidden, use --verbose to show complete help)
1514
1514
1515 no commands defined
1515 no commands defined
1516 $ hg help -v addverboseitems
1516 $ hg help -v addverboseitems
1517 addverboseitems extension - extension to test omit indicating.
1517 addverboseitems extension - extension to test omit indicating.
1518
1518
1519 This paragraph is never omitted (for extension)
1519 This paragraph is never omitted (for extension)
1520
1520
1521 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1521 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1522 extension)
1522 extension)
1523
1523
1524 This paragraph is never omitted, too (for extension)
1524 This paragraph is never omitted, too (for extension)
1525
1525
1526 no commands defined
1526 no commands defined
1527 $ hg help topic-containing-verbose
1527 $ hg help topic-containing-verbose
1528 This is the topic to test omit indicating.
1528 This is the topic to test omit indicating.
1529 """"""""""""""""""""""""""""""""""""""""""
1529 """"""""""""""""""""""""""""""""""""""""""
1530
1530
1531 This paragraph is never omitted (for topic).
1531 This paragraph is never omitted (for topic).
1532
1532
1533 This paragraph is never omitted, too (for topic)
1533 This paragraph is never omitted, too (for topic)
1534
1534
1535 (some details hidden, use --verbose to show complete help)
1535 (some details hidden, use --verbose to show complete help)
1536 $ hg help -v topic-containing-verbose
1536 $ hg help -v topic-containing-verbose
1537 This is the topic to test omit indicating.
1537 This is the topic to test omit indicating.
1538 """"""""""""""""""""""""""""""""""""""""""
1538 """"""""""""""""""""""""""""""""""""""""""
1539
1539
1540 This paragraph is never omitted (for topic).
1540 This paragraph is never omitted (for topic).
1541
1541
1542 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1542 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1543 topic)
1543 topic)
1544
1544
1545 This paragraph is never omitted, too (for topic)
1545 This paragraph is never omitted, too (for topic)
1546
1546
1547 Test section lookup
1547 Test section lookup
1548
1548
1549 $ hg help revset.merge
1549 $ hg help revset.merge
1550 "merge()"
1550 "merge()"
1551 Changeset is a merge changeset.
1551 Changeset is a merge changeset.
1552
1552
1553 $ hg help glossary.dag
1553 $ hg help glossary.dag
1554 DAG
1554 DAG
1555 The repository of changesets of a distributed version control system
1555 The repository of changesets of a distributed version control system
1556 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1556 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1557 of nodes and edges, where nodes correspond to changesets and edges
1557 of nodes and edges, where nodes correspond to changesets and edges
1558 imply a parent -> child relation. This graph can be visualized by
1558 imply a parent -> child relation. This graph can be visualized by
1559 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1559 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1560 limited by the requirement for children to have at most two parents.
1560 limited by the requirement for children to have at most two parents.
1561
1561
1562
1562
1563 $ hg help hgrc.paths
1563 $ hg help hgrc.paths
1564 "paths"
1564 "paths"
1565 -------
1565 -------
1566
1566
1567 Assigns symbolic names and behavior to repositories.
1567 Assigns symbolic names and behavior to repositories.
1568
1568
1569 Options are symbolic names defining the URL or directory that is the
1569 Options are symbolic names defining the URL or directory that is the
1570 location of the repository. Example:
1570 location of the repository. Example:
1571
1571
1572 [paths]
1572 [paths]
1573 my_server = https://example.com/my_repo
1573 my_server = https://example.com/my_repo
1574 local_path = /home/me/repo
1574 local_path = /home/me/repo
1575
1575
1576 These symbolic names can be used from the command line. To pull from
1576 These symbolic names can be used from the command line. To pull from
1577 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1577 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1578 local_path'.
1578 local_path'.
1579
1579
1580 Options containing colons (":") denote sub-options that can influence
1580 Options containing colons (":") denote sub-options that can influence
1581 behavior for that specific path. Example:
1581 behavior for that specific path. Example:
1582
1582
1583 [paths]
1583 [paths]
1584 my_server = https://example.com/my_path
1584 my_server = https://example.com/my_path
1585 my_server:pushurl = ssh://example.com/my_path
1585 my_server:pushurl = ssh://example.com/my_path
1586
1586
1587 The following sub-options can be defined:
1587 The following sub-options can be defined:
1588
1588
1589 "pushurl"
1589 "pushurl"
1590 The URL to use for push operations. If not defined, the location
1590 The URL to use for push operations. If not defined, the location
1591 defined by the path's main entry is used.
1591 defined by the path's main entry is used.
1592
1592
1593 "pushrev"
1593 "pushrev"
1594 A revset defining which revisions to push by default.
1594 A revset defining which revisions to push by default.
1595
1595
1596 When 'hg push' is executed without a "-r" argument, the revset defined
1596 When 'hg push' is executed without a "-r" argument, the revset defined
1597 by this sub-option is evaluated to determine what to push.
1597 by this sub-option is evaluated to determine what to push.
1598
1598
1599 For example, a value of "." will push the working directory's revision
1599 For example, a value of "." will push the working directory's revision
1600 by default.
1600 by default.
1601
1601
1602 Revsets specifying bookmarks will not result in the bookmark being
1602 Revsets specifying bookmarks will not result in the bookmark being
1603 pushed.
1603 pushed.
1604
1604
1605 The following special named paths exist:
1605 The following special named paths exist:
1606
1606
1607 "default"
1607 "default"
1608 The URL or directory to use when no source or remote is specified.
1608 The URL or directory to use when no source or remote is specified.
1609
1609
1610 'hg clone' will automatically define this path to the location the
1610 'hg clone' will automatically define this path to the location the
1611 repository was cloned from.
1611 repository was cloned from.
1612
1612
1613 "default-push"
1613 "default-push"
1614 (deprecated) The URL or directory for the default 'hg push' location.
1614 (deprecated) The URL or directory for the default 'hg push' location.
1615 "default:pushurl" should be used instead.
1615 "default:pushurl" should be used instead.
1616
1616
1617 $ hg help glossary.mcguffin
1617 $ hg help glossary.mcguffin
1618 abort: help section not found: glossary.mcguffin
1618 abort: help section not found: glossary.mcguffin
1619 [255]
1619 [255]
1620
1620
1621 $ hg help glossary.mc.guffin
1621 $ hg help glossary.mc.guffin
1622 abort: help section not found: glossary.mc.guffin
1622 abort: help section not found: glossary.mc.guffin
1623 [255]
1623 [255]
1624
1624
1625 $ hg help template.files
1625 $ hg help template.files
1626 files List of strings. All files modified, added, or removed by
1626 files List of strings. All files modified, added, or removed by
1627 this changeset.
1627 this changeset.
1628 files(pattern)
1628 files(pattern)
1629 All files of the current changeset matching the pattern. See
1629 All files of the current changeset matching the pattern. See
1630 'hg help patterns'.
1630 'hg help patterns'.
1631
1631
1632 Test section lookup by translated message
1632 Test section lookup by translated message
1633
1633
1634 str.lower() instead of encoding.lower(str) on translated message might
1634 str.lower() instead of encoding.lower(str) on translated message might
1635 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1635 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1636 as the second or later byte of multi-byte character.
1636 as the second or later byte of multi-byte character.
1637
1637
1638 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1638 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1639 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1639 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1640 replacement makes message meaningless.
1640 replacement makes message meaningless.
1641
1641
1642 This tests that section lookup by translated string isn't broken by
1642 This tests that section lookup by translated string isn't broken by
1643 such str.lower().
1643 such str.lower().
1644
1644
1645 $ python <<EOF
1645 $ python <<EOF
1646 > def escape(s):
1646 > def escape(s):
1647 > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932'))
1647 > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932'))
1648 > # translation of "record" in ja_JP.cp932
1648 > # translation of "record" in ja_JP.cp932
1649 > upper = "\x8bL\x98^"
1649 > upper = "\x8bL\x98^"
1650 > # str.lower()-ed section name should be treated as different one
1650 > # str.lower()-ed section name should be treated as different one
1651 > lower = "\x8bl\x98^"
1651 > lower = "\x8bl\x98^"
1652 > with open('ambiguous.py', 'w') as fp:
1652 > with open('ambiguous.py', 'w') as fp:
1653 > fp.write("""# ambiguous section names in ja_JP.cp932
1653 > fp.write("""# ambiguous section names in ja_JP.cp932
1654 > u'''summary of extension
1654 > u'''summary of extension
1655 >
1655 >
1656 > %s
1656 > %s
1657 > ----
1657 > ----
1658 >
1658 >
1659 > Upper name should show only this message
1659 > Upper name should show only this message
1660 >
1660 >
1661 > %s
1661 > %s
1662 > ----
1662 > ----
1663 >
1663 >
1664 > Lower name should show only this message
1664 > Lower name should show only this message
1665 >
1665 >
1666 > subsequent section
1666 > subsequent section
1667 > ------------------
1667 > ------------------
1668 >
1668 >
1669 > This should be hidden at 'hg help ambiguous' with section name.
1669 > This should be hidden at 'hg help ambiguous' with section name.
1670 > '''
1670 > '''
1671 > """ % (escape(upper), escape(lower)))
1671 > """ % (escape(upper), escape(lower)))
1672 > EOF
1672 > EOF
1673
1673
1674 $ cat >> $HGRCPATH <<EOF
1674 $ cat >> $HGRCPATH <<EOF
1675 > [extensions]
1675 > [extensions]
1676 > ambiguous = ./ambiguous.py
1676 > ambiguous = ./ambiguous.py
1677 > EOF
1677 > EOF
1678
1678
1679 $ python <<EOF | sh
1679 $ python <<EOF | sh
1680 > upper = "\x8bL\x98^"
1680 > upper = "\x8bL\x98^"
1681 > print "hg --encoding cp932 help -e ambiguous.%s" % upper
1681 > print "hg --encoding cp932 help -e ambiguous.%s" % upper
1682 > EOF
1682 > EOF
1683 \x8bL\x98^ (esc)
1683 \x8bL\x98^ (esc)
1684 ----
1684 ----
1685
1685
1686 Upper name should show only this message
1686 Upper name should show only this message
1687
1687
1688
1688
1689 $ python <<EOF | sh
1689 $ python <<EOF | sh
1690 > lower = "\x8bl\x98^"
1690 > lower = "\x8bl\x98^"
1691 > print "hg --encoding cp932 help -e ambiguous.%s" % lower
1691 > print "hg --encoding cp932 help -e ambiguous.%s" % lower
1692 > EOF
1692 > EOF
1693 \x8bl\x98^ (esc)
1693 \x8bl\x98^ (esc)
1694 ----
1694 ----
1695
1695
1696 Lower name should show only this message
1696 Lower name should show only this message
1697
1697
1698
1698
1699 $ cat >> $HGRCPATH <<EOF
1699 $ cat >> $HGRCPATH <<EOF
1700 > [extensions]
1700 > [extensions]
1701 > ambiguous = !
1701 > ambiguous = !
1702 > EOF
1702 > EOF
1703
1703
1704 Show help content of disabled extensions
1704 Show help content of disabled extensions
1705
1705
1706 $ cat >> $HGRCPATH <<EOF
1706 $ cat >> $HGRCPATH <<EOF
1707 > [extensions]
1707 > [extensions]
1708 > ambiguous = !./ambiguous.py
1708 > ambiguous = !./ambiguous.py
1709 > EOF
1709 > EOF
1710 $ hg help -e ambiguous
1710 $ hg help -e ambiguous
1711 ambiguous extension - (no help text available)
1711 ambiguous extension - (no help text available)
1712
1712
1713 (use 'hg help extensions' for information on enabling extensions)
1713 (use 'hg help extensions' for information on enabling extensions)
1714
1714
1715 Test dynamic list of merge tools only shows up once
1715 Test dynamic list of merge tools only shows up once
1716 $ hg help merge-tools
1716 $ hg help merge-tools
1717 Merge Tools
1717 Merge Tools
1718 """""""""""
1718 """""""""""
1719
1719
1720 To merge files Mercurial uses merge tools.
1720 To merge files Mercurial uses merge tools.
1721
1721
1722 A merge tool combines two different versions of a file into a merged file.
1722 A merge tool combines two different versions of a file into a merged file.
1723 Merge tools are given the two files and the greatest common ancestor of
1723 Merge tools are given the two files and the greatest common ancestor of
1724 the two file versions, so they can determine the changes made on both
1724 the two file versions, so they can determine the changes made on both
1725 branches.
1725 branches.
1726
1726
1727 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1727 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1728 backout' and in several extensions.
1728 backout' and in several extensions.
1729
1729
1730 Usually, the merge tool tries to automatically reconcile the files by
1730 Usually, the merge tool tries to automatically reconcile the files by
1731 combining all non-overlapping changes that occurred separately in the two
1731 combining all non-overlapping changes that occurred separately in the two
1732 different evolutions of the same initial base file. Furthermore, some
1732 different evolutions of the same initial base file. Furthermore, some
1733 interactive merge programs make it easier to manually resolve conflicting
1733 interactive merge programs make it easier to manually resolve conflicting
1734 merges, either in a graphical way, or by inserting some conflict markers.
1734 merges, either in a graphical way, or by inserting some conflict markers.
1735 Mercurial does not include any interactive merge programs but relies on
1735 Mercurial does not include any interactive merge programs but relies on
1736 external tools for that.
1736 external tools for that.
1737
1737
1738 Available merge tools
1738 Available merge tools
1739 =====================
1739 =====================
1740
1740
1741 External merge tools and their properties are configured in the merge-
1741 External merge tools and their properties are configured in the merge-
1742 tools configuration section - see hgrc(5) - but they can often just be
1742 tools configuration section - see hgrc(5) - but they can often just be
1743 named by their executable.
1743 named by their executable.
1744
1744
1745 A merge tool is generally usable if its executable can be found on the
1745 A merge tool is generally usable if its executable can be found on the
1746 system and if it can handle the merge. The executable is found if it is an
1746 system and if it can handle the merge. The executable is found if it is an
1747 absolute or relative executable path or the name of an application in the
1747 absolute or relative executable path or the name of an application in the
1748 executable search path. The tool is assumed to be able to handle the merge
1748 executable search path. The tool is assumed to be able to handle the merge
1749 if it can handle symlinks if the file is a symlink, if it can handle
1749 if it can handle symlinks if the file is a symlink, if it can handle
1750 binary files if the file is binary, and if a GUI is available if the tool
1750 binary files if the file is binary, and if a GUI is available if the tool
1751 requires a GUI.
1751 requires a GUI.
1752
1752
1753 There are some internal merge tools which can be used. The internal merge
1753 There are some internal merge tools which can be used. The internal merge
1754 tools are:
1754 tools are:
1755
1755
1756 ":dump"
1756 ":dump"
1757 Creates three versions of the files to merge, containing the contents of
1757 Creates three versions of the files to merge, containing the contents of
1758 local, other and base. These files can then be used to perform a merge
1758 local, other and base. These files can then be used to perform a merge
1759 manually. If the file to be merged is named "a.txt", these files will
1759 manually. If the file to be merged is named "a.txt", these files will
1760 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1760 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1761 they will be placed in the same directory as "a.txt".
1761 they will be placed in the same directory as "a.txt".
1762
1762
1763 ":fail"
1763 ":fail"
1764 Rather than attempting to merge files that were modified on both
1764 Rather than attempting to merge files that were modified on both
1765 branches, it marks them as unresolved. The resolve command must be used
1765 branches, it marks them as unresolved. The resolve command must be used
1766 to resolve these conflicts.
1766 to resolve these conflicts.
1767
1767
1768 ":local"
1768 ":local"
1769 Uses the local 'p1()' version of files as the merged version.
1769 Uses the local 'p1()' version of files as the merged version.
1770
1770
1771 ":merge"
1771 ":merge"
1772 Uses the internal non-interactive simple merge algorithm for merging
1772 Uses the internal non-interactive simple merge algorithm for merging
1773 files. It will fail if there are any conflicts and leave markers in the
1773 files. It will fail if there are any conflicts and leave markers in the
1774 partially merged file. Markers will have two sections, one for each side
1774 partially merged file. Markers will have two sections, one for each side
1775 of merge.
1775 of merge.
1776
1776
1777 ":merge-local"
1777 ":merge-local"
1778 Like :merge, but resolve all conflicts non-interactively in favor of the
1778 Like :merge, but resolve all conflicts non-interactively in favor of the
1779 local 'p1()' changes.
1779 local 'p1()' changes.
1780
1780
1781 ":merge-other"
1781 ":merge-other"
1782 Like :merge, but resolve all conflicts non-interactively in favor of the
1782 Like :merge, but resolve all conflicts non-interactively in favor of the
1783 other 'p2()' changes.
1783 other 'p2()' changes.
1784
1784
1785 ":merge3"
1785 ":merge3"
1786 Uses the internal non-interactive simple merge algorithm for merging
1786 Uses the internal non-interactive simple merge algorithm for merging
1787 files. It will fail if there are any conflicts and leave markers in the
1787 files. It will fail if there are any conflicts and leave markers in the
1788 partially merged file. Marker will have three sections, one from each
1788 partially merged file. Marker will have three sections, one from each
1789 side of the merge and one for the base content.
1789 side of the merge and one for the base content.
1790
1790
1791 ":other"
1791 ":other"
1792 Uses the other 'p2()' version of files as the merged version.
1792 Uses the other 'p2()' version of files as the merged version.
1793
1793
1794 ":prompt"
1794 ":prompt"
1795 Asks the user which of the local 'p1()' or the other 'p2()' version to
1795 Asks the user which of the local 'p1()' or the other 'p2()' version to
1796 keep as the merged version.
1796 keep as the merged version.
1797
1797
1798 ":tagmerge"
1798 ":tagmerge"
1799 Uses the internal tag merge algorithm (experimental).
1799 Uses the internal tag merge algorithm (experimental).
1800
1800
1801 ":union"
1801 ":union"
1802 Uses the internal non-interactive simple merge algorithm for merging
1802 Uses the internal non-interactive simple merge algorithm for merging
1803 files. It will use both left and right sides for conflict regions. No
1803 files. It will use both left and right sides for conflict regions. No
1804 markers are inserted.
1804 markers are inserted.
1805
1805
1806 Internal tools are always available and do not require a GUI but will by
1806 Internal tools are always available and do not require a GUI but will by
1807 default not handle symlinks or binary files.
1807 default not handle symlinks or binary files.
1808
1808
1809 Choosing a merge tool
1809 Choosing a merge tool
1810 =====================
1810 =====================
1811
1811
1812 Mercurial uses these rules when deciding which merge tool to use:
1812 Mercurial uses these rules when deciding which merge tool to use:
1813
1813
1814 1. If a tool has been specified with the --tool option to merge or
1814 1. If a tool has been specified with the --tool option to merge or
1815 resolve, it is used. If it is the name of a tool in the merge-tools
1815 resolve, it is used. If it is the name of a tool in the merge-tools
1816 configuration, its configuration is used. Otherwise the specified tool
1816 configuration, its configuration is used. Otherwise the specified tool
1817 must be executable by the shell.
1817 must be executable by the shell.
1818 2. If the "HGMERGE" environment variable is present, its value is used and
1818 2. If the "HGMERGE" environment variable is present, its value is used and
1819 must be executable by the shell.
1819 must be executable by the shell.
1820 3. If the filename of the file to be merged matches any of the patterns in
1820 3. If the filename of the file to be merged matches any of the patterns in
1821 the merge-patterns configuration section, the first usable merge tool
1821 the merge-patterns configuration section, the first usable merge tool
1822 corresponding to a matching pattern is used. Here, binary capabilities
1822 corresponding to a matching pattern is used. Here, binary capabilities
1823 of the merge tool are not considered.
1823 of the merge tool are not considered.
1824 4. If ui.merge is set it will be considered next. If the value is not the
1824 4. If ui.merge is set it will be considered next. If the value is not the
1825 name of a configured tool, the specified value is used and must be
1825 name of a configured tool, the specified value is used and must be
1826 executable by the shell. Otherwise the named tool is used if it is
1826 executable by the shell. Otherwise the named tool is used if it is
1827 usable.
1827 usable.
1828 5. If any usable merge tools are present in the merge-tools configuration
1828 5. If any usable merge tools are present in the merge-tools configuration
1829 section, the one with the highest priority is used.
1829 section, the one with the highest priority is used.
1830 6. If a program named "hgmerge" can be found on the system, it is used -
1830 6. If a program named "hgmerge" can be found on the system, it is used -
1831 but it will by default not be used for symlinks and binary files.
1831 but it will by default not be used for symlinks and binary files.
1832 7. If the file to be merged is not binary and is not a symlink, then
1832 7. If the file to be merged is not binary and is not a symlink, then
1833 internal ":merge" is used.
1833 internal ":merge" is used.
1834 8. The merge of the file fails and must be resolved before commit.
1834 8. Otherwise, ":prompt" is used.
1835
1835
1836 Note:
1836 Note:
1837 After selecting a merge program, Mercurial will by default attempt to
1837 After selecting a merge program, Mercurial will by default attempt to
1838 merge the files using a simple merge algorithm first. Only if it
1838 merge the files using a simple merge algorithm first. Only if it
1839 doesn't succeed because of conflicting changes Mercurial will actually
1839 doesn't succeed because of conflicting changes Mercurial will actually
1840 execute the merge program. Whether to use the simple merge algorithm
1840 execute the merge program. Whether to use the simple merge algorithm
1841 first can be controlled by the premerge setting of the merge tool.
1841 first can be controlled by the premerge setting of the merge tool.
1842 Premerge is enabled by default unless the file is binary or a symlink.
1842 Premerge is enabled by default unless the file is binary or a symlink.
1843
1843
1844 See the merge-tools and ui sections of hgrc(5) for details on the
1844 See the merge-tools and ui sections of hgrc(5) for details on the
1845 configuration of merge tools.
1845 configuration of merge tools.
1846
1846
1847 Compression engines listed in `hg help bundlespec`
1847 Compression engines listed in `hg help bundlespec`
1848
1848
1849 $ hg help bundlespec | grep gzip
1849 $ hg help bundlespec | grep gzip
1850 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
1850 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
1851 An algorithm that produces smaller bundles than "gzip".
1851 An algorithm that produces smaller bundles than "gzip".
1852 This engine will likely produce smaller bundles than "gzip" but will be
1852 This engine will likely produce smaller bundles than "gzip" but will be
1853 "gzip"
1853 "gzip"
1854 better compression than "gzip". It also frequently yields better (?)
1854 better compression than "gzip". It also frequently yields better (?)
1855
1855
1856 Test usage of section marks in help documents
1856 Test usage of section marks in help documents
1857
1857
1858 $ cd "$TESTDIR"/../doc
1858 $ cd "$TESTDIR"/../doc
1859 $ python check-seclevel.py
1859 $ python check-seclevel.py
1860 $ cd $TESTTMP
1860 $ cd $TESTTMP
1861
1861
1862 #if serve
1862 #if serve
1863
1863
1864 Test the help pages in hgweb.
1864 Test the help pages in hgweb.
1865
1865
1866 Dish up an empty repo; serve it cold.
1866 Dish up an empty repo; serve it cold.
1867
1867
1868 $ hg init "$TESTTMP/test"
1868 $ hg init "$TESTTMP/test"
1869 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1869 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1870 $ cat hg.pid >> $DAEMON_PIDS
1870 $ cat hg.pid >> $DAEMON_PIDS
1871
1871
1872 $ get-with-headers.py $LOCALIP:$HGPORT "help"
1872 $ get-with-headers.py $LOCALIP:$HGPORT "help"
1873 200 Script output follows
1873 200 Script output follows
1874
1874
1875 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1875 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1876 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1876 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1877 <head>
1877 <head>
1878 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1878 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1879 <meta name="robots" content="index, nofollow" />
1879 <meta name="robots" content="index, nofollow" />
1880 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1880 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1881 <script type="text/javascript" src="/static/mercurial.js"></script>
1881 <script type="text/javascript" src="/static/mercurial.js"></script>
1882
1882
1883 <title>Help: Index</title>
1883 <title>Help: Index</title>
1884 </head>
1884 </head>
1885 <body>
1885 <body>
1886
1886
1887 <div class="container">
1887 <div class="container">
1888 <div class="menu">
1888 <div class="menu">
1889 <div class="logo">
1889 <div class="logo">
1890 <a href="https://mercurial-scm.org/">
1890 <a href="https://mercurial-scm.org/">
1891 <img src="/static/hglogo.png" alt="mercurial" /></a>
1891 <img src="/static/hglogo.png" alt="mercurial" /></a>
1892 </div>
1892 </div>
1893 <ul>
1893 <ul>
1894 <li><a href="/shortlog">log</a></li>
1894 <li><a href="/shortlog">log</a></li>
1895 <li><a href="/graph">graph</a></li>
1895 <li><a href="/graph">graph</a></li>
1896 <li><a href="/tags">tags</a></li>
1896 <li><a href="/tags">tags</a></li>
1897 <li><a href="/bookmarks">bookmarks</a></li>
1897 <li><a href="/bookmarks">bookmarks</a></li>
1898 <li><a href="/branches">branches</a></li>
1898 <li><a href="/branches">branches</a></li>
1899 </ul>
1899 </ul>
1900 <ul>
1900 <ul>
1901 <li class="active">help</li>
1901 <li class="active">help</li>
1902 </ul>
1902 </ul>
1903 </div>
1903 </div>
1904
1904
1905 <div class="main">
1905 <div class="main">
1906 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1906 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1907 <form class="search" action="/log">
1907 <form class="search" action="/log">
1908
1908
1909 <p><input name="rev" id="search1" type="text" size="30" /></p>
1909 <p><input name="rev" id="search1" type="text" size="30" /></p>
1910 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1910 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1911 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1911 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1912 </form>
1912 </form>
1913 <table class="bigtable">
1913 <table class="bigtable">
1914 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
1914 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
1915
1915
1916 <tr><td>
1916 <tr><td>
1917 <a href="/help/bundlespec">
1917 <a href="/help/bundlespec">
1918 bundlespec
1918 bundlespec
1919 </a>
1919 </a>
1920 </td><td>
1920 </td><td>
1921 Bundle File Formats
1921 Bundle File Formats
1922 </td></tr>
1922 </td></tr>
1923 <tr><td>
1923 <tr><td>
1924 <a href="/help/color">
1924 <a href="/help/color">
1925 color
1925 color
1926 </a>
1926 </a>
1927 </td><td>
1927 </td><td>
1928 Colorizing Outputs
1928 Colorizing Outputs
1929 </td></tr>
1929 </td></tr>
1930 <tr><td>
1930 <tr><td>
1931 <a href="/help/config">
1931 <a href="/help/config">
1932 config
1932 config
1933 </a>
1933 </a>
1934 </td><td>
1934 </td><td>
1935 Configuration Files
1935 Configuration Files
1936 </td></tr>
1936 </td></tr>
1937 <tr><td>
1937 <tr><td>
1938 <a href="/help/dates">
1938 <a href="/help/dates">
1939 dates
1939 dates
1940 </a>
1940 </a>
1941 </td><td>
1941 </td><td>
1942 Date Formats
1942 Date Formats
1943 </td></tr>
1943 </td></tr>
1944 <tr><td>
1944 <tr><td>
1945 <a href="/help/diffs">
1945 <a href="/help/diffs">
1946 diffs
1946 diffs
1947 </a>
1947 </a>
1948 </td><td>
1948 </td><td>
1949 Diff Formats
1949 Diff Formats
1950 </td></tr>
1950 </td></tr>
1951 <tr><td>
1951 <tr><td>
1952 <a href="/help/environment">
1952 <a href="/help/environment">
1953 environment
1953 environment
1954 </a>
1954 </a>
1955 </td><td>
1955 </td><td>
1956 Environment Variables
1956 Environment Variables
1957 </td></tr>
1957 </td></tr>
1958 <tr><td>
1958 <tr><td>
1959 <a href="/help/extensions">
1959 <a href="/help/extensions">
1960 extensions
1960 extensions
1961 </a>
1961 </a>
1962 </td><td>
1962 </td><td>
1963 Using Additional Features
1963 Using Additional Features
1964 </td></tr>
1964 </td></tr>
1965 <tr><td>
1965 <tr><td>
1966 <a href="/help/filesets">
1966 <a href="/help/filesets">
1967 filesets
1967 filesets
1968 </a>
1968 </a>
1969 </td><td>
1969 </td><td>
1970 Specifying File Sets
1970 Specifying File Sets
1971 </td></tr>
1971 </td></tr>
1972 <tr><td>
1972 <tr><td>
1973 <a href="/help/glossary">
1973 <a href="/help/glossary">
1974 glossary
1974 glossary
1975 </a>
1975 </a>
1976 </td><td>
1976 </td><td>
1977 Glossary
1977 Glossary
1978 </td></tr>
1978 </td></tr>
1979 <tr><td>
1979 <tr><td>
1980 <a href="/help/hgignore">
1980 <a href="/help/hgignore">
1981 hgignore
1981 hgignore
1982 </a>
1982 </a>
1983 </td><td>
1983 </td><td>
1984 Syntax for Mercurial Ignore Files
1984 Syntax for Mercurial Ignore Files
1985 </td></tr>
1985 </td></tr>
1986 <tr><td>
1986 <tr><td>
1987 <a href="/help/hgweb">
1987 <a href="/help/hgweb">
1988 hgweb
1988 hgweb
1989 </a>
1989 </a>
1990 </td><td>
1990 </td><td>
1991 Configuring hgweb
1991 Configuring hgweb
1992 </td></tr>
1992 </td></tr>
1993 <tr><td>
1993 <tr><td>
1994 <a href="/help/internals">
1994 <a href="/help/internals">
1995 internals
1995 internals
1996 </a>
1996 </a>
1997 </td><td>
1997 </td><td>
1998 Technical implementation topics
1998 Technical implementation topics
1999 </td></tr>
1999 </td></tr>
2000 <tr><td>
2000 <tr><td>
2001 <a href="/help/merge-tools">
2001 <a href="/help/merge-tools">
2002 merge-tools
2002 merge-tools
2003 </a>
2003 </a>
2004 </td><td>
2004 </td><td>
2005 Merge Tools
2005 Merge Tools
2006 </td></tr>
2006 </td></tr>
2007 <tr><td>
2007 <tr><td>
2008 <a href="/help/pager">
2008 <a href="/help/pager">
2009 pager
2009 pager
2010 </a>
2010 </a>
2011 </td><td>
2011 </td><td>
2012 Pager Support
2012 Pager Support
2013 </td></tr>
2013 </td></tr>
2014 <tr><td>
2014 <tr><td>
2015 <a href="/help/patterns">
2015 <a href="/help/patterns">
2016 patterns
2016 patterns
2017 </a>
2017 </a>
2018 </td><td>
2018 </td><td>
2019 File Name Patterns
2019 File Name Patterns
2020 </td></tr>
2020 </td></tr>
2021 <tr><td>
2021 <tr><td>
2022 <a href="/help/phases">
2022 <a href="/help/phases">
2023 phases
2023 phases
2024 </a>
2024 </a>
2025 </td><td>
2025 </td><td>
2026 Working with Phases
2026 Working with Phases
2027 </td></tr>
2027 </td></tr>
2028 <tr><td>
2028 <tr><td>
2029 <a href="/help/revisions">
2029 <a href="/help/revisions">
2030 revisions
2030 revisions
2031 </a>
2031 </a>
2032 </td><td>
2032 </td><td>
2033 Specifying Revisions
2033 Specifying Revisions
2034 </td></tr>
2034 </td></tr>
2035 <tr><td>
2035 <tr><td>
2036 <a href="/help/scripting">
2036 <a href="/help/scripting">
2037 scripting
2037 scripting
2038 </a>
2038 </a>
2039 </td><td>
2039 </td><td>
2040 Using Mercurial from scripts and automation
2040 Using Mercurial from scripts and automation
2041 </td></tr>
2041 </td></tr>
2042 <tr><td>
2042 <tr><td>
2043 <a href="/help/subrepos">
2043 <a href="/help/subrepos">
2044 subrepos
2044 subrepos
2045 </a>
2045 </a>
2046 </td><td>
2046 </td><td>
2047 Subrepositories
2047 Subrepositories
2048 </td></tr>
2048 </td></tr>
2049 <tr><td>
2049 <tr><td>
2050 <a href="/help/templating">
2050 <a href="/help/templating">
2051 templating
2051 templating
2052 </a>
2052 </a>
2053 </td><td>
2053 </td><td>
2054 Template Usage
2054 Template Usage
2055 </td></tr>
2055 </td></tr>
2056 <tr><td>
2056 <tr><td>
2057 <a href="/help/urls">
2057 <a href="/help/urls">
2058 urls
2058 urls
2059 </a>
2059 </a>
2060 </td><td>
2060 </td><td>
2061 URL Paths
2061 URL Paths
2062 </td></tr>
2062 </td></tr>
2063 <tr><td>
2063 <tr><td>
2064 <a href="/help/topic-containing-verbose">
2064 <a href="/help/topic-containing-verbose">
2065 topic-containing-verbose
2065 topic-containing-verbose
2066 </a>
2066 </a>
2067 </td><td>
2067 </td><td>
2068 This is the topic to test omit indicating.
2068 This is the topic to test omit indicating.
2069 </td></tr>
2069 </td></tr>
2070
2070
2071
2071
2072 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2072 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2073
2073
2074 <tr><td>
2074 <tr><td>
2075 <a href="/help/add">
2075 <a href="/help/add">
2076 add
2076 add
2077 </a>
2077 </a>
2078 </td><td>
2078 </td><td>
2079 add the specified files on the next commit
2079 add the specified files on the next commit
2080 </td></tr>
2080 </td></tr>
2081 <tr><td>
2081 <tr><td>
2082 <a href="/help/annotate">
2082 <a href="/help/annotate">
2083 annotate
2083 annotate
2084 </a>
2084 </a>
2085 </td><td>
2085 </td><td>
2086 show changeset information by line for each file
2086 show changeset information by line for each file
2087 </td></tr>
2087 </td></tr>
2088 <tr><td>
2088 <tr><td>
2089 <a href="/help/clone">
2089 <a href="/help/clone">
2090 clone
2090 clone
2091 </a>
2091 </a>
2092 </td><td>
2092 </td><td>
2093 make a copy of an existing repository
2093 make a copy of an existing repository
2094 </td></tr>
2094 </td></tr>
2095 <tr><td>
2095 <tr><td>
2096 <a href="/help/commit">
2096 <a href="/help/commit">
2097 commit
2097 commit
2098 </a>
2098 </a>
2099 </td><td>
2099 </td><td>
2100 commit the specified files or all outstanding changes
2100 commit the specified files or all outstanding changes
2101 </td></tr>
2101 </td></tr>
2102 <tr><td>
2102 <tr><td>
2103 <a href="/help/diff">
2103 <a href="/help/diff">
2104 diff
2104 diff
2105 </a>
2105 </a>
2106 </td><td>
2106 </td><td>
2107 diff repository (or selected files)
2107 diff repository (or selected files)
2108 </td></tr>
2108 </td></tr>
2109 <tr><td>
2109 <tr><td>
2110 <a href="/help/export">
2110 <a href="/help/export">
2111 export
2111 export
2112 </a>
2112 </a>
2113 </td><td>
2113 </td><td>
2114 dump the header and diffs for one or more changesets
2114 dump the header and diffs for one or more changesets
2115 </td></tr>
2115 </td></tr>
2116 <tr><td>
2116 <tr><td>
2117 <a href="/help/forget">
2117 <a href="/help/forget">
2118 forget
2118 forget
2119 </a>
2119 </a>
2120 </td><td>
2120 </td><td>
2121 forget the specified files on the next commit
2121 forget the specified files on the next commit
2122 </td></tr>
2122 </td></tr>
2123 <tr><td>
2123 <tr><td>
2124 <a href="/help/init">
2124 <a href="/help/init">
2125 init
2125 init
2126 </a>
2126 </a>
2127 </td><td>
2127 </td><td>
2128 create a new repository in the given directory
2128 create a new repository in the given directory
2129 </td></tr>
2129 </td></tr>
2130 <tr><td>
2130 <tr><td>
2131 <a href="/help/log">
2131 <a href="/help/log">
2132 log
2132 log
2133 </a>
2133 </a>
2134 </td><td>
2134 </td><td>
2135 show revision history of entire repository or files
2135 show revision history of entire repository or files
2136 </td></tr>
2136 </td></tr>
2137 <tr><td>
2137 <tr><td>
2138 <a href="/help/merge">
2138 <a href="/help/merge">
2139 merge
2139 merge
2140 </a>
2140 </a>
2141 </td><td>
2141 </td><td>
2142 merge another revision into working directory
2142 merge another revision into working directory
2143 </td></tr>
2143 </td></tr>
2144 <tr><td>
2144 <tr><td>
2145 <a href="/help/pull">
2145 <a href="/help/pull">
2146 pull
2146 pull
2147 </a>
2147 </a>
2148 </td><td>
2148 </td><td>
2149 pull changes from the specified source
2149 pull changes from the specified source
2150 </td></tr>
2150 </td></tr>
2151 <tr><td>
2151 <tr><td>
2152 <a href="/help/push">
2152 <a href="/help/push">
2153 push
2153 push
2154 </a>
2154 </a>
2155 </td><td>
2155 </td><td>
2156 push changes to the specified destination
2156 push changes to the specified destination
2157 </td></tr>
2157 </td></tr>
2158 <tr><td>
2158 <tr><td>
2159 <a href="/help/remove">
2159 <a href="/help/remove">
2160 remove
2160 remove
2161 </a>
2161 </a>
2162 </td><td>
2162 </td><td>
2163 remove the specified files on the next commit
2163 remove the specified files on the next commit
2164 </td></tr>
2164 </td></tr>
2165 <tr><td>
2165 <tr><td>
2166 <a href="/help/serve">
2166 <a href="/help/serve">
2167 serve
2167 serve
2168 </a>
2168 </a>
2169 </td><td>
2169 </td><td>
2170 start stand-alone webserver
2170 start stand-alone webserver
2171 </td></tr>
2171 </td></tr>
2172 <tr><td>
2172 <tr><td>
2173 <a href="/help/status">
2173 <a href="/help/status">
2174 status
2174 status
2175 </a>
2175 </a>
2176 </td><td>
2176 </td><td>
2177 show changed files in the working directory
2177 show changed files in the working directory
2178 </td></tr>
2178 </td></tr>
2179 <tr><td>
2179 <tr><td>
2180 <a href="/help/summary">
2180 <a href="/help/summary">
2181 summary
2181 summary
2182 </a>
2182 </a>
2183 </td><td>
2183 </td><td>
2184 summarize working directory state
2184 summarize working directory state
2185 </td></tr>
2185 </td></tr>
2186 <tr><td>
2186 <tr><td>
2187 <a href="/help/update">
2187 <a href="/help/update">
2188 update
2188 update
2189 </a>
2189 </a>
2190 </td><td>
2190 </td><td>
2191 update working directory (or switch revisions)
2191 update working directory (or switch revisions)
2192 </td></tr>
2192 </td></tr>
2193
2193
2194
2194
2195
2195
2196 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2196 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2197
2197
2198 <tr><td>
2198 <tr><td>
2199 <a href="/help/addremove">
2199 <a href="/help/addremove">
2200 addremove
2200 addremove
2201 </a>
2201 </a>
2202 </td><td>
2202 </td><td>
2203 add all new files, delete all missing files
2203 add all new files, delete all missing files
2204 </td></tr>
2204 </td></tr>
2205 <tr><td>
2205 <tr><td>
2206 <a href="/help/archive">
2206 <a href="/help/archive">
2207 archive
2207 archive
2208 </a>
2208 </a>
2209 </td><td>
2209 </td><td>
2210 create an unversioned archive of a repository revision
2210 create an unversioned archive of a repository revision
2211 </td></tr>
2211 </td></tr>
2212 <tr><td>
2212 <tr><td>
2213 <a href="/help/backout">
2213 <a href="/help/backout">
2214 backout
2214 backout
2215 </a>
2215 </a>
2216 </td><td>
2216 </td><td>
2217 reverse effect of earlier changeset
2217 reverse effect of earlier changeset
2218 </td></tr>
2218 </td></tr>
2219 <tr><td>
2219 <tr><td>
2220 <a href="/help/bisect">
2220 <a href="/help/bisect">
2221 bisect
2221 bisect
2222 </a>
2222 </a>
2223 </td><td>
2223 </td><td>
2224 subdivision search of changesets
2224 subdivision search of changesets
2225 </td></tr>
2225 </td></tr>
2226 <tr><td>
2226 <tr><td>
2227 <a href="/help/bookmarks">
2227 <a href="/help/bookmarks">
2228 bookmarks
2228 bookmarks
2229 </a>
2229 </a>
2230 </td><td>
2230 </td><td>
2231 create a new bookmark or list existing bookmarks
2231 create a new bookmark or list existing bookmarks
2232 </td></tr>
2232 </td></tr>
2233 <tr><td>
2233 <tr><td>
2234 <a href="/help/branch">
2234 <a href="/help/branch">
2235 branch
2235 branch
2236 </a>
2236 </a>
2237 </td><td>
2237 </td><td>
2238 set or show the current branch name
2238 set or show the current branch name
2239 </td></tr>
2239 </td></tr>
2240 <tr><td>
2240 <tr><td>
2241 <a href="/help/branches">
2241 <a href="/help/branches">
2242 branches
2242 branches
2243 </a>
2243 </a>
2244 </td><td>
2244 </td><td>
2245 list repository named branches
2245 list repository named branches
2246 </td></tr>
2246 </td></tr>
2247 <tr><td>
2247 <tr><td>
2248 <a href="/help/bundle">
2248 <a href="/help/bundle">
2249 bundle
2249 bundle
2250 </a>
2250 </a>
2251 </td><td>
2251 </td><td>
2252 create a bundle file
2252 create a bundle file
2253 </td></tr>
2253 </td></tr>
2254 <tr><td>
2254 <tr><td>
2255 <a href="/help/cat">
2255 <a href="/help/cat">
2256 cat
2256 cat
2257 </a>
2257 </a>
2258 </td><td>
2258 </td><td>
2259 output the current or given revision of files
2259 output the current or given revision of files
2260 </td></tr>
2260 </td></tr>
2261 <tr><td>
2261 <tr><td>
2262 <a href="/help/config">
2262 <a href="/help/config">
2263 config
2263 config
2264 </a>
2264 </a>
2265 </td><td>
2265 </td><td>
2266 show combined config settings from all hgrc files
2266 show combined config settings from all hgrc files
2267 </td></tr>
2267 </td></tr>
2268 <tr><td>
2268 <tr><td>
2269 <a href="/help/copy">
2269 <a href="/help/copy">
2270 copy
2270 copy
2271 </a>
2271 </a>
2272 </td><td>
2272 </td><td>
2273 mark files as copied for the next commit
2273 mark files as copied for the next commit
2274 </td></tr>
2274 </td></tr>
2275 <tr><td>
2275 <tr><td>
2276 <a href="/help/files">
2276 <a href="/help/files">
2277 files
2277 files
2278 </a>
2278 </a>
2279 </td><td>
2279 </td><td>
2280 list tracked files
2280 list tracked files
2281 </td></tr>
2281 </td></tr>
2282 <tr><td>
2282 <tr><td>
2283 <a href="/help/graft">
2283 <a href="/help/graft">
2284 graft
2284 graft
2285 </a>
2285 </a>
2286 </td><td>
2286 </td><td>
2287 copy changes from other branches onto the current branch
2287 copy changes from other branches onto the current branch
2288 </td></tr>
2288 </td></tr>
2289 <tr><td>
2289 <tr><td>
2290 <a href="/help/grep">
2290 <a href="/help/grep">
2291 grep
2291 grep
2292 </a>
2292 </a>
2293 </td><td>
2293 </td><td>
2294 search revision history for a pattern in specified files
2294 search revision history for a pattern in specified files
2295 </td></tr>
2295 </td></tr>
2296 <tr><td>
2296 <tr><td>
2297 <a href="/help/heads">
2297 <a href="/help/heads">
2298 heads
2298 heads
2299 </a>
2299 </a>
2300 </td><td>
2300 </td><td>
2301 show branch heads
2301 show branch heads
2302 </td></tr>
2302 </td></tr>
2303 <tr><td>
2303 <tr><td>
2304 <a href="/help/help">
2304 <a href="/help/help">
2305 help
2305 help
2306 </a>
2306 </a>
2307 </td><td>
2307 </td><td>
2308 show help for a given topic or a help overview
2308 show help for a given topic or a help overview
2309 </td></tr>
2309 </td></tr>
2310 <tr><td>
2310 <tr><td>
2311 <a href="/help/hgalias">
2311 <a href="/help/hgalias">
2312 hgalias
2312 hgalias
2313 </a>
2313 </a>
2314 </td><td>
2314 </td><td>
2315 summarize working directory state
2315 summarize working directory state
2316 </td></tr>
2316 </td></tr>
2317 <tr><td>
2317 <tr><td>
2318 <a href="/help/identify">
2318 <a href="/help/identify">
2319 identify
2319 identify
2320 </a>
2320 </a>
2321 </td><td>
2321 </td><td>
2322 identify the working directory or specified revision
2322 identify the working directory or specified revision
2323 </td></tr>
2323 </td></tr>
2324 <tr><td>
2324 <tr><td>
2325 <a href="/help/import">
2325 <a href="/help/import">
2326 import
2326 import
2327 </a>
2327 </a>
2328 </td><td>
2328 </td><td>
2329 import an ordered set of patches
2329 import an ordered set of patches
2330 </td></tr>
2330 </td></tr>
2331 <tr><td>
2331 <tr><td>
2332 <a href="/help/incoming">
2332 <a href="/help/incoming">
2333 incoming
2333 incoming
2334 </a>
2334 </a>
2335 </td><td>
2335 </td><td>
2336 show new changesets found in source
2336 show new changesets found in source
2337 </td></tr>
2337 </td></tr>
2338 <tr><td>
2338 <tr><td>
2339 <a href="/help/manifest">
2339 <a href="/help/manifest">
2340 manifest
2340 manifest
2341 </a>
2341 </a>
2342 </td><td>
2342 </td><td>
2343 output the current or given revision of the project manifest
2343 output the current or given revision of the project manifest
2344 </td></tr>
2344 </td></tr>
2345 <tr><td>
2345 <tr><td>
2346 <a href="/help/nohelp">
2346 <a href="/help/nohelp">
2347 nohelp
2347 nohelp
2348 </a>
2348 </a>
2349 </td><td>
2349 </td><td>
2350 (no help text available)
2350 (no help text available)
2351 </td></tr>
2351 </td></tr>
2352 <tr><td>
2352 <tr><td>
2353 <a href="/help/outgoing">
2353 <a href="/help/outgoing">
2354 outgoing
2354 outgoing
2355 </a>
2355 </a>
2356 </td><td>
2356 </td><td>
2357 show changesets not found in the destination
2357 show changesets not found in the destination
2358 </td></tr>
2358 </td></tr>
2359 <tr><td>
2359 <tr><td>
2360 <a href="/help/paths">
2360 <a href="/help/paths">
2361 paths
2361 paths
2362 </a>
2362 </a>
2363 </td><td>
2363 </td><td>
2364 show aliases for remote repositories
2364 show aliases for remote repositories
2365 </td></tr>
2365 </td></tr>
2366 <tr><td>
2366 <tr><td>
2367 <a href="/help/phase">
2367 <a href="/help/phase">
2368 phase
2368 phase
2369 </a>
2369 </a>
2370 </td><td>
2370 </td><td>
2371 set or show the current phase name
2371 set or show the current phase name
2372 </td></tr>
2372 </td></tr>
2373 <tr><td>
2373 <tr><td>
2374 <a href="/help/recover">
2374 <a href="/help/recover">
2375 recover
2375 recover
2376 </a>
2376 </a>
2377 </td><td>
2377 </td><td>
2378 roll back an interrupted transaction
2378 roll back an interrupted transaction
2379 </td></tr>
2379 </td></tr>
2380 <tr><td>
2380 <tr><td>
2381 <a href="/help/rename">
2381 <a href="/help/rename">
2382 rename
2382 rename
2383 </a>
2383 </a>
2384 </td><td>
2384 </td><td>
2385 rename files; equivalent of copy + remove
2385 rename files; equivalent of copy + remove
2386 </td></tr>
2386 </td></tr>
2387 <tr><td>
2387 <tr><td>
2388 <a href="/help/resolve">
2388 <a href="/help/resolve">
2389 resolve
2389 resolve
2390 </a>
2390 </a>
2391 </td><td>
2391 </td><td>
2392 redo merges or set/view the merge status of files
2392 redo merges or set/view the merge status of files
2393 </td></tr>
2393 </td></tr>
2394 <tr><td>
2394 <tr><td>
2395 <a href="/help/revert">
2395 <a href="/help/revert">
2396 revert
2396 revert
2397 </a>
2397 </a>
2398 </td><td>
2398 </td><td>
2399 restore files to their checkout state
2399 restore files to their checkout state
2400 </td></tr>
2400 </td></tr>
2401 <tr><td>
2401 <tr><td>
2402 <a href="/help/root">
2402 <a href="/help/root">
2403 root
2403 root
2404 </a>
2404 </a>
2405 </td><td>
2405 </td><td>
2406 print the root (top) of the current working directory
2406 print the root (top) of the current working directory
2407 </td></tr>
2407 </td></tr>
2408 <tr><td>
2408 <tr><td>
2409 <a href="/help/shellalias">
2409 <a href="/help/shellalias">
2410 shellalias
2410 shellalias
2411 </a>
2411 </a>
2412 </td><td>
2412 </td><td>
2413 (no help text available)
2413 (no help text available)
2414 </td></tr>
2414 </td></tr>
2415 <tr><td>
2415 <tr><td>
2416 <a href="/help/tag">
2416 <a href="/help/tag">
2417 tag
2417 tag
2418 </a>
2418 </a>
2419 </td><td>
2419 </td><td>
2420 add one or more tags for the current or given revision
2420 add one or more tags for the current or given revision
2421 </td></tr>
2421 </td></tr>
2422 <tr><td>
2422 <tr><td>
2423 <a href="/help/tags">
2423 <a href="/help/tags">
2424 tags
2424 tags
2425 </a>
2425 </a>
2426 </td><td>
2426 </td><td>
2427 list repository tags
2427 list repository tags
2428 </td></tr>
2428 </td></tr>
2429 <tr><td>
2429 <tr><td>
2430 <a href="/help/unbundle">
2430 <a href="/help/unbundle">
2431 unbundle
2431 unbundle
2432 </a>
2432 </a>
2433 </td><td>
2433 </td><td>
2434 apply one or more bundle files
2434 apply one or more bundle files
2435 </td></tr>
2435 </td></tr>
2436 <tr><td>
2436 <tr><td>
2437 <a href="/help/verify">
2437 <a href="/help/verify">
2438 verify
2438 verify
2439 </a>
2439 </a>
2440 </td><td>
2440 </td><td>
2441 verify the integrity of the repository
2441 verify the integrity of the repository
2442 </td></tr>
2442 </td></tr>
2443 <tr><td>
2443 <tr><td>
2444 <a href="/help/version">
2444 <a href="/help/version">
2445 version
2445 version
2446 </a>
2446 </a>
2447 </td><td>
2447 </td><td>
2448 output version and copyright information
2448 output version and copyright information
2449 </td></tr>
2449 </td></tr>
2450
2450
2451
2451
2452 </table>
2452 </table>
2453 </div>
2453 </div>
2454 </div>
2454 </div>
2455
2455
2456
2456
2457
2457
2458 </body>
2458 </body>
2459 </html>
2459 </html>
2460
2460
2461
2461
2462 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2462 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2463 200 Script output follows
2463 200 Script output follows
2464
2464
2465 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2465 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2466 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2466 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2467 <head>
2467 <head>
2468 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2468 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2469 <meta name="robots" content="index, nofollow" />
2469 <meta name="robots" content="index, nofollow" />
2470 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2470 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2471 <script type="text/javascript" src="/static/mercurial.js"></script>
2471 <script type="text/javascript" src="/static/mercurial.js"></script>
2472
2472
2473 <title>Help: add</title>
2473 <title>Help: add</title>
2474 </head>
2474 </head>
2475 <body>
2475 <body>
2476
2476
2477 <div class="container">
2477 <div class="container">
2478 <div class="menu">
2478 <div class="menu">
2479 <div class="logo">
2479 <div class="logo">
2480 <a href="https://mercurial-scm.org/">
2480 <a href="https://mercurial-scm.org/">
2481 <img src="/static/hglogo.png" alt="mercurial" /></a>
2481 <img src="/static/hglogo.png" alt="mercurial" /></a>
2482 </div>
2482 </div>
2483 <ul>
2483 <ul>
2484 <li><a href="/shortlog">log</a></li>
2484 <li><a href="/shortlog">log</a></li>
2485 <li><a href="/graph">graph</a></li>
2485 <li><a href="/graph">graph</a></li>
2486 <li><a href="/tags">tags</a></li>
2486 <li><a href="/tags">tags</a></li>
2487 <li><a href="/bookmarks">bookmarks</a></li>
2487 <li><a href="/bookmarks">bookmarks</a></li>
2488 <li><a href="/branches">branches</a></li>
2488 <li><a href="/branches">branches</a></li>
2489 </ul>
2489 </ul>
2490 <ul>
2490 <ul>
2491 <li class="active"><a href="/help">help</a></li>
2491 <li class="active"><a href="/help">help</a></li>
2492 </ul>
2492 </ul>
2493 </div>
2493 </div>
2494
2494
2495 <div class="main">
2495 <div class="main">
2496 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2496 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2497 <h3>Help: add</h3>
2497 <h3>Help: add</h3>
2498
2498
2499 <form class="search" action="/log">
2499 <form class="search" action="/log">
2500
2500
2501 <p><input name="rev" id="search1" type="text" size="30" /></p>
2501 <p><input name="rev" id="search1" type="text" size="30" /></p>
2502 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2502 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2503 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2503 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2504 </form>
2504 </form>
2505 <div id="doc">
2505 <div id="doc">
2506 <p>
2506 <p>
2507 hg add [OPTION]... [FILE]...
2507 hg add [OPTION]... [FILE]...
2508 </p>
2508 </p>
2509 <p>
2509 <p>
2510 add the specified files on the next commit
2510 add the specified files on the next commit
2511 </p>
2511 </p>
2512 <p>
2512 <p>
2513 Schedule files to be version controlled and added to the
2513 Schedule files to be version controlled and added to the
2514 repository.
2514 repository.
2515 </p>
2515 </p>
2516 <p>
2516 <p>
2517 The files will be added to the repository at the next commit. To
2517 The files will be added to the repository at the next commit. To
2518 undo an add before that, see 'hg forget'.
2518 undo an add before that, see 'hg forget'.
2519 </p>
2519 </p>
2520 <p>
2520 <p>
2521 If no names are given, add all files to the repository (except
2521 If no names are given, add all files to the repository (except
2522 files matching &quot;.hgignore&quot;).
2522 files matching &quot;.hgignore&quot;).
2523 </p>
2523 </p>
2524 <p>
2524 <p>
2525 Examples:
2525 Examples:
2526 </p>
2526 </p>
2527 <ul>
2527 <ul>
2528 <li> New (unknown) files are added automatically by 'hg add':
2528 <li> New (unknown) files are added automatically by 'hg add':
2529 <pre>
2529 <pre>
2530 \$ ls (re)
2530 \$ ls (re)
2531 foo.c
2531 foo.c
2532 \$ hg status (re)
2532 \$ hg status (re)
2533 ? foo.c
2533 ? foo.c
2534 \$ hg add (re)
2534 \$ hg add (re)
2535 adding foo.c
2535 adding foo.c
2536 \$ hg status (re)
2536 \$ hg status (re)
2537 A foo.c
2537 A foo.c
2538 </pre>
2538 </pre>
2539 <li> Specific files to be added can be specified:
2539 <li> Specific files to be added can be specified:
2540 <pre>
2540 <pre>
2541 \$ ls (re)
2541 \$ ls (re)
2542 bar.c foo.c
2542 bar.c foo.c
2543 \$ hg status (re)
2543 \$ hg status (re)
2544 ? bar.c
2544 ? bar.c
2545 ? foo.c
2545 ? foo.c
2546 \$ hg add bar.c (re)
2546 \$ hg add bar.c (re)
2547 \$ hg status (re)
2547 \$ hg status (re)
2548 A bar.c
2548 A bar.c
2549 ? foo.c
2549 ? foo.c
2550 </pre>
2550 </pre>
2551 </ul>
2551 </ul>
2552 <p>
2552 <p>
2553 Returns 0 if all files are successfully added.
2553 Returns 0 if all files are successfully added.
2554 </p>
2554 </p>
2555 <p>
2555 <p>
2556 options ([+] can be repeated):
2556 options ([+] can be repeated):
2557 </p>
2557 </p>
2558 <table>
2558 <table>
2559 <tr><td>-I</td>
2559 <tr><td>-I</td>
2560 <td>--include PATTERN [+]</td>
2560 <td>--include PATTERN [+]</td>
2561 <td>include names matching the given patterns</td></tr>
2561 <td>include names matching the given patterns</td></tr>
2562 <tr><td>-X</td>
2562 <tr><td>-X</td>
2563 <td>--exclude PATTERN [+]</td>
2563 <td>--exclude PATTERN [+]</td>
2564 <td>exclude names matching the given patterns</td></tr>
2564 <td>exclude names matching the given patterns</td></tr>
2565 <tr><td>-S</td>
2565 <tr><td>-S</td>
2566 <td>--subrepos</td>
2566 <td>--subrepos</td>
2567 <td>recurse into subrepositories</td></tr>
2567 <td>recurse into subrepositories</td></tr>
2568 <tr><td>-n</td>
2568 <tr><td>-n</td>
2569 <td>--dry-run</td>
2569 <td>--dry-run</td>
2570 <td>do not perform actions, just print output</td></tr>
2570 <td>do not perform actions, just print output</td></tr>
2571 </table>
2571 </table>
2572 <p>
2572 <p>
2573 global options ([+] can be repeated):
2573 global options ([+] can be repeated):
2574 </p>
2574 </p>
2575 <table>
2575 <table>
2576 <tr><td>-R</td>
2576 <tr><td>-R</td>
2577 <td>--repository REPO</td>
2577 <td>--repository REPO</td>
2578 <td>repository root directory or name of overlay bundle file</td></tr>
2578 <td>repository root directory or name of overlay bundle file</td></tr>
2579 <tr><td></td>
2579 <tr><td></td>
2580 <td>--cwd DIR</td>
2580 <td>--cwd DIR</td>
2581 <td>change working directory</td></tr>
2581 <td>change working directory</td></tr>
2582 <tr><td>-y</td>
2582 <tr><td>-y</td>
2583 <td>--noninteractive</td>
2583 <td>--noninteractive</td>
2584 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2584 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2585 <tr><td>-q</td>
2585 <tr><td>-q</td>
2586 <td>--quiet</td>
2586 <td>--quiet</td>
2587 <td>suppress output</td></tr>
2587 <td>suppress output</td></tr>
2588 <tr><td>-v</td>
2588 <tr><td>-v</td>
2589 <td>--verbose</td>
2589 <td>--verbose</td>
2590 <td>enable additional output</td></tr>
2590 <td>enable additional output</td></tr>
2591 <tr><td></td>
2591 <tr><td></td>
2592 <td>--color TYPE</td>
2592 <td>--color TYPE</td>
2593 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2593 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2594 <tr><td></td>
2594 <tr><td></td>
2595 <td>--config CONFIG [+]</td>
2595 <td>--config CONFIG [+]</td>
2596 <td>set/override config option (use 'section.name=value')</td></tr>
2596 <td>set/override config option (use 'section.name=value')</td></tr>
2597 <tr><td></td>
2597 <tr><td></td>
2598 <td>--debug</td>
2598 <td>--debug</td>
2599 <td>enable debugging output</td></tr>
2599 <td>enable debugging output</td></tr>
2600 <tr><td></td>
2600 <tr><td></td>
2601 <td>--debugger</td>
2601 <td>--debugger</td>
2602 <td>start debugger</td></tr>
2602 <td>start debugger</td></tr>
2603 <tr><td></td>
2603 <tr><td></td>
2604 <td>--encoding ENCODE</td>
2604 <td>--encoding ENCODE</td>
2605 <td>set the charset encoding (default: ascii)</td></tr>
2605 <td>set the charset encoding (default: ascii)</td></tr>
2606 <tr><td></td>
2606 <tr><td></td>
2607 <td>--encodingmode MODE</td>
2607 <td>--encodingmode MODE</td>
2608 <td>set the charset encoding mode (default: strict)</td></tr>
2608 <td>set the charset encoding mode (default: strict)</td></tr>
2609 <tr><td></td>
2609 <tr><td></td>
2610 <td>--traceback</td>
2610 <td>--traceback</td>
2611 <td>always print a traceback on exception</td></tr>
2611 <td>always print a traceback on exception</td></tr>
2612 <tr><td></td>
2612 <tr><td></td>
2613 <td>--time</td>
2613 <td>--time</td>
2614 <td>time how long the command takes</td></tr>
2614 <td>time how long the command takes</td></tr>
2615 <tr><td></td>
2615 <tr><td></td>
2616 <td>--profile</td>
2616 <td>--profile</td>
2617 <td>print command execution profile</td></tr>
2617 <td>print command execution profile</td></tr>
2618 <tr><td></td>
2618 <tr><td></td>
2619 <td>--version</td>
2619 <td>--version</td>
2620 <td>output version information and exit</td></tr>
2620 <td>output version information and exit</td></tr>
2621 <tr><td>-h</td>
2621 <tr><td>-h</td>
2622 <td>--help</td>
2622 <td>--help</td>
2623 <td>display help and exit</td></tr>
2623 <td>display help and exit</td></tr>
2624 <tr><td></td>
2624 <tr><td></td>
2625 <td>--hidden</td>
2625 <td>--hidden</td>
2626 <td>consider hidden changesets</td></tr>
2626 <td>consider hidden changesets</td></tr>
2627 <tr><td></td>
2627 <tr><td></td>
2628 <td>--pager TYPE</td>
2628 <td>--pager TYPE</td>
2629 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2629 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2630 </table>
2630 </table>
2631
2631
2632 </div>
2632 </div>
2633 </div>
2633 </div>
2634 </div>
2634 </div>
2635
2635
2636
2636
2637
2637
2638 </body>
2638 </body>
2639 </html>
2639 </html>
2640
2640
2641
2641
2642 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2642 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2643 200 Script output follows
2643 200 Script output follows
2644
2644
2645 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2645 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2646 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2646 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2647 <head>
2647 <head>
2648 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2648 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2649 <meta name="robots" content="index, nofollow" />
2649 <meta name="robots" content="index, nofollow" />
2650 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2650 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2651 <script type="text/javascript" src="/static/mercurial.js"></script>
2651 <script type="text/javascript" src="/static/mercurial.js"></script>
2652
2652
2653 <title>Help: remove</title>
2653 <title>Help: remove</title>
2654 </head>
2654 </head>
2655 <body>
2655 <body>
2656
2656
2657 <div class="container">
2657 <div class="container">
2658 <div class="menu">
2658 <div class="menu">
2659 <div class="logo">
2659 <div class="logo">
2660 <a href="https://mercurial-scm.org/">
2660 <a href="https://mercurial-scm.org/">
2661 <img src="/static/hglogo.png" alt="mercurial" /></a>
2661 <img src="/static/hglogo.png" alt="mercurial" /></a>
2662 </div>
2662 </div>
2663 <ul>
2663 <ul>
2664 <li><a href="/shortlog">log</a></li>
2664 <li><a href="/shortlog">log</a></li>
2665 <li><a href="/graph">graph</a></li>
2665 <li><a href="/graph">graph</a></li>
2666 <li><a href="/tags">tags</a></li>
2666 <li><a href="/tags">tags</a></li>
2667 <li><a href="/bookmarks">bookmarks</a></li>
2667 <li><a href="/bookmarks">bookmarks</a></li>
2668 <li><a href="/branches">branches</a></li>
2668 <li><a href="/branches">branches</a></li>
2669 </ul>
2669 </ul>
2670 <ul>
2670 <ul>
2671 <li class="active"><a href="/help">help</a></li>
2671 <li class="active"><a href="/help">help</a></li>
2672 </ul>
2672 </ul>
2673 </div>
2673 </div>
2674
2674
2675 <div class="main">
2675 <div class="main">
2676 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2676 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2677 <h3>Help: remove</h3>
2677 <h3>Help: remove</h3>
2678
2678
2679 <form class="search" action="/log">
2679 <form class="search" action="/log">
2680
2680
2681 <p><input name="rev" id="search1" type="text" size="30" /></p>
2681 <p><input name="rev" id="search1" type="text" size="30" /></p>
2682 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2682 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2683 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2683 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2684 </form>
2684 </form>
2685 <div id="doc">
2685 <div id="doc">
2686 <p>
2686 <p>
2687 hg remove [OPTION]... FILE...
2687 hg remove [OPTION]... FILE...
2688 </p>
2688 </p>
2689 <p>
2689 <p>
2690 aliases: rm
2690 aliases: rm
2691 </p>
2691 </p>
2692 <p>
2692 <p>
2693 remove the specified files on the next commit
2693 remove the specified files on the next commit
2694 </p>
2694 </p>
2695 <p>
2695 <p>
2696 Schedule the indicated files for removal from the current branch.
2696 Schedule the indicated files for removal from the current branch.
2697 </p>
2697 </p>
2698 <p>
2698 <p>
2699 This command schedules the files to be removed at the next commit.
2699 This command schedules the files to be removed at the next commit.
2700 To undo a remove before that, see 'hg revert'. To undo added
2700 To undo a remove before that, see 'hg revert'. To undo added
2701 files, see 'hg forget'.
2701 files, see 'hg forget'.
2702 </p>
2702 </p>
2703 <p>
2703 <p>
2704 -A/--after can be used to remove only files that have already
2704 -A/--after can be used to remove only files that have already
2705 been deleted, -f/--force can be used to force deletion, and -Af
2705 been deleted, -f/--force can be used to force deletion, and -Af
2706 can be used to remove files from the next revision without
2706 can be used to remove files from the next revision without
2707 deleting them from the working directory.
2707 deleting them from the working directory.
2708 </p>
2708 </p>
2709 <p>
2709 <p>
2710 The following table details the behavior of remove for different
2710 The following table details the behavior of remove for different
2711 file states (columns) and option combinations (rows). The file
2711 file states (columns) and option combinations (rows). The file
2712 states are Added [A], Clean [C], Modified [M] and Missing [!]
2712 states are Added [A], Clean [C], Modified [M] and Missing [!]
2713 (as reported by 'hg status'). The actions are Warn, Remove
2713 (as reported by 'hg status'). The actions are Warn, Remove
2714 (from branch) and Delete (from disk):
2714 (from branch) and Delete (from disk):
2715 </p>
2715 </p>
2716 <table>
2716 <table>
2717 <tr><td>opt/state</td>
2717 <tr><td>opt/state</td>
2718 <td>A</td>
2718 <td>A</td>
2719 <td>C</td>
2719 <td>C</td>
2720 <td>M</td>
2720 <td>M</td>
2721 <td>!</td></tr>
2721 <td>!</td></tr>
2722 <tr><td>none</td>
2722 <tr><td>none</td>
2723 <td>W</td>
2723 <td>W</td>
2724 <td>RD</td>
2724 <td>RD</td>
2725 <td>W</td>
2725 <td>W</td>
2726 <td>R</td></tr>
2726 <td>R</td></tr>
2727 <tr><td>-f</td>
2727 <tr><td>-f</td>
2728 <td>R</td>
2728 <td>R</td>
2729 <td>RD</td>
2729 <td>RD</td>
2730 <td>RD</td>
2730 <td>RD</td>
2731 <td>R</td></tr>
2731 <td>R</td></tr>
2732 <tr><td>-A</td>
2732 <tr><td>-A</td>
2733 <td>W</td>
2733 <td>W</td>
2734 <td>W</td>
2734 <td>W</td>
2735 <td>W</td>
2735 <td>W</td>
2736 <td>R</td></tr>
2736 <td>R</td></tr>
2737 <tr><td>-Af</td>
2737 <tr><td>-Af</td>
2738 <td>R</td>
2738 <td>R</td>
2739 <td>R</td>
2739 <td>R</td>
2740 <td>R</td>
2740 <td>R</td>
2741 <td>R</td></tr>
2741 <td>R</td></tr>
2742 </table>
2742 </table>
2743 <p>
2743 <p>
2744 <b>Note:</b>
2744 <b>Note:</b>
2745 </p>
2745 </p>
2746 <p>
2746 <p>
2747 'hg remove' never deletes files in Added [A] state from the
2747 'hg remove' never deletes files in Added [A] state from the
2748 working directory, not even if &quot;--force&quot; is specified.
2748 working directory, not even if &quot;--force&quot; is specified.
2749 </p>
2749 </p>
2750 <p>
2750 <p>
2751 Returns 0 on success, 1 if any warnings encountered.
2751 Returns 0 on success, 1 if any warnings encountered.
2752 </p>
2752 </p>
2753 <p>
2753 <p>
2754 options ([+] can be repeated):
2754 options ([+] can be repeated):
2755 </p>
2755 </p>
2756 <table>
2756 <table>
2757 <tr><td>-A</td>
2757 <tr><td>-A</td>
2758 <td>--after</td>
2758 <td>--after</td>
2759 <td>record delete for missing files</td></tr>
2759 <td>record delete for missing files</td></tr>
2760 <tr><td>-f</td>
2760 <tr><td>-f</td>
2761 <td>--force</td>
2761 <td>--force</td>
2762 <td>forget added files, delete modified files</td></tr>
2762 <td>forget added files, delete modified files</td></tr>
2763 <tr><td>-S</td>
2763 <tr><td>-S</td>
2764 <td>--subrepos</td>
2764 <td>--subrepos</td>
2765 <td>recurse into subrepositories</td></tr>
2765 <td>recurse into subrepositories</td></tr>
2766 <tr><td>-I</td>
2766 <tr><td>-I</td>
2767 <td>--include PATTERN [+]</td>
2767 <td>--include PATTERN [+]</td>
2768 <td>include names matching the given patterns</td></tr>
2768 <td>include names matching the given patterns</td></tr>
2769 <tr><td>-X</td>
2769 <tr><td>-X</td>
2770 <td>--exclude PATTERN [+]</td>
2770 <td>--exclude PATTERN [+]</td>
2771 <td>exclude names matching the given patterns</td></tr>
2771 <td>exclude names matching the given patterns</td></tr>
2772 </table>
2772 </table>
2773 <p>
2773 <p>
2774 global options ([+] can be repeated):
2774 global options ([+] can be repeated):
2775 </p>
2775 </p>
2776 <table>
2776 <table>
2777 <tr><td>-R</td>
2777 <tr><td>-R</td>
2778 <td>--repository REPO</td>
2778 <td>--repository REPO</td>
2779 <td>repository root directory or name of overlay bundle file</td></tr>
2779 <td>repository root directory or name of overlay bundle file</td></tr>
2780 <tr><td></td>
2780 <tr><td></td>
2781 <td>--cwd DIR</td>
2781 <td>--cwd DIR</td>
2782 <td>change working directory</td></tr>
2782 <td>change working directory</td></tr>
2783 <tr><td>-y</td>
2783 <tr><td>-y</td>
2784 <td>--noninteractive</td>
2784 <td>--noninteractive</td>
2785 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2785 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2786 <tr><td>-q</td>
2786 <tr><td>-q</td>
2787 <td>--quiet</td>
2787 <td>--quiet</td>
2788 <td>suppress output</td></tr>
2788 <td>suppress output</td></tr>
2789 <tr><td>-v</td>
2789 <tr><td>-v</td>
2790 <td>--verbose</td>
2790 <td>--verbose</td>
2791 <td>enable additional output</td></tr>
2791 <td>enable additional output</td></tr>
2792 <tr><td></td>
2792 <tr><td></td>
2793 <td>--color TYPE</td>
2793 <td>--color TYPE</td>
2794 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2794 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2795 <tr><td></td>
2795 <tr><td></td>
2796 <td>--config CONFIG [+]</td>
2796 <td>--config CONFIG [+]</td>
2797 <td>set/override config option (use 'section.name=value')</td></tr>
2797 <td>set/override config option (use 'section.name=value')</td></tr>
2798 <tr><td></td>
2798 <tr><td></td>
2799 <td>--debug</td>
2799 <td>--debug</td>
2800 <td>enable debugging output</td></tr>
2800 <td>enable debugging output</td></tr>
2801 <tr><td></td>
2801 <tr><td></td>
2802 <td>--debugger</td>
2802 <td>--debugger</td>
2803 <td>start debugger</td></tr>
2803 <td>start debugger</td></tr>
2804 <tr><td></td>
2804 <tr><td></td>
2805 <td>--encoding ENCODE</td>
2805 <td>--encoding ENCODE</td>
2806 <td>set the charset encoding (default: ascii)</td></tr>
2806 <td>set the charset encoding (default: ascii)</td></tr>
2807 <tr><td></td>
2807 <tr><td></td>
2808 <td>--encodingmode MODE</td>
2808 <td>--encodingmode MODE</td>
2809 <td>set the charset encoding mode (default: strict)</td></tr>
2809 <td>set the charset encoding mode (default: strict)</td></tr>
2810 <tr><td></td>
2810 <tr><td></td>
2811 <td>--traceback</td>
2811 <td>--traceback</td>
2812 <td>always print a traceback on exception</td></tr>
2812 <td>always print a traceback on exception</td></tr>
2813 <tr><td></td>
2813 <tr><td></td>
2814 <td>--time</td>
2814 <td>--time</td>
2815 <td>time how long the command takes</td></tr>
2815 <td>time how long the command takes</td></tr>
2816 <tr><td></td>
2816 <tr><td></td>
2817 <td>--profile</td>
2817 <td>--profile</td>
2818 <td>print command execution profile</td></tr>
2818 <td>print command execution profile</td></tr>
2819 <tr><td></td>
2819 <tr><td></td>
2820 <td>--version</td>
2820 <td>--version</td>
2821 <td>output version information and exit</td></tr>
2821 <td>output version information and exit</td></tr>
2822 <tr><td>-h</td>
2822 <tr><td>-h</td>
2823 <td>--help</td>
2823 <td>--help</td>
2824 <td>display help and exit</td></tr>
2824 <td>display help and exit</td></tr>
2825 <tr><td></td>
2825 <tr><td></td>
2826 <td>--hidden</td>
2826 <td>--hidden</td>
2827 <td>consider hidden changesets</td></tr>
2827 <td>consider hidden changesets</td></tr>
2828 <tr><td></td>
2828 <tr><td></td>
2829 <td>--pager TYPE</td>
2829 <td>--pager TYPE</td>
2830 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2830 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2831 </table>
2831 </table>
2832
2832
2833 </div>
2833 </div>
2834 </div>
2834 </div>
2835 </div>
2835 </div>
2836
2836
2837
2837
2838
2838
2839 </body>
2839 </body>
2840 </html>
2840 </html>
2841
2841
2842
2842
2843 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
2843 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
2844 200 Script output follows
2844 200 Script output follows
2845
2845
2846 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2846 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2847 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2847 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2848 <head>
2848 <head>
2849 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2849 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2850 <meta name="robots" content="index, nofollow" />
2850 <meta name="robots" content="index, nofollow" />
2851 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2851 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2852 <script type="text/javascript" src="/static/mercurial.js"></script>
2852 <script type="text/javascript" src="/static/mercurial.js"></script>
2853
2853
2854 <title>Help: dates</title>
2854 <title>Help: dates</title>
2855 </head>
2855 </head>
2856 <body>
2856 <body>
2857
2857
2858 <div class="container">
2858 <div class="container">
2859 <div class="menu">
2859 <div class="menu">
2860 <div class="logo">
2860 <div class="logo">
2861 <a href="https://mercurial-scm.org/">
2861 <a href="https://mercurial-scm.org/">
2862 <img src="/static/hglogo.png" alt="mercurial" /></a>
2862 <img src="/static/hglogo.png" alt="mercurial" /></a>
2863 </div>
2863 </div>
2864 <ul>
2864 <ul>
2865 <li><a href="/shortlog">log</a></li>
2865 <li><a href="/shortlog">log</a></li>
2866 <li><a href="/graph">graph</a></li>
2866 <li><a href="/graph">graph</a></li>
2867 <li><a href="/tags">tags</a></li>
2867 <li><a href="/tags">tags</a></li>
2868 <li><a href="/bookmarks">bookmarks</a></li>
2868 <li><a href="/bookmarks">bookmarks</a></li>
2869 <li><a href="/branches">branches</a></li>
2869 <li><a href="/branches">branches</a></li>
2870 </ul>
2870 </ul>
2871 <ul>
2871 <ul>
2872 <li class="active"><a href="/help">help</a></li>
2872 <li class="active"><a href="/help">help</a></li>
2873 </ul>
2873 </ul>
2874 </div>
2874 </div>
2875
2875
2876 <div class="main">
2876 <div class="main">
2877 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2877 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2878 <h3>Help: dates</h3>
2878 <h3>Help: dates</h3>
2879
2879
2880 <form class="search" action="/log">
2880 <form class="search" action="/log">
2881
2881
2882 <p><input name="rev" id="search1" type="text" size="30" /></p>
2882 <p><input name="rev" id="search1" type="text" size="30" /></p>
2883 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2883 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2884 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2884 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2885 </form>
2885 </form>
2886 <div id="doc">
2886 <div id="doc">
2887 <h1>Date Formats</h1>
2887 <h1>Date Formats</h1>
2888 <p>
2888 <p>
2889 Some commands allow the user to specify a date, e.g.:
2889 Some commands allow the user to specify a date, e.g.:
2890 </p>
2890 </p>
2891 <ul>
2891 <ul>
2892 <li> backout, commit, import, tag: Specify the commit date.
2892 <li> backout, commit, import, tag: Specify the commit date.
2893 <li> log, revert, update: Select revision(s) by date.
2893 <li> log, revert, update: Select revision(s) by date.
2894 </ul>
2894 </ul>
2895 <p>
2895 <p>
2896 Many date formats are valid. Here are some examples:
2896 Many date formats are valid. Here are some examples:
2897 </p>
2897 </p>
2898 <ul>
2898 <ul>
2899 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
2899 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
2900 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
2900 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
2901 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
2901 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
2902 <li> &quot;Dec 6&quot; (midnight)
2902 <li> &quot;Dec 6&quot; (midnight)
2903 <li> &quot;13:18&quot; (today assumed)
2903 <li> &quot;13:18&quot; (today assumed)
2904 <li> &quot;3:39&quot; (3:39AM assumed)
2904 <li> &quot;3:39&quot; (3:39AM assumed)
2905 <li> &quot;3:39pm&quot; (15:39)
2905 <li> &quot;3:39pm&quot; (15:39)
2906 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
2906 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
2907 <li> &quot;2006-12-6 13:18&quot;
2907 <li> &quot;2006-12-6 13:18&quot;
2908 <li> &quot;2006-12-6&quot;
2908 <li> &quot;2006-12-6&quot;
2909 <li> &quot;12-6&quot;
2909 <li> &quot;12-6&quot;
2910 <li> &quot;12/6&quot;
2910 <li> &quot;12/6&quot;
2911 <li> &quot;12/6/6&quot; (Dec 6 2006)
2911 <li> &quot;12/6/6&quot; (Dec 6 2006)
2912 <li> &quot;today&quot; (midnight)
2912 <li> &quot;today&quot; (midnight)
2913 <li> &quot;yesterday&quot; (midnight)
2913 <li> &quot;yesterday&quot; (midnight)
2914 <li> &quot;now&quot; - right now
2914 <li> &quot;now&quot; - right now
2915 </ul>
2915 </ul>
2916 <p>
2916 <p>
2917 Lastly, there is Mercurial's internal format:
2917 Lastly, there is Mercurial's internal format:
2918 </p>
2918 </p>
2919 <ul>
2919 <ul>
2920 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
2920 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
2921 </ul>
2921 </ul>
2922 <p>
2922 <p>
2923 This is the internal representation format for dates. The first number
2923 This is the internal representation format for dates. The first number
2924 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
2924 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
2925 second is the offset of the local timezone, in seconds west of UTC
2925 second is the offset of the local timezone, in seconds west of UTC
2926 (negative if the timezone is east of UTC).
2926 (negative if the timezone is east of UTC).
2927 </p>
2927 </p>
2928 <p>
2928 <p>
2929 The log command also accepts date ranges:
2929 The log command also accepts date ranges:
2930 </p>
2930 </p>
2931 <ul>
2931 <ul>
2932 <li> &quot;&lt;DATE&quot; - at or before a given date/time
2932 <li> &quot;&lt;DATE&quot; - at or before a given date/time
2933 <li> &quot;&gt;DATE&quot; - on or after a given date/time
2933 <li> &quot;&gt;DATE&quot; - on or after a given date/time
2934 <li> &quot;DATE to DATE&quot; - a date range, inclusive
2934 <li> &quot;DATE to DATE&quot; - a date range, inclusive
2935 <li> &quot;-DAYS&quot; - within a given number of days of today
2935 <li> &quot;-DAYS&quot; - within a given number of days of today
2936 </ul>
2936 </ul>
2937
2937
2938 </div>
2938 </div>
2939 </div>
2939 </div>
2940 </div>
2940 </div>
2941
2941
2942
2942
2943
2943
2944 </body>
2944 </body>
2945 </html>
2945 </html>
2946
2946
2947
2947
2948 Sub-topic indexes rendered properly
2948 Sub-topic indexes rendered properly
2949
2949
2950 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
2950 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
2951 200 Script output follows
2951 200 Script output follows
2952
2952
2953 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2953 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2954 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2954 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2955 <head>
2955 <head>
2956 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2956 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2957 <meta name="robots" content="index, nofollow" />
2957 <meta name="robots" content="index, nofollow" />
2958 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2958 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2959 <script type="text/javascript" src="/static/mercurial.js"></script>
2959 <script type="text/javascript" src="/static/mercurial.js"></script>
2960
2960
2961 <title>Help: internals</title>
2961 <title>Help: internals</title>
2962 </head>
2962 </head>
2963 <body>
2963 <body>
2964
2964
2965 <div class="container">
2965 <div class="container">
2966 <div class="menu">
2966 <div class="menu">
2967 <div class="logo">
2967 <div class="logo">
2968 <a href="https://mercurial-scm.org/">
2968 <a href="https://mercurial-scm.org/">
2969 <img src="/static/hglogo.png" alt="mercurial" /></a>
2969 <img src="/static/hglogo.png" alt="mercurial" /></a>
2970 </div>
2970 </div>
2971 <ul>
2971 <ul>
2972 <li><a href="/shortlog">log</a></li>
2972 <li><a href="/shortlog">log</a></li>
2973 <li><a href="/graph">graph</a></li>
2973 <li><a href="/graph">graph</a></li>
2974 <li><a href="/tags">tags</a></li>
2974 <li><a href="/tags">tags</a></li>
2975 <li><a href="/bookmarks">bookmarks</a></li>
2975 <li><a href="/bookmarks">bookmarks</a></li>
2976 <li><a href="/branches">branches</a></li>
2976 <li><a href="/branches">branches</a></li>
2977 </ul>
2977 </ul>
2978 <ul>
2978 <ul>
2979 <li><a href="/help">help</a></li>
2979 <li><a href="/help">help</a></li>
2980 </ul>
2980 </ul>
2981 </div>
2981 </div>
2982
2982
2983 <div class="main">
2983 <div class="main">
2984 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2984 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2985 <form class="search" action="/log">
2985 <form class="search" action="/log">
2986
2986
2987 <p><input name="rev" id="search1" type="text" size="30" /></p>
2987 <p><input name="rev" id="search1" type="text" size="30" /></p>
2988 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2988 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2989 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2989 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2990 </form>
2990 </form>
2991 <table class="bigtable">
2991 <table class="bigtable">
2992 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
2992 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
2993
2993
2994 <tr><td>
2994 <tr><td>
2995 <a href="/help/internals.bundles">
2995 <a href="/help/internals.bundles">
2996 bundles
2996 bundles
2997 </a>
2997 </a>
2998 </td><td>
2998 </td><td>
2999 Bundles
2999 Bundles
3000 </td></tr>
3000 </td></tr>
3001 <tr><td>
3001 <tr><td>
3002 <a href="/help/internals.censor">
3002 <a href="/help/internals.censor">
3003 censor
3003 censor
3004 </a>
3004 </a>
3005 </td><td>
3005 </td><td>
3006 Censor
3006 Censor
3007 </td></tr>
3007 </td></tr>
3008 <tr><td>
3008 <tr><td>
3009 <a href="/help/internals.changegroups">
3009 <a href="/help/internals.changegroups">
3010 changegroups
3010 changegroups
3011 </a>
3011 </a>
3012 </td><td>
3012 </td><td>
3013 Changegroups
3013 Changegroups
3014 </td></tr>
3014 </td></tr>
3015 <tr><td>
3015 <tr><td>
3016 <a href="/help/internals.requirements">
3016 <a href="/help/internals.requirements">
3017 requirements
3017 requirements
3018 </a>
3018 </a>
3019 </td><td>
3019 </td><td>
3020 Repository Requirements
3020 Repository Requirements
3021 </td></tr>
3021 </td></tr>
3022 <tr><td>
3022 <tr><td>
3023 <a href="/help/internals.revlogs">
3023 <a href="/help/internals.revlogs">
3024 revlogs
3024 revlogs
3025 </a>
3025 </a>
3026 </td><td>
3026 </td><td>
3027 Revision Logs
3027 Revision Logs
3028 </td></tr>
3028 </td></tr>
3029 <tr><td>
3029 <tr><td>
3030 <a href="/help/internals.wireprotocol">
3030 <a href="/help/internals.wireprotocol">
3031 wireprotocol
3031 wireprotocol
3032 </a>
3032 </a>
3033 </td><td>
3033 </td><td>
3034 Wire Protocol
3034 Wire Protocol
3035 </td></tr>
3035 </td></tr>
3036
3036
3037
3037
3038
3038
3039
3039
3040
3040
3041 </table>
3041 </table>
3042 </div>
3042 </div>
3043 </div>
3043 </div>
3044
3044
3045
3045
3046
3046
3047 </body>
3047 </body>
3048 </html>
3048 </html>
3049
3049
3050
3050
3051 Sub-topic topics rendered properly
3051 Sub-topic topics rendered properly
3052
3052
3053 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3053 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3054 200 Script output follows
3054 200 Script output follows
3055
3055
3056 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3056 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3057 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3057 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3058 <head>
3058 <head>
3059 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3059 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3060 <meta name="robots" content="index, nofollow" />
3060 <meta name="robots" content="index, nofollow" />
3061 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3061 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3062 <script type="text/javascript" src="/static/mercurial.js"></script>
3062 <script type="text/javascript" src="/static/mercurial.js"></script>
3063
3063
3064 <title>Help: internals.changegroups</title>
3064 <title>Help: internals.changegroups</title>
3065 </head>
3065 </head>
3066 <body>
3066 <body>
3067
3067
3068 <div class="container">
3068 <div class="container">
3069 <div class="menu">
3069 <div class="menu">
3070 <div class="logo">
3070 <div class="logo">
3071 <a href="https://mercurial-scm.org/">
3071 <a href="https://mercurial-scm.org/">
3072 <img src="/static/hglogo.png" alt="mercurial" /></a>
3072 <img src="/static/hglogo.png" alt="mercurial" /></a>
3073 </div>
3073 </div>
3074 <ul>
3074 <ul>
3075 <li><a href="/shortlog">log</a></li>
3075 <li><a href="/shortlog">log</a></li>
3076 <li><a href="/graph">graph</a></li>
3076 <li><a href="/graph">graph</a></li>
3077 <li><a href="/tags">tags</a></li>
3077 <li><a href="/tags">tags</a></li>
3078 <li><a href="/bookmarks">bookmarks</a></li>
3078 <li><a href="/bookmarks">bookmarks</a></li>
3079 <li><a href="/branches">branches</a></li>
3079 <li><a href="/branches">branches</a></li>
3080 </ul>
3080 </ul>
3081 <ul>
3081 <ul>
3082 <li class="active"><a href="/help">help</a></li>
3082 <li class="active"><a href="/help">help</a></li>
3083 </ul>
3083 </ul>
3084 </div>
3084 </div>
3085
3085
3086 <div class="main">
3086 <div class="main">
3087 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3087 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3088 <h3>Help: internals.changegroups</h3>
3088 <h3>Help: internals.changegroups</h3>
3089
3089
3090 <form class="search" action="/log">
3090 <form class="search" action="/log">
3091
3091
3092 <p><input name="rev" id="search1" type="text" size="30" /></p>
3092 <p><input name="rev" id="search1" type="text" size="30" /></p>
3093 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3093 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3094 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3094 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3095 </form>
3095 </form>
3096 <div id="doc">
3096 <div id="doc">
3097 <h1>Changegroups</h1>
3097 <h1>Changegroups</h1>
3098 <p>
3098 <p>
3099 Changegroups are representations of repository revlog data, specifically
3099 Changegroups are representations of repository revlog data, specifically
3100 the changelog data, root/flat manifest data, treemanifest data, and
3100 the changelog data, root/flat manifest data, treemanifest data, and
3101 filelogs.
3101 filelogs.
3102 </p>
3102 </p>
3103 <p>
3103 <p>
3104 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3104 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3105 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3105 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3106 only difference being an additional item in the *delta header*. Version
3106 only difference being an additional item in the *delta header*. Version
3107 &quot;3&quot; adds support for revlog flags in the *delta header* and optionally
3107 &quot;3&quot; adds support for revlog flags in the *delta header* and optionally
3108 exchanging treemanifests (enabled by setting an option on the
3108 exchanging treemanifests (enabled by setting an option on the
3109 &quot;changegroup&quot; part in the bundle2).
3109 &quot;changegroup&quot; part in the bundle2).
3110 </p>
3110 </p>
3111 <p>
3111 <p>
3112 Changegroups when not exchanging treemanifests consist of 3 logical
3112 Changegroups when not exchanging treemanifests consist of 3 logical
3113 segments:
3113 segments:
3114 </p>
3114 </p>
3115 <pre>
3115 <pre>
3116 +---------------------------------+
3116 +---------------------------------+
3117 | | | |
3117 | | | |
3118 | changeset | manifest | filelogs |
3118 | changeset | manifest | filelogs |
3119 | | | |
3119 | | | |
3120 | | | |
3120 | | | |
3121 +---------------------------------+
3121 +---------------------------------+
3122 </pre>
3122 </pre>
3123 <p>
3123 <p>
3124 When exchanging treemanifests, there are 4 logical segments:
3124 When exchanging treemanifests, there are 4 logical segments:
3125 </p>
3125 </p>
3126 <pre>
3126 <pre>
3127 +-------------------------------------------------+
3127 +-------------------------------------------------+
3128 | | | | |
3128 | | | | |
3129 | changeset | root | treemanifests | filelogs |
3129 | changeset | root | treemanifests | filelogs |
3130 | | manifest | | |
3130 | | manifest | | |
3131 | | | | |
3131 | | | | |
3132 +-------------------------------------------------+
3132 +-------------------------------------------------+
3133 </pre>
3133 </pre>
3134 <p>
3134 <p>
3135 The principle building block of each segment is a *chunk*. A *chunk*
3135 The principle building block of each segment is a *chunk*. A *chunk*
3136 is a framed piece of data:
3136 is a framed piece of data:
3137 </p>
3137 </p>
3138 <pre>
3138 <pre>
3139 +---------------------------------------+
3139 +---------------------------------------+
3140 | | |
3140 | | |
3141 | length | data |
3141 | length | data |
3142 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3142 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3143 | | |
3143 | | |
3144 +---------------------------------------+
3144 +---------------------------------------+
3145 </pre>
3145 </pre>
3146 <p>
3146 <p>
3147 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3147 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3148 integer indicating the length of the entire chunk (including the length field
3148 integer indicating the length of the entire chunk (including the length field
3149 itself).
3149 itself).
3150 </p>
3150 </p>
3151 <p>
3151 <p>
3152 There is a special case chunk that has a value of 0 for the length
3152 There is a special case chunk that has a value of 0 for the length
3153 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3153 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3154 </p>
3154 </p>
3155 <h2>Delta Groups</h2>
3155 <h2>Delta Groups</h2>
3156 <p>
3156 <p>
3157 A *delta group* expresses the content of a revlog as a series of deltas,
3157 A *delta group* expresses the content of a revlog as a series of deltas,
3158 or patches against previous revisions.
3158 or patches against previous revisions.
3159 </p>
3159 </p>
3160 <p>
3160 <p>
3161 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3161 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3162 to signal the end of the delta group:
3162 to signal the end of the delta group:
3163 </p>
3163 </p>
3164 <pre>
3164 <pre>
3165 +------------------------------------------------------------------------+
3165 +------------------------------------------------------------------------+
3166 | | | | | |
3166 | | | | | |
3167 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3167 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3168 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3168 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3169 | | | | | |
3169 | | | | | |
3170 +------------------------------------------------------------------------+
3170 +------------------------------------------------------------------------+
3171 </pre>
3171 </pre>
3172 <p>
3172 <p>
3173 Each *chunk*'s data consists of the following:
3173 Each *chunk*'s data consists of the following:
3174 </p>
3174 </p>
3175 <pre>
3175 <pre>
3176 +---------------------------------------+
3176 +---------------------------------------+
3177 | | |
3177 | | |
3178 | delta header | delta data |
3178 | delta header | delta data |
3179 | (various by version) | (various) |
3179 | (various by version) | (various) |
3180 | | |
3180 | | |
3181 +---------------------------------------+
3181 +---------------------------------------+
3182 </pre>
3182 </pre>
3183 <p>
3183 <p>
3184 The *delta data* is a series of *delta*s that describe a diff from an existing
3184 The *delta data* is a series of *delta*s that describe a diff from an existing
3185 entry (either that the recipient already has, or previously specified in the
3185 entry (either that the recipient already has, or previously specified in the
3186 bundle/changegroup).
3186 bundle/changegroup).
3187 </p>
3187 </p>
3188 <p>
3188 <p>
3189 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3189 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3190 &quot;3&quot; of the changegroup format.
3190 &quot;3&quot; of the changegroup format.
3191 </p>
3191 </p>
3192 <p>
3192 <p>
3193 Version 1 (headerlen=80):
3193 Version 1 (headerlen=80):
3194 </p>
3194 </p>
3195 <pre>
3195 <pre>
3196 +------------------------------------------------------+
3196 +------------------------------------------------------+
3197 | | | | |
3197 | | | | |
3198 | node | p1 node | p2 node | link node |
3198 | node | p1 node | p2 node | link node |
3199 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3199 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3200 | | | | |
3200 | | | | |
3201 +------------------------------------------------------+
3201 +------------------------------------------------------+
3202 </pre>
3202 </pre>
3203 <p>
3203 <p>
3204 Version 2 (headerlen=100):
3204 Version 2 (headerlen=100):
3205 </p>
3205 </p>
3206 <pre>
3206 <pre>
3207 +------------------------------------------------------------------+
3207 +------------------------------------------------------------------+
3208 | | | | | |
3208 | | | | | |
3209 | node | p1 node | p2 node | base node | link node |
3209 | node | p1 node | p2 node | base node | link node |
3210 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3210 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3211 | | | | | |
3211 | | | | | |
3212 +------------------------------------------------------------------+
3212 +------------------------------------------------------------------+
3213 </pre>
3213 </pre>
3214 <p>
3214 <p>
3215 Version 3 (headerlen=102):
3215 Version 3 (headerlen=102):
3216 </p>
3216 </p>
3217 <pre>
3217 <pre>
3218 +------------------------------------------------------------------------------+
3218 +------------------------------------------------------------------------------+
3219 | | | | | | |
3219 | | | | | | |
3220 | node | p1 node | p2 node | base node | link node | flags |
3220 | node | p1 node | p2 node | base node | link node | flags |
3221 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3221 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3222 | | | | | | |
3222 | | | | | | |
3223 +------------------------------------------------------------------------------+
3223 +------------------------------------------------------------------------------+
3224 </pre>
3224 </pre>
3225 <p>
3225 <p>
3226 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3226 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3227 series of *delta*s, densely packed (no separators). These deltas describe a diff
3227 series of *delta*s, densely packed (no separators). These deltas describe a diff
3228 from an existing entry (either that the recipient already has, or previously
3228 from an existing entry (either that the recipient already has, or previously
3229 specified in the bundle/changegroup). The format is described more fully in
3229 specified in the bundle/changegroup). The format is described more fully in
3230 &quot;hg help internals.bdiff&quot;, but briefly:
3230 &quot;hg help internals.bdiff&quot;, but briefly:
3231 </p>
3231 </p>
3232 <pre>
3232 <pre>
3233 +---------------------------------------------------------------+
3233 +---------------------------------------------------------------+
3234 | | | | |
3234 | | | | |
3235 | start offset | end offset | new length | content |
3235 | start offset | end offset | new length | content |
3236 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3236 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3237 | | | | |
3237 | | | | |
3238 +---------------------------------------------------------------+
3238 +---------------------------------------------------------------+
3239 </pre>
3239 </pre>
3240 <p>
3240 <p>
3241 Please note that the length field in the delta data does *not* include itself.
3241 Please note that the length field in the delta data does *not* include itself.
3242 </p>
3242 </p>
3243 <p>
3243 <p>
3244 In version 1, the delta is always applied against the previous node from
3244 In version 1, the delta is always applied against the previous node from
3245 the changegroup or the first parent if this is the first entry in the
3245 the changegroup or the first parent if this is the first entry in the
3246 changegroup.
3246 changegroup.
3247 </p>
3247 </p>
3248 <p>
3248 <p>
3249 In version 2 and up, the delta base node is encoded in the entry in the
3249 In version 2 and up, the delta base node is encoded in the entry in the
3250 changegroup. This allows the delta to be expressed against any parent,
3250 changegroup. This allows the delta to be expressed against any parent,
3251 which can result in smaller deltas and more efficient encoding of data.
3251 which can result in smaller deltas and more efficient encoding of data.
3252 </p>
3252 </p>
3253 <h2>Changeset Segment</h2>
3253 <h2>Changeset Segment</h2>
3254 <p>
3254 <p>
3255 The *changeset segment* consists of a single *delta group* holding
3255 The *changeset segment* consists of a single *delta group* holding
3256 changelog data. The *empty chunk* at the end of the *delta group* denotes
3256 changelog data. The *empty chunk* at the end of the *delta group* denotes
3257 the boundary to the *manifest segment*.
3257 the boundary to the *manifest segment*.
3258 </p>
3258 </p>
3259 <h2>Manifest Segment</h2>
3259 <h2>Manifest Segment</h2>
3260 <p>
3260 <p>
3261 The *manifest segment* consists of a single *delta group* holding manifest
3261 The *manifest segment* consists of a single *delta group* holding manifest
3262 data. If treemanifests are in use, it contains only the manifest for the
3262 data. If treemanifests are in use, it contains only the manifest for the
3263 root directory of the repository. Otherwise, it contains the entire
3263 root directory of the repository. Otherwise, it contains the entire
3264 manifest data. The *empty chunk* at the end of the *delta group* denotes
3264 manifest data. The *empty chunk* at the end of the *delta group* denotes
3265 the boundary to the next segment (either the *treemanifests segment* or the
3265 the boundary to the next segment (either the *treemanifests segment* or the
3266 *filelogs segment*, depending on version and the request options).
3266 *filelogs segment*, depending on version and the request options).
3267 </p>
3267 </p>
3268 <h3>Treemanifests Segment</h3>
3268 <h3>Treemanifests Segment</h3>
3269 <p>
3269 <p>
3270 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3270 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3271 only if the 'treemanifest' param is part of the bundle2 changegroup part
3271 only if the 'treemanifest' param is part of the bundle2 changegroup part
3272 (it is not possible to use changegroup version 3 outside of bundle2).
3272 (it is not possible to use changegroup version 3 outside of bundle2).
3273 Aside from the filenames in the *treemanifests segment* containing a
3273 Aside from the filenames in the *treemanifests segment* containing a
3274 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3274 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3275 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3275 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3276 a sub-segment with filename size 0). This denotes the boundary to the
3276 a sub-segment with filename size 0). This denotes the boundary to the
3277 *filelogs segment*.
3277 *filelogs segment*.
3278 </p>
3278 </p>
3279 <h2>Filelogs Segment</h2>
3279 <h2>Filelogs Segment</h2>
3280 <p>
3280 <p>
3281 The *filelogs segment* consists of multiple sub-segments, each
3281 The *filelogs segment* consists of multiple sub-segments, each
3282 corresponding to an individual file whose data is being described:
3282 corresponding to an individual file whose data is being described:
3283 </p>
3283 </p>
3284 <pre>
3284 <pre>
3285 +--------------------------------------------------+
3285 +--------------------------------------------------+
3286 | | | | | |
3286 | | | | | |
3287 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3287 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3288 | | | | | (4 bytes) |
3288 | | | | | (4 bytes) |
3289 | | | | | |
3289 | | | | | |
3290 +--------------------------------------------------+
3290 +--------------------------------------------------+
3291 </pre>
3291 </pre>
3292 <p>
3292 <p>
3293 The final filelog sub-segment is followed by an *empty chunk* (logically,
3293 The final filelog sub-segment is followed by an *empty chunk* (logically,
3294 a sub-segment with filename size 0). This denotes the end of the segment
3294 a sub-segment with filename size 0). This denotes the end of the segment
3295 and of the overall changegroup.
3295 and of the overall changegroup.
3296 </p>
3296 </p>
3297 <p>
3297 <p>
3298 Each filelog sub-segment consists of the following:
3298 Each filelog sub-segment consists of the following:
3299 </p>
3299 </p>
3300 <pre>
3300 <pre>
3301 +------------------------------------------------------+
3301 +------------------------------------------------------+
3302 | | | |
3302 | | | |
3303 | filename length | filename | delta group |
3303 | filename length | filename | delta group |
3304 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3304 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3305 | | | |
3305 | | | |
3306 +------------------------------------------------------+
3306 +------------------------------------------------------+
3307 </pre>
3307 </pre>
3308 <p>
3308 <p>
3309 That is, a *chunk* consisting of the filename (not terminated or padded)
3309 That is, a *chunk* consisting of the filename (not terminated or padded)
3310 followed by N chunks constituting the *delta group* for this file. The
3310 followed by N chunks constituting the *delta group* for this file. The
3311 *empty chunk* at the end of each *delta group* denotes the boundary to the
3311 *empty chunk* at the end of each *delta group* denotes the boundary to the
3312 next filelog sub-segment.
3312 next filelog sub-segment.
3313 </p>
3313 </p>
3314
3314
3315 </div>
3315 </div>
3316 </div>
3316 </div>
3317 </div>
3317 </div>
3318
3318
3319
3319
3320
3320
3321 </body>
3321 </body>
3322 </html>
3322 </html>
3323
3323
3324
3324
3325 $ killdaemons.py
3325 $ killdaemons.py
3326
3326
3327 #endif
3327 #endif
General Comments 0
You need to be logged in to leave comments. Login now