##// END OF EJS Templates
clone: add a server-side option to disable full getbundles (pull-based clones)...
Siddharth Agarwal -
r32260:d0d9a4fc default
parent child Browse files
Show More
@@ -1,2410 +1,2416
1 The Mercurial system uses a set of configuration files to control
1 The Mercurial system uses a set of configuration files to control
2 aspects of its behavior.
2 aspects of its behavior.
3
3
4 Troubleshooting
4 Troubleshooting
5 ===============
5 ===============
6
6
7 If you're having problems with your configuration,
7 If you're having problems with your configuration,
8 :hg:`config --debug` can help you understand what is introducing
8 :hg:`config --debug` can help you understand what is introducing
9 a setting into your environment.
9 a setting into your environment.
10
10
11 See :hg:`help config.syntax` and :hg:`help config.files`
11 See :hg:`help config.syntax` and :hg:`help config.files`
12 for information about how and where to override things.
12 for information about how and where to override things.
13
13
14 Structure
14 Structure
15 =========
15 =========
16
16
17 The configuration files use a simple ini-file format. A configuration
17 The configuration files use a simple ini-file format. A configuration
18 file consists of sections, led by a ``[section]`` header and followed
18 file consists of sections, led by a ``[section]`` header and followed
19 by ``name = value`` entries::
19 by ``name = value`` entries::
20
20
21 [ui]
21 [ui]
22 username = Firstname Lastname <firstname.lastname@example.net>
22 username = Firstname Lastname <firstname.lastname@example.net>
23 verbose = True
23 verbose = True
24
24
25 The above entries will be referred to as ``ui.username`` and
25 The above entries will be referred to as ``ui.username`` and
26 ``ui.verbose``, respectively. See :hg:`help config.syntax`.
26 ``ui.verbose``, respectively. See :hg:`help config.syntax`.
27
27
28 Files
28 Files
29 =====
29 =====
30
30
31 Mercurial reads configuration data from several files, if they exist.
31 Mercurial reads configuration data from several files, if they exist.
32 These files do not exist by default and you will have to create the
32 These files do not exist by default and you will have to create the
33 appropriate configuration files yourself:
33 appropriate configuration files yourself:
34
34
35 Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
35 Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
36
36
37 Global configuration like the username setting is typically put into:
37 Global configuration like the username setting is typically put into:
38
38
39 .. container:: windows
39 .. container:: windows
40
40
41 - ``%USERPROFILE%\mercurial.ini`` (on Windows)
41 - ``%USERPROFILE%\mercurial.ini`` (on Windows)
42
42
43 .. container:: unix.plan9
43 .. container:: unix.plan9
44
44
45 - ``$HOME/.hgrc`` (on Unix, Plan9)
45 - ``$HOME/.hgrc`` (on Unix, Plan9)
46
46
47 The names of these files depend on the system on which Mercurial is
47 The names of these files depend on the system on which Mercurial is
48 installed. ``*.rc`` files from a single directory are read in
48 installed. ``*.rc`` files from a single directory are read in
49 alphabetical order, later ones overriding earlier ones. Where multiple
49 alphabetical order, later ones overriding earlier ones. Where multiple
50 paths are given below, settings from earlier paths override later
50 paths are given below, settings from earlier paths override later
51 ones.
51 ones.
52
52
53 .. container:: verbose.unix
53 .. container:: verbose.unix
54
54
55 On Unix, the following files are consulted:
55 On Unix, the following files are consulted:
56
56
57 - ``<repo>/.hg/hgrc`` (per-repository)
57 - ``<repo>/.hg/hgrc`` (per-repository)
58 - ``$HOME/.hgrc`` (per-user)
58 - ``$HOME/.hgrc`` (per-user)
59 - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user)
59 - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user)
60 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
60 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
61 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
61 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
62 - ``/etc/mercurial/hgrc`` (per-system)
62 - ``/etc/mercurial/hgrc`` (per-system)
63 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
63 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
64 - ``<internal>/default.d/*.rc`` (defaults)
64 - ``<internal>/default.d/*.rc`` (defaults)
65
65
66 .. container:: verbose.windows
66 .. container:: verbose.windows
67
67
68 On Windows, the following files are consulted:
68 On Windows, the following files are consulted:
69
69
70 - ``<repo>/.hg/hgrc`` (per-repository)
70 - ``<repo>/.hg/hgrc`` (per-repository)
71 - ``%USERPROFILE%\.hgrc`` (per-user)
71 - ``%USERPROFILE%\.hgrc`` (per-user)
72 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
72 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
73 - ``%HOME%\.hgrc`` (per-user)
73 - ``%HOME%\.hgrc`` (per-user)
74 - ``%HOME%\Mercurial.ini`` (per-user)
74 - ``%HOME%\Mercurial.ini`` (per-user)
75 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
75 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
76 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
76 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
77 - ``<install-dir>\Mercurial.ini`` (per-installation)
77 - ``<install-dir>\Mercurial.ini`` (per-installation)
78 - ``<internal>/default.d/*.rc`` (defaults)
78 - ``<internal>/default.d/*.rc`` (defaults)
79
79
80 .. note::
80 .. note::
81
81
82 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
82 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
83 is used when running 32-bit Python on 64-bit Windows.
83 is used when running 32-bit Python on 64-bit Windows.
84
84
85 .. container:: windows
85 .. container:: windows
86
86
87 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
87 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
88
88
89 .. container:: verbose.plan9
89 .. container:: verbose.plan9
90
90
91 On Plan9, the following files are consulted:
91 On Plan9, the following files are consulted:
92
92
93 - ``<repo>/.hg/hgrc`` (per-repository)
93 - ``<repo>/.hg/hgrc`` (per-repository)
94 - ``$home/lib/hgrc`` (per-user)
94 - ``$home/lib/hgrc`` (per-user)
95 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
95 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
96 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
96 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
97 - ``/lib/mercurial/hgrc`` (per-system)
97 - ``/lib/mercurial/hgrc`` (per-system)
98 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
98 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
99 - ``<internal>/default.d/*.rc`` (defaults)
99 - ``<internal>/default.d/*.rc`` (defaults)
100
100
101 Per-repository configuration options only apply in a
101 Per-repository configuration options only apply in a
102 particular repository. This file is not version-controlled, and
102 particular repository. This file is not version-controlled, and
103 will not get transferred during a "clone" operation. Options in
103 will not get transferred during a "clone" operation. Options in
104 this file override options in all other configuration files.
104 this file override options in all other configuration files.
105
105
106 .. container:: unix.plan9
106 .. container:: unix.plan9
107
107
108 On Plan 9 and Unix, most of this file will be ignored if it doesn't
108 On Plan 9 and Unix, most of this file will be ignored if it doesn't
109 belong to a trusted user or to a trusted group. See
109 belong to a trusted user or to a trusted group. See
110 :hg:`help config.trusted` for more details.
110 :hg:`help config.trusted` for more details.
111
111
112 Per-user configuration file(s) are for the user running Mercurial. Options
112 Per-user configuration file(s) are for the user running Mercurial. Options
113 in these files apply to all Mercurial commands executed by this user in any
113 in these files apply to all Mercurial commands executed by this user in any
114 directory. Options in these files override per-system and per-installation
114 directory. Options in these files override per-system and per-installation
115 options.
115 options.
116
116
117 Per-installation configuration files are searched for in the
117 Per-installation configuration files are searched for in the
118 directory where Mercurial is installed. ``<install-root>`` is the
118 directory where Mercurial is installed. ``<install-root>`` is the
119 parent directory of the **hg** executable (or symlink) being run.
119 parent directory of the **hg** executable (or symlink) being run.
120
120
121 .. container:: unix.plan9
121 .. container:: unix.plan9
122
122
123 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
123 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
124 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
124 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
125 files apply to all Mercurial commands executed by any user in any
125 files apply to all Mercurial commands executed by any user in any
126 directory.
126 directory.
127
127
128 Per-installation configuration files are for the system on
128 Per-installation configuration files are for the system on
129 which Mercurial is running. Options in these files apply to all
129 which Mercurial is running. Options in these files apply to all
130 Mercurial commands executed by any user in any directory. Registry
130 Mercurial commands executed by any user in any directory. Registry
131 keys contain PATH-like strings, every part of which must reference
131 keys contain PATH-like strings, every part of which must reference
132 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
132 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
133 be read. Mercurial checks each of these locations in the specified
133 be read. Mercurial checks each of these locations in the specified
134 order until one or more configuration files are detected.
134 order until one or more configuration files are detected.
135
135
136 Per-system configuration files are for the system on which Mercurial
136 Per-system configuration files are for the system on which Mercurial
137 is running. Options in these files apply to all Mercurial commands
137 is running. Options in these files apply to all Mercurial commands
138 executed by any user in any directory. Options in these files
138 executed by any user in any directory. Options in these files
139 override per-installation options.
139 override per-installation options.
140
140
141 Mercurial comes with some default configuration. The default configuration
141 Mercurial comes with some default configuration. The default configuration
142 files are installed with Mercurial and will be overwritten on upgrades. Default
142 files are installed with Mercurial and will be overwritten on upgrades. Default
143 configuration files should never be edited by users or administrators but can
143 configuration files should never be edited by users or administrators but can
144 be overridden in other configuration files. So far the directory only contains
144 be overridden in other configuration files. So far the directory only contains
145 merge tool configuration but packagers can also put other default configuration
145 merge tool configuration but packagers can also put other default configuration
146 there.
146 there.
147
147
148 Syntax
148 Syntax
149 ======
149 ======
150
150
151 A configuration file consists of sections, led by a ``[section]`` header
151 A configuration file consists of sections, led by a ``[section]`` header
152 and followed by ``name = value`` entries (sometimes called
152 and followed by ``name = value`` entries (sometimes called
153 ``configuration keys``)::
153 ``configuration keys``)::
154
154
155 [spam]
155 [spam]
156 eggs=ham
156 eggs=ham
157 green=
157 green=
158 eggs
158 eggs
159
159
160 Each line contains one entry. If the lines that follow are indented,
160 Each line contains one entry. If the lines that follow are indented,
161 they are treated as continuations of that entry. Leading whitespace is
161 they are treated as continuations of that entry. Leading whitespace is
162 removed from values. Empty lines are skipped. Lines beginning with
162 removed from values. Empty lines are skipped. Lines beginning with
163 ``#`` or ``;`` are ignored and may be used to provide comments.
163 ``#`` or ``;`` are ignored and may be used to provide comments.
164
164
165 Configuration keys can be set multiple times, in which case Mercurial
165 Configuration keys can be set multiple times, in which case Mercurial
166 will use the value that was configured last. As an example::
166 will use the value that was configured last. As an example::
167
167
168 [spam]
168 [spam]
169 eggs=large
169 eggs=large
170 ham=serrano
170 ham=serrano
171 eggs=small
171 eggs=small
172
172
173 This would set the configuration key named ``eggs`` to ``small``.
173 This would set the configuration key named ``eggs`` to ``small``.
174
174
175 It is also possible to define a section multiple times. A section can
175 It is also possible to define a section multiple times. A section can
176 be redefined on the same and/or on different configuration files. For
176 be redefined on the same and/or on different configuration files. For
177 example::
177 example::
178
178
179 [foo]
179 [foo]
180 eggs=large
180 eggs=large
181 ham=serrano
181 ham=serrano
182 eggs=small
182 eggs=small
183
183
184 [bar]
184 [bar]
185 eggs=ham
185 eggs=ham
186 green=
186 green=
187 eggs
187 eggs
188
188
189 [foo]
189 [foo]
190 ham=prosciutto
190 ham=prosciutto
191 eggs=medium
191 eggs=medium
192 bread=toasted
192 bread=toasted
193
193
194 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
194 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
195 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
195 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
196 respectively. As you can see there only thing that matters is the last
196 respectively. As you can see there only thing that matters is the last
197 value that was set for each of the configuration keys.
197 value that was set for each of the configuration keys.
198
198
199 If a configuration key is set multiple times in different
199 If a configuration key is set multiple times in different
200 configuration files the final value will depend on the order in which
200 configuration files the final value will depend on the order in which
201 the different configuration files are read, with settings from earlier
201 the different configuration files are read, with settings from earlier
202 paths overriding later ones as described on the ``Files`` section
202 paths overriding later ones as described on the ``Files`` section
203 above.
203 above.
204
204
205 A line of the form ``%include file`` will include ``file`` into the
205 A line of the form ``%include file`` will include ``file`` into the
206 current configuration file. The inclusion is recursive, which means
206 current configuration file. The inclusion is recursive, which means
207 that included files can include other files. Filenames are relative to
207 that included files can include other files. Filenames are relative to
208 the configuration file in which the ``%include`` directive is found.
208 the configuration file in which the ``%include`` directive is found.
209 Environment variables and ``~user`` constructs are expanded in
209 Environment variables and ``~user`` constructs are expanded in
210 ``file``. This lets you do something like::
210 ``file``. This lets you do something like::
211
211
212 %include ~/.hgrc.d/$HOST.rc
212 %include ~/.hgrc.d/$HOST.rc
213
213
214 to include a different configuration file on each computer you use.
214 to include a different configuration file on each computer you use.
215
215
216 A line with ``%unset name`` will remove ``name`` from the current
216 A line with ``%unset name`` will remove ``name`` from the current
217 section, if it has been set previously.
217 section, if it has been set previously.
218
218
219 The values are either free-form text strings, lists of text strings,
219 The values are either free-form text strings, lists of text strings,
220 or Boolean values. Boolean values can be set to true using any of "1",
220 or Boolean values. Boolean values can be set to true using any of "1",
221 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
221 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
222 (all case insensitive).
222 (all case insensitive).
223
223
224 List values are separated by whitespace or comma, except when values are
224 List values are separated by whitespace or comma, except when values are
225 placed in double quotation marks::
225 placed in double quotation marks::
226
226
227 allow_read = "John Doe, PhD", brian, betty
227 allow_read = "John Doe, PhD", brian, betty
228
228
229 Quotation marks can be escaped by prefixing them with a backslash. Only
229 Quotation marks can be escaped by prefixing them with a backslash. Only
230 quotation marks at the beginning of a word is counted as a quotation
230 quotation marks at the beginning of a word is counted as a quotation
231 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
231 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
232
232
233 Sections
233 Sections
234 ========
234 ========
235
235
236 This section describes the different sections that may appear in a
236 This section describes the different sections that may appear in a
237 Mercurial configuration file, the purpose of each section, its possible
237 Mercurial configuration file, the purpose of each section, its possible
238 keys, and their possible values.
238 keys, and their possible values.
239
239
240 ``alias``
240 ``alias``
241 ---------
241 ---------
242
242
243 Defines command aliases.
243 Defines command aliases.
244
244
245 Aliases allow you to define your own commands in terms of other
245 Aliases allow you to define your own commands in terms of other
246 commands (or aliases), optionally including arguments. Positional
246 commands (or aliases), optionally including arguments. Positional
247 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
247 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
248 are expanded by Mercurial before execution. Positional arguments not
248 are expanded by Mercurial before execution. Positional arguments not
249 already used by ``$N`` in the definition are put at the end of the
249 already used by ``$N`` in the definition are put at the end of the
250 command to be executed.
250 command to be executed.
251
251
252 Alias definitions consist of lines of the form::
252 Alias definitions consist of lines of the form::
253
253
254 <alias> = <command> [<argument>]...
254 <alias> = <command> [<argument>]...
255
255
256 For example, this definition::
256 For example, this definition::
257
257
258 latest = log --limit 5
258 latest = log --limit 5
259
259
260 creates a new command ``latest`` that shows only the five most recent
260 creates a new command ``latest`` that shows only the five most recent
261 changesets. You can define subsequent aliases using earlier ones::
261 changesets. You can define subsequent aliases using earlier ones::
262
262
263 stable5 = latest -b stable
263 stable5 = latest -b stable
264
264
265 .. note::
265 .. note::
266
266
267 It is possible to create aliases with the same names as
267 It is possible to create aliases with the same names as
268 existing commands, which will then override the original
268 existing commands, which will then override the original
269 definitions. This is almost always a bad idea!
269 definitions. This is almost always a bad idea!
270
270
271 An alias can start with an exclamation point (``!``) to make it a
271 An alias can start with an exclamation point (``!``) to make it a
272 shell alias. A shell alias is executed with the shell and will let you
272 shell alias. A shell alias is executed with the shell and will let you
273 run arbitrary commands. As an example, ::
273 run arbitrary commands. As an example, ::
274
274
275 echo = !echo $@
275 echo = !echo $@
276
276
277 will let you do ``hg echo foo`` to have ``foo`` printed in your
277 will let you do ``hg echo foo`` to have ``foo`` printed in your
278 terminal. A better example might be::
278 terminal. A better example might be::
279
279
280 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f
280 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f
281
281
282 which will make ``hg purge`` delete all unknown files in the
282 which will make ``hg purge`` delete all unknown files in the
283 repository in the same manner as the purge extension.
283 repository in the same manner as the purge extension.
284
284
285 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
285 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
286 expand to the command arguments. Unmatched arguments are
286 expand to the command arguments. Unmatched arguments are
287 removed. ``$0`` expands to the alias name and ``$@`` expands to all
287 removed. ``$0`` expands to the alias name and ``$@`` expands to all
288 arguments separated by a space. ``"$@"`` (with quotes) expands to all
288 arguments separated by a space. ``"$@"`` (with quotes) expands to all
289 arguments quoted individually and separated by a space. These expansions
289 arguments quoted individually and separated by a space. These expansions
290 happen before the command is passed to the shell.
290 happen before the command is passed to the shell.
291
291
292 Shell aliases are executed in an environment where ``$HG`` expands to
292 Shell aliases are executed in an environment where ``$HG`` expands to
293 the path of the Mercurial that was used to execute the alias. This is
293 the path of the Mercurial that was used to execute the alias. This is
294 useful when you want to call further Mercurial commands in a shell
294 useful when you want to call further Mercurial commands in a shell
295 alias, as was done above for the purge alias. In addition,
295 alias, as was done above for the purge alias. In addition,
296 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
296 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
297 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
297 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
298
298
299 .. note::
299 .. note::
300
300
301 Some global configuration options such as ``-R`` are
301 Some global configuration options such as ``-R`` are
302 processed before shell aliases and will thus not be passed to
302 processed before shell aliases and will thus not be passed to
303 aliases.
303 aliases.
304
304
305
305
306 ``annotate``
306 ``annotate``
307 ------------
307 ------------
308
308
309 Settings used when displaying file annotations. All values are
309 Settings used when displaying file annotations. All values are
310 Booleans and default to False. See :hg:`help config.diff` for
310 Booleans and default to False. See :hg:`help config.diff` for
311 related options for the diff command.
311 related options for the diff command.
312
312
313 ``ignorews``
313 ``ignorews``
314 Ignore white space when comparing lines.
314 Ignore white space when comparing lines.
315
315
316 ``ignorewsamount``
316 ``ignorewsamount``
317 Ignore changes in the amount of white space.
317 Ignore changes in the amount of white space.
318
318
319 ``ignoreblanklines``
319 ``ignoreblanklines``
320 Ignore changes whose lines are all blank.
320 Ignore changes whose lines are all blank.
321
321
322
322
323 ``auth``
323 ``auth``
324 --------
324 --------
325
325
326 Authentication credentials and other authentication-like configuration
326 Authentication credentials and other authentication-like configuration
327 for HTTP connections. This section allows you to store usernames and
327 for HTTP connections. This section allows you to store usernames and
328 passwords for use when logging *into* HTTP servers. See
328 passwords for use when logging *into* HTTP servers. See
329 :hg:`help config.web` if you want to configure *who* can login to
329 :hg:`help config.web` if you want to configure *who* can login to
330 your HTTP server.
330 your HTTP server.
331
331
332 The following options apply to all hosts.
332 The following options apply to all hosts.
333
333
334 ``cookiefile``
334 ``cookiefile``
335 Path to a file containing HTTP cookie lines. Cookies matching a
335 Path to a file containing HTTP cookie lines. Cookies matching a
336 host will be sent automatically.
336 host will be sent automatically.
337
337
338 The file format uses the Mozilla cookies.txt format, which defines cookies
338 The file format uses the Mozilla cookies.txt format, which defines cookies
339 on their own lines. Each line contains 7 fields delimited by the tab
339 on their own lines. Each line contains 7 fields delimited by the tab
340 character (domain, is_domain_cookie, path, is_secure, expires, name,
340 character (domain, is_domain_cookie, path, is_secure, expires, name,
341 value). For more info, do an Internet search for "Netscape cookies.txt
341 value). For more info, do an Internet search for "Netscape cookies.txt
342 format."
342 format."
343
343
344 Note: the cookies parser does not handle port numbers on domains. You
344 Note: the cookies parser does not handle port numbers on domains. You
345 will need to remove ports from the domain for the cookie to be recognized.
345 will need to remove ports from the domain for the cookie to be recognized.
346 This could result in a cookie being disclosed to an unwanted server.
346 This could result in a cookie being disclosed to an unwanted server.
347
347
348 The cookies file is read-only.
348 The cookies file is read-only.
349
349
350 Other options in this section are grouped by name and have the following
350 Other options in this section are grouped by name and have the following
351 format::
351 format::
352
352
353 <name>.<argument> = <value>
353 <name>.<argument> = <value>
354
354
355 where ``<name>`` is used to group arguments into authentication
355 where ``<name>`` is used to group arguments into authentication
356 entries. Example::
356 entries. Example::
357
357
358 foo.prefix = hg.intevation.de/mercurial
358 foo.prefix = hg.intevation.de/mercurial
359 foo.username = foo
359 foo.username = foo
360 foo.password = bar
360 foo.password = bar
361 foo.schemes = http https
361 foo.schemes = http https
362
362
363 bar.prefix = secure.example.org
363 bar.prefix = secure.example.org
364 bar.key = path/to/file.key
364 bar.key = path/to/file.key
365 bar.cert = path/to/file.cert
365 bar.cert = path/to/file.cert
366 bar.schemes = https
366 bar.schemes = https
367
367
368 Supported arguments:
368 Supported arguments:
369
369
370 ``prefix``
370 ``prefix``
371 Either ``*`` or a URI prefix with or without the scheme part.
371 Either ``*`` or a URI prefix with or without the scheme part.
372 The authentication entry with the longest matching prefix is used
372 The authentication entry with the longest matching prefix is used
373 (where ``*`` matches everything and counts as a match of length
373 (where ``*`` matches everything and counts as a match of length
374 1). If the prefix doesn't include a scheme, the match is performed
374 1). If the prefix doesn't include a scheme, the match is performed
375 against the URI with its scheme stripped as well, and the schemes
375 against the URI with its scheme stripped as well, and the schemes
376 argument, q.v., is then subsequently consulted.
376 argument, q.v., is then subsequently consulted.
377
377
378 ``username``
378 ``username``
379 Optional. Username to authenticate with. If not given, and the
379 Optional. Username to authenticate with. If not given, and the
380 remote site requires basic or digest authentication, the user will
380 remote site requires basic or digest authentication, the user will
381 be prompted for it. Environment variables are expanded in the
381 be prompted for it. Environment variables are expanded in the
382 username letting you do ``foo.username = $USER``. If the URI
382 username letting you do ``foo.username = $USER``. If the URI
383 includes a username, only ``[auth]`` entries with a matching
383 includes a username, only ``[auth]`` entries with a matching
384 username or without a username will be considered.
384 username or without a username will be considered.
385
385
386 ``password``
386 ``password``
387 Optional. Password to authenticate with. If not given, and the
387 Optional. Password to authenticate with. If not given, and the
388 remote site requires basic or digest authentication, the user
388 remote site requires basic or digest authentication, the user
389 will be prompted for it.
389 will be prompted for it.
390
390
391 ``key``
391 ``key``
392 Optional. PEM encoded client certificate key file. Environment
392 Optional. PEM encoded client certificate key file. Environment
393 variables are expanded in the filename.
393 variables are expanded in the filename.
394
394
395 ``cert``
395 ``cert``
396 Optional. PEM encoded client certificate chain file. Environment
396 Optional. PEM encoded client certificate chain file. Environment
397 variables are expanded in the filename.
397 variables are expanded in the filename.
398
398
399 ``schemes``
399 ``schemes``
400 Optional. Space separated list of URI schemes to use this
400 Optional. Space separated list of URI schemes to use this
401 authentication entry with. Only used if the prefix doesn't include
401 authentication entry with. Only used if the prefix doesn't include
402 a scheme. Supported schemes are http and https. They will match
402 a scheme. Supported schemes are http and https. They will match
403 static-http and static-https respectively, as well.
403 static-http and static-https respectively, as well.
404 (default: https)
404 (default: https)
405
405
406 If no suitable authentication entry is found, the user is prompted
406 If no suitable authentication entry is found, the user is prompted
407 for credentials as usual if required by the remote.
407 for credentials as usual if required by the remote.
408
408
409 ``color``
409 ``color``
410 ---------
410 ---------
411
411
412 Configure the Mercurial color mode. For details about how to define your custom
412 Configure the Mercurial color mode. For details about how to define your custom
413 effect and style see :hg:`help color`.
413 effect and style see :hg:`help color`.
414
414
415 ``mode``
415 ``mode``
416 String: control the method used to output color. One of ``auto``, ``ansi``,
416 String: control the method used to output color. One of ``auto``, ``ansi``,
417 ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will
417 ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will
418 use ANSI mode by default (or win32 mode on Windows) if it detects a
418 use ANSI mode by default (or win32 mode on Windows) if it detects a
419 terminal. Any invalid value will disable color.
419 terminal. Any invalid value will disable color.
420
420
421 ``pagermode``
421 ``pagermode``
422 String: optional override of ``color.mode`` used with pager.
422 String: optional override of ``color.mode`` used with pager.
423
423
424 On some systems, terminfo mode may cause problems when using
424 On some systems, terminfo mode may cause problems when using
425 color with ``less -R`` as a pager program. less with the -R option
425 color with ``less -R`` as a pager program. less with the -R option
426 will only display ECMA-48 color codes, and terminfo mode may sometimes
426 will only display ECMA-48 color codes, and terminfo mode may sometimes
427 emit codes that less doesn't understand. You can work around this by
427 emit codes that less doesn't understand. You can work around this by
428 either using ansi mode (or auto mode), or by using less -r (which will
428 either using ansi mode (or auto mode), or by using less -r (which will
429 pass through all terminal control codes, not just color control
429 pass through all terminal control codes, not just color control
430 codes).
430 codes).
431
431
432 On some systems (such as MSYS in Windows), the terminal may support
432 On some systems (such as MSYS in Windows), the terminal may support
433 a different color mode than the pager program.
433 a different color mode than the pager program.
434
434
435 ``commands``
435 ``commands``
436 ------------
436 ------------
437
437
438 ``status.relative``
438 ``status.relative``
439 Make paths in :hg:`status` output relative to the current directory.
439 Make paths in :hg:`status` output relative to the current directory.
440 (default: False)
440 (default: False)
441
441
442 ``update.requiredest``
442 ``update.requiredest``
443 Require that the user pass a destination when running :hg:`update`.
443 Require that the user pass a destination when running :hg:`update`.
444 For example, :hg:`update .::` will be allowed, but a plain :hg:`update`
444 For example, :hg:`update .::` will be allowed, but a plain :hg:`update`
445 will be disallowed.
445 will be disallowed.
446 (default: False)
446 (default: False)
447
447
448 ``committemplate``
448 ``committemplate``
449 ------------------
449 ------------------
450
450
451 ``changeset``
451 ``changeset``
452 String: configuration in this section is used as the template to
452 String: configuration in this section is used as the template to
453 customize the text shown in the editor when committing.
453 customize the text shown in the editor when committing.
454
454
455 In addition to pre-defined template keywords, commit log specific one
455 In addition to pre-defined template keywords, commit log specific one
456 below can be used for customization:
456 below can be used for customization:
457
457
458 ``extramsg``
458 ``extramsg``
459 String: Extra message (typically 'Leave message empty to abort
459 String: Extra message (typically 'Leave message empty to abort
460 commit.'). This may be changed by some commands or extensions.
460 commit.'). This may be changed by some commands or extensions.
461
461
462 For example, the template configuration below shows as same text as
462 For example, the template configuration below shows as same text as
463 one shown by default::
463 one shown by default::
464
464
465 [committemplate]
465 [committemplate]
466 changeset = {desc}\n\n
466 changeset = {desc}\n\n
467 HG: Enter commit message. Lines beginning with 'HG:' are removed.
467 HG: Enter commit message. Lines beginning with 'HG:' are removed.
468 HG: {extramsg}
468 HG: {extramsg}
469 HG: --
469 HG: --
470 HG: user: {author}\n{ifeq(p2rev, "-1", "",
470 HG: user: {author}\n{ifeq(p2rev, "-1", "",
471 "HG: branch merge\n")
471 "HG: branch merge\n")
472 }HG: branch '{branch}'\n{if(activebookmark,
472 }HG: branch '{branch}'\n{if(activebookmark,
473 "HG: bookmark '{activebookmark}'\n") }{subrepos %
473 "HG: bookmark '{activebookmark}'\n") }{subrepos %
474 "HG: subrepo {subrepo}\n" }{file_adds %
474 "HG: subrepo {subrepo}\n" }{file_adds %
475 "HG: added {file}\n" }{file_mods %
475 "HG: added {file}\n" }{file_mods %
476 "HG: changed {file}\n" }{file_dels %
476 "HG: changed {file}\n" }{file_dels %
477 "HG: removed {file}\n" }{if(files, "",
477 "HG: removed {file}\n" }{if(files, "",
478 "HG: no files changed\n")}
478 "HG: no files changed\n")}
479
479
480 ``diff()``
480 ``diff()``
481 String: show the diff (see :hg:`help templates` for detail)
481 String: show the diff (see :hg:`help templates` for detail)
482
482
483 Sometimes it is helpful to show the diff of the changeset in the editor without
483 Sometimes it is helpful to show the diff of the changeset in the editor without
484 having to prefix 'HG: ' to each line so that highlighting works correctly. For
484 having to prefix 'HG: ' to each line so that highlighting works correctly. For
485 this, Mercurial provides a special string which will ignore everything below
485 this, Mercurial provides a special string which will ignore everything below
486 it::
486 it::
487
487
488 HG: ------------------------ >8 ------------------------
488 HG: ------------------------ >8 ------------------------
489
489
490 For example, the template configuration below will show the diff below the
490 For example, the template configuration below will show the diff below the
491 extra message::
491 extra message::
492
492
493 [committemplate]
493 [committemplate]
494 changeset = {desc}\n\n
494 changeset = {desc}\n\n
495 HG: Enter commit message. Lines beginning with 'HG:' are removed.
495 HG: Enter commit message. Lines beginning with 'HG:' are removed.
496 HG: {extramsg}
496 HG: {extramsg}
497 HG: ------------------------ >8 ------------------------
497 HG: ------------------------ >8 ------------------------
498 HG: Do not touch the line above.
498 HG: Do not touch the line above.
499 HG: Everything below will be removed.
499 HG: Everything below will be removed.
500 {diff()}
500 {diff()}
501
501
502 .. note::
502 .. note::
503
503
504 For some problematic encodings (see :hg:`help win32mbcs` for
504 For some problematic encodings (see :hg:`help win32mbcs` for
505 detail), this customization should be configured carefully, to
505 detail), this customization should be configured carefully, to
506 avoid showing broken characters.
506 avoid showing broken characters.
507
507
508 For example, if a multibyte character ending with backslash (0x5c) is
508 For example, if a multibyte character ending with backslash (0x5c) is
509 followed by the ASCII character 'n' in the customized template,
509 followed by the ASCII character 'n' in the customized template,
510 the sequence of backslash and 'n' is treated as line-feed unexpectedly
510 the sequence of backslash and 'n' is treated as line-feed unexpectedly
511 (and the multibyte character is broken, too).
511 (and the multibyte character is broken, too).
512
512
513 Customized template is used for commands below (``--edit`` may be
513 Customized template is used for commands below (``--edit`` may be
514 required):
514 required):
515
515
516 - :hg:`backout`
516 - :hg:`backout`
517 - :hg:`commit`
517 - :hg:`commit`
518 - :hg:`fetch` (for merge commit only)
518 - :hg:`fetch` (for merge commit only)
519 - :hg:`graft`
519 - :hg:`graft`
520 - :hg:`histedit`
520 - :hg:`histedit`
521 - :hg:`import`
521 - :hg:`import`
522 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
522 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
523 - :hg:`rebase`
523 - :hg:`rebase`
524 - :hg:`shelve`
524 - :hg:`shelve`
525 - :hg:`sign`
525 - :hg:`sign`
526 - :hg:`tag`
526 - :hg:`tag`
527 - :hg:`transplant`
527 - :hg:`transplant`
528
528
529 Configuring items below instead of ``changeset`` allows showing
529 Configuring items below instead of ``changeset`` allows showing
530 customized message only for specific actions, or showing different
530 customized message only for specific actions, or showing different
531 messages for each action.
531 messages for each action.
532
532
533 - ``changeset.backout`` for :hg:`backout`
533 - ``changeset.backout`` for :hg:`backout`
534 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
534 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
535 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
535 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
536 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
536 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
537 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
537 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
538 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
538 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
539 - ``changeset.gpg.sign`` for :hg:`sign`
539 - ``changeset.gpg.sign`` for :hg:`sign`
540 - ``changeset.graft`` for :hg:`graft`
540 - ``changeset.graft`` for :hg:`graft`
541 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
541 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
542 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
542 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
543 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
543 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
544 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
544 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
545 - ``changeset.import.bypass`` for :hg:`import --bypass`
545 - ``changeset.import.bypass`` for :hg:`import --bypass`
546 - ``changeset.import.normal.merge`` for :hg:`import` on merges
546 - ``changeset.import.normal.merge`` for :hg:`import` on merges
547 - ``changeset.import.normal.normal`` for :hg:`import` on other
547 - ``changeset.import.normal.normal`` for :hg:`import` on other
548 - ``changeset.mq.qnew`` for :hg:`qnew`
548 - ``changeset.mq.qnew`` for :hg:`qnew`
549 - ``changeset.mq.qfold`` for :hg:`qfold`
549 - ``changeset.mq.qfold`` for :hg:`qfold`
550 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
550 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
551 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
551 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
552 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
552 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
553 - ``changeset.rebase.normal`` for :hg:`rebase` on other
553 - ``changeset.rebase.normal`` for :hg:`rebase` on other
554 - ``changeset.shelve.shelve`` for :hg:`shelve`
554 - ``changeset.shelve.shelve`` for :hg:`shelve`
555 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
555 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
556 - ``changeset.tag.remove`` for :hg:`tag --remove`
556 - ``changeset.tag.remove`` for :hg:`tag --remove`
557 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
557 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
558 - ``changeset.transplant.normal`` for :hg:`transplant` on other
558 - ``changeset.transplant.normal`` for :hg:`transplant` on other
559
559
560 These dot-separated lists of names are treated as hierarchical ones.
560 These dot-separated lists of names are treated as hierarchical ones.
561 For example, ``changeset.tag.remove`` customizes the commit message
561 For example, ``changeset.tag.remove`` customizes the commit message
562 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
562 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
563 commit message for :hg:`tag` regardless of ``--remove`` option.
563 commit message for :hg:`tag` regardless of ``--remove`` option.
564
564
565 When the external editor is invoked for a commit, the corresponding
565 When the external editor is invoked for a commit, the corresponding
566 dot-separated list of names without the ``changeset.`` prefix
566 dot-separated list of names without the ``changeset.`` prefix
567 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
567 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
568 variable.
568 variable.
569
569
570 In this section, items other than ``changeset`` can be referred from
570 In this section, items other than ``changeset`` can be referred from
571 others. For example, the configuration to list committed files up
571 others. For example, the configuration to list committed files up
572 below can be referred as ``{listupfiles}``::
572 below can be referred as ``{listupfiles}``::
573
573
574 [committemplate]
574 [committemplate]
575 listupfiles = {file_adds %
575 listupfiles = {file_adds %
576 "HG: added {file}\n" }{file_mods %
576 "HG: added {file}\n" }{file_mods %
577 "HG: changed {file}\n" }{file_dels %
577 "HG: changed {file}\n" }{file_dels %
578 "HG: removed {file}\n" }{if(files, "",
578 "HG: removed {file}\n" }{if(files, "",
579 "HG: no files changed\n")}
579 "HG: no files changed\n")}
580
580
581 ``decode/encode``
581 ``decode/encode``
582 -----------------
582 -----------------
583
583
584 Filters for transforming files on checkout/checkin. This would
584 Filters for transforming files on checkout/checkin. This would
585 typically be used for newline processing or other
585 typically be used for newline processing or other
586 localization/canonicalization of files.
586 localization/canonicalization of files.
587
587
588 Filters consist of a filter pattern followed by a filter command.
588 Filters consist of a filter pattern followed by a filter command.
589 Filter patterns are globs by default, rooted at the repository root.
589 Filter patterns are globs by default, rooted at the repository root.
590 For example, to match any file ending in ``.txt`` in the root
590 For example, to match any file ending in ``.txt`` in the root
591 directory only, use the pattern ``*.txt``. To match any file ending
591 directory only, use the pattern ``*.txt``. To match any file ending
592 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
592 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
593 For each file only the first matching filter applies.
593 For each file only the first matching filter applies.
594
594
595 The filter command can start with a specifier, either ``pipe:`` or
595 The filter command can start with a specifier, either ``pipe:`` or
596 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
596 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
597
597
598 A ``pipe:`` command must accept data on stdin and return the transformed
598 A ``pipe:`` command must accept data on stdin and return the transformed
599 data on stdout.
599 data on stdout.
600
600
601 Pipe example::
601 Pipe example::
602
602
603 [encode]
603 [encode]
604 # uncompress gzip files on checkin to improve delta compression
604 # uncompress gzip files on checkin to improve delta compression
605 # note: not necessarily a good idea, just an example
605 # note: not necessarily a good idea, just an example
606 *.gz = pipe: gunzip
606 *.gz = pipe: gunzip
607
607
608 [decode]
608 [decode]
609 # recompress gzip files when writing them to the working dir (we
609 # recompress gzip files when writing them to the working dir (we
610 # can safely omit "pipe:", because it's the default)
610 # can safely omit "pipe:", because it's the default)
611 *.gz = gzip
611 *.gz = gzip
612
612
613 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
613 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
614 with the name of a temporary file that contains the data to be
614 with the name of a temporary file that contains the data to be
615 filtered by the command. The string ``OUTFILE`` is replaced with the name
615 filtered by the command. The string ``OUTFILE`` is replaced with the name
616 of an empty temporary file, where the filtered data must be written by
616 of an empty temporary file, where the filtered data must be written by
617 the command.
617 the command.
618
618
619 .. container:: windows
619 .. container:: windows
620
620
621 .. note::
621 .. note::
622
622
623 The tempfile mechanism is recommended for Windows systems,
623 The tempfile mechanism is recommended for Windows systems,
624 where the standard shell I/O redirection operators often have
624 where the standard shell I/O redirection operators often have
625 strange effects and may corrupt the contents of your files.
625 strange effects and may corrupt the contents of your files.
626
626
627 This filter mechanism is used internally by the ``eol`` extension to
627 This filter mechanism is used internally by the ``eol`` extension to
628 translate line ending characters between Windows (CRLF) and Unix (LF)
628 translate line ending characters between Windows (CRLF) and Unix (LF)
629 format. We suggest you use the ``eol`` extension for convenience.
629 format. We suggest you use the ``eol`` extension for convenience.
630
630
631
631
632 ``defaults``
632 ``defaults``
633 ------------
633 ------------
634
634
635 (defaults are deprecated. Don't use them. Use aliases instead.)
635 (defaults are deprecated. Don't use them. Use aliases instead.)
636
636
637 Use the ``[defaults]`` section to define command defaults, i.e. the
637 Use the ``[defaults]`` section to define command defaults, i.e. the
638 default options/arguments to pass to the specified commands.
638 default options/arguments to pass to the specified commands.
639
639
640 The following example makes :hg:`log` run in verbose mode, and
640 The following example makes :hg:`log` run in verbose mode, and
641 :hg:`status` show only the modified files, by default::
641 :hg:`status` show only the modified files, by default::
642
642
643 [defaults]
643 [defaults]
644 log = -v
644 log = -v
645 status = -m
645 status = -m
646
646
647 The actual commands, instead of their aliases, must be used when
647 The actual commands, instead of their aliases, must be used when
648 defining command defaults. The command defaults will also be applied
648 defining command defaults. The command defaults will also be applied
649 to the aliases of the commands defined.
649 to the aliases of the commands defined.
650
650
651
651
652 ``diff``
652 ``diff``
653 --------
653 --------
654
654
655 Settings used when displaying diffs. Everything except for ``unified``
655 Settings used when displaying diffs. Everything except for ``unified``
656 is a Boolean and defaults to False. See :hg:`help config.annotate`
656 is a Boolean and defaults to False. See :hg:`help config.annotate`
657 for related options for the annotate command.
657 for related options for the annotate command.
658
658
659 ``git``
659 ``git``
660 Use git extended diff format.
660 Use git extended diff format.
661
661
662 ``nobinary``
662 ``nobinary``
663 Omit git binary patches.
663 Omit git binary patches.
664
664
665 ``nodates``
665 ``nodates``
666 Don't include dates in diff headers.
666 Don't include dates in diff headers.
667
667
668 ``noprefix``
668 ``noprefix``
669 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
669 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
670
670
671 ``showfunc``
671 ``showfunc``
672 Show which function each change is in.
672 Show which function each change is in.
673
673
674 ``ignorews``
674 ``ignorews``
675 Ignore white space when comparing lines.
675 Ignore white space when comparing lines.
676
676
677 ``ignorewsamount``
677 ``ignorewsamount``
678 Ignore changes in the amount of white space.
678 Ignore changes in the amount of white space.
679
679
680 ``ignoreblanklines``
680 ``ignoreblanklines``
681 Ignore changes whose lines are all blank.
681 Ignore changes whose lines are all blank.
682
682
683 ``unified``
683 ``unified``
684 Number of lines of context to show.
684 Number of lines of context to show.
685
685
686 ``email``
686 ``email``
687 ---------
687 ---------
688
688
689 Settings for extensions that send email messages.
689 Settings for extensions that send email messages.
690
690
691 ``from``
691 ``from``
692 Optional. Email address to use in "From" header and SMTP envelope
692 Optional. Email address to use in "From" header and SMTP envelope
693 of outgoing messages.
693 of outgoing messages.
694
694
695 ``to``
695 ``to``
696 Optional. Comma-separated list of recipients' email addresses.
696 Optional. Comma-separated list of recipients' email addresses.
697
697
698 ``cc``
698 ``cc``
699 Optional. Comma-separated list of carbon copy recipients'
699 Optional. Comma-separated list of carbon copy recipients'
700 email addresses.
700 email addresses.
701
701
702 ``bcc``
702 ``bcc``
703 Optional. Comma-separated list of blind carbon copy recipients'
703 Optional. Comma-separated list of blind carbon copy recipients'
704 email addresses.
704 email addresses.
705
705
706 ``method``
706 ``method``
707 Optional. Method to use to send email messages. If value is ``smtp``
707 Optional. Method to use to send email messages. If value is ``smtp``
708 (default), use SMTP (see the ``[smtp]`` section for configuration).
708 (default), use SMTP (see the ``[smtp]`` section for configuration).
709 Otherwise, use as name of program to run that acts like sendmail
709 Otherwise, use as name of program to run that acts like sendmail
710 (takes ``-f`` option for sender, list of recipients on command line,
710 (takes ``-f`` option for sender, list of recipients on command line,
711 message on stdin). Normally, setting this to ``sendmail`` or
711 message on stdin). Normally, setting this to ``sendmail`` or
712 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
712 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
713
713
714 ``charsets``
714 ``charsets``
715 Optional. Comma-separated list of character sets considered
715 Optional. Comma-separated list of character sets considered
716 convenient for recipients. Addresses, headers, and parts not
716 convenient for recipients. Addresses, headers, and parts not
717 containing patches of outgoing messages will be encoded in the
717 containing patches of outgoing messages will be encoded in the
718 first character set to which conversion from local encoding
718 first character set to which conversion from local encoding
719 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
719 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
720 conversion fails, the text in question is sent as is.
720 conversion fails, the text in question is sent as is.
721 (default: '')
721 (default: '')
722
722
723 Order of outgoing email character sets:
723 Order of outgoing email character sets:
724
724
725 1. ``us-ascii``: always first, regardless of settings
725 1. ``us-ascii``: always first, regardless of settings
726 2. ``email.charsets``: in order given by user
726 2. ``email.charsets``: in order given by user
727 3. ``ui.fallbackencoding``: if not in email.charsets
727 3. ``ui.fallbackencoding``: if not in email.charsets
728 4. ``$HGENCODING``: if not in email.charsets
728 4. ``$HGENCODING``: if not in email.charsets
729 5. ``utf-8``: always last, regardless of settings
729 5. ``utf-8``: always last, regardless of settings
730
730
731 Email example::
731 Email example::
732
732
733 [email]
733 [email]
734 from = Joseph User <joe.user@example.com>
734 from = Joseph User <joe.user@example.com>
735 method = /usr/sbin/sendmail
735 method = /usr/sbin/sendmail
736 # charsets for western Europeans
736 # charsets for western Europeans
737 # us-ascii, utf-8 omitted, as they are tried first and last
737 # us-ascii, utf-8 omitted, as they are tried first and last
738 charsets = iso-8859-1, iso-8859-15, windows-1252
738 charsets = iso-8859-1, iso-8859-15, windows-1252
739
739
740
740
741 ``extensions``
741 ``extensions``
742 --------------
742 --------------
743
743
744 Mercurial has an extension mechanism for adding new features. To
744 Mercurial has an extension mechanism for adding new features. To
745 enable an extension, create an entry for it in this section.
745 enable an extension, create an entry for it in this section.
746
746
747 If you know that the extension is already in Python's search path,
747 If you know that the extension is already in Python's search path,
748 you can give the name of the module, followed by ``=``, with nothing
748 you can give the name of the module, followed by ``=``, with nothing
749 after the ``=``.
749 after the ``=``.
750
750
751 Otherwise, give a name that you choose, followed by ``=``, followed by
751 Otherwise, give a name that you choose, followed by ``=``, followed by
752 the path to the ``.py`` file (including the file name extension) that
752 the path to the ``.py`` file (including the file name extension) that
753 defines the extension.
753 defines the extension.
754
754
755 To explicitly disable an extension that is enabled in an hgrc of
755 To explicitly disable an extension that is enabled in an hgrc of
756 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
756 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
757 or ``foo = !`` when path is not supplied.
757 or ``foo = !`` when path is not supplied.
758
758
759 Example for ``~/.hgrc``::
759 Example for ``~/.hgrc``::
760
760
761 [extensions]
761 [extensions]
762 # (the churn extension will get loaded from Mercurial's path)
762 # (the churn extension will get loaded from Mercurial's path)
763 churn =
763 churn =
764 # (this extension will get loaded from the file specified)
764 # (this extension will get loaded from the file specified)
765 myfeature = ~/.hgext/myfeature.py
765 myfeature = ~/.hgext/myfeature.py
766
766
767
767
768 ``format``
768 ``format``
769 ----------
769 ----------
770
770
771 ``usegeneraldelta``
771 ``usegeneraldelta``
772 Enable or disable the "generaldelta" repository format which improves
772 Enable or disable the "generaldelta" repository format which improves
773 repository compression by allowing "revlog" to store delta against arbitrary
773 repository compression by allowing "revlog" to store delta against arbitrary
774 revision instead of the previous stored one. This provides significant
774 revision instead of the previous stored one. This provides significant
775 improvement for repositories with branches.
775 improvement for repositories with branches.
776
776
777 Repositories with this on-disk format require Mercurial version 1.9.
777 Repositories with this on-disk format require Mercurial version 1.9.
778
778
779 Enabled by default.
779 Enabled by default.
780
780
781 ``dotencode``
781 ``dotencode``
782 Enable or disable the "dotencode" repository format which enhances
782 Enable or disable the "dotencode" repository format which enhances
783 the "fncache" repository format (which has to be enabled to use
783 the "fncache" repository format (which has to be enabled to use
784 dotencode) to avoid issues with filenames starting with ._ on
784 dotencode) to avoid issues with filenames starting with ._ on
785 Mac OS X and spaces on Windows.
785 Mac OS X and spaces on Windows.
786
786
787 Repositories with this on-disk format require Mercurial version 1.7.
787 Repositories with this on-disk format require Mercurial version 1.7.
788
788
789 Enabled by default.
789 Enabled by default.
790
790
791 ``usefncache``
791 ``usefncache``
792 Enable or disable the "fncache" repository format which enhances
792 Enable or disable the "fncache" repository format which enhances
793 the "store" repository format (which has to be enabled to use
793 the "store" repository format (which has to be enabled to use
794 fncache) to allow longer filenames and avoids using Windows
794 fncache) to allow longer filenames and avoids using Windows
795 reserved names, e.g. "nul".
795 reserved names, e.g. "nul".
796
796
797 Repositories with this on-disk format require Mercurial version 1.1.
797 Repositories with this on-disk format require Mercurial version 1.1.
798
798
799 Enabled by default.
799 Enabled by default.
800
800
801 ``usestore``
801 ``usestore``
802 Enable or disable the "store" repository format which improves
802 Enable or disable the "store" repository format which improves
803 compatibility with systems that fold case or otherwise mangle
803 compatibility with systems that fold case or otherwise mangle
804 filenames. Disabling this option will allow you to store longer filenames
804 filenames. Disabling this option will allow you to store longer filenames
805 in some situations at the expense of compatibility.
805 in some situations at the expense of compatibility.
806
806
807 Repositories with this on-disk format require Mercurial version 0.9.4.
807 Repositories with this on-disk format require Mercurial version 0.9.4.
808
808
809 Enabled by default.
809 Enabled by default.
810
810
811 ``graph``
811 ``graph``
812 ---------
812 ---------
813
813
814 Web graph view configuration. This section let you change graph
814 Web graph view configuration. This section let you change graph
815 elements display properties by branches, for instance to make the
815 elements display properties by branches, for instance to make the
816 ``default`` branch stand out.
816 ``default`` branch stand out.
817
817
818 Each line has the following format::
818 Each line has the following format::
819
819
820 <branch>.<argument> = <value>
820 <branch>.<argument> = <value>
821
821
822 where ``<branch>`` is the name of the branch being
822 where ``<branch>`` is the name of the branch being
823 customized. Example::
823 customized. Example::
824
824
825 [graph]
825 [graph]
826 # 2px width
826 # 2px width
827 default.width = 2
827 default.width = 2
828 # red color
828 # red color
829 default.color = FF0000
829 default.color = FF0000
830
830
831 Supported arguments:
831 Supported arguments:
832
832
833 ``width``
833 ``width``
834 Set branch edges width in pixels.
834 Set branch edges width in pixels.
835
835
836 ``color``
836 ``color``
837 Set branch edges color in hexadecimal RGB notation.
837 Set branch edges color in hexadecimal RGB notation.
838
838
839 ``hooks``
839 ``hooks``
840 ---------
840 ---------
841
841
842 Commands or Python functions that get automatically executed by
842 Commands or Python functions that get automatically executed by
843 various actions such as starting or finishing a commit. Multiple
843 various actions such as starting or finishing a commit. Multiple
844 hooks can be run for the same action by appending a suffix to the
844 hooks can be run for the same action by appending a suffix to the
845 action. Overriding a site-wide hook can be done by changing its
845 action. Overriding a site-wide hook can be done by changing its
846 value or setting it to an empty string. Hooks can be prioritized
846 value or setting it to an empty string. Hooks can be prioritized
847 by adding a prefix of ``priority.`` to the hook name on a new line
847 by adding a prefix of ``priority.`` to the hook name on a new line
848 and setting the priority. The default priority is 0.
848 and setting the priority. The default priority is 0.
849
849
850 Example ``.hg/hgrc``::
850 Example ``.hg/hgrc``::
851
851
852 [hooks]
852 [hooks]
853 # update working directory after adding changesets
853 # update working directory after adding changesets
854 changegroup.update = hg update
854 changegroup.update = hg update
855 # do not use the site-wide hook
855 # do not use the site-wide hook
856 incoming =
856 incoming =
857 incoming.email = /my/email/hook
857 incoming.email = /my/email/hook
858 incoming.autobuild = /my/build/hook
858 incoming.autobuild = /my/build/hook
859 # force autobuild hook to run before other incoming hooks
859 # force autobuild hook to run before other incoming hooks
860 priority.incoming.autobuild = 1
860 priority.incoming.autobuild = 1
861
861
862 Most hooks are run with environment variables set that give useful
862 Most hooks are run with environment variables set that give useful
863 additional information. For each hook below, the environment variables
863 additional information. For each hook below, the environment variables
864 it is passed are listed with names of the form ``$HG_foo``. The
864 it is passed are listed with names of the form ``$HG_foo``. The
865 ``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.
865 ``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.
866 their respectively contains the type of hook which triggered the run and
866 their respectively contains the type of hook which triggered the run and
867 the full name of the hooks in the config. In the example about this will
867 the full name of the hooks in the config. In the example about this will
868 be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``.
868 be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``.
869
869
870 ``changegroup``
870 ``changegroup``
871 Run after a changegroup has been added via push, pull or unbundle. ID of the
871 Run after a changegroup has been added via push, pull or unbundle. ID of the
872 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
872 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
873 from which changes came is in ``$HG_URL``.
873 from which changes came is in ``$HG_URL``.
874
874
875 ``commit``
875 ``commit``
876 Run after a changeset has been created in the local repository. ID
876 Run after a changeset has been created in the local repository. ID
877 of the newly created changeset is in ``$HG_NODE``. Parent changeset
877 of the newly created changeset is in ``$HG_NODE``. Parent changeset
878 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
878 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
879
879
880 ``incoming``
880 ``incoming``
881 Run after a changeset has been pulled, pushed, or unbundled into
881 Run after a changeset has been pulled, pushed, or unbundled into
882 the local repository. The ID of the newly arrived changeset is in
882 the local repository. The ID of the newly arrived changeset is in
883 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
883 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
884
884
885 ``outgoing``
885 ``outgoing``
886 Run after sending changes from local repository to another. ID of
886 Run after sending changes from local repository to another. ID of
887 first changeset sent is in ``$HG_NODE``. Source of operation is in
887 first changeset sent is in ``$HG_NODE``. Source of operation is in
888 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
888 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
889
889
890 ``post-<command>``
890 ``post-<command>``
891 Run after successful invocations of the associated command. The
891 Run after successful invocations of the associated command. The
892 contents of the command line are passed as ``$HG_ARGS`` and the result
892 contents of the command line are passed as ``$HG_ARGS`` and the result
893 code in ``$HG_RESULT``. Parsed command line arguments are passed as
893 code in ``$HG_RESULT``. Parsed command line arguments are passed as
894 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
894 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
895 the python data internally passed to <command>. ``$HG_OPTS`` is a
895 the python data internally passed to <command>. ``$HG_OPTS`` is a
896 dictionary of options (with unspecified options set to their defaults).
896 dictionary of options (with unspecified options set to their defaults).
897 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
897 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
898
898
899 ``fail-<command>``
899 ``fail-<command>``
900 Run after a failed invocation of an associated command. The contents
900 Run after a failed invocation of an associated command. The contents
901 of the command line are passed as ``$HG_ARGS``. Parsed command line
901 of the command line are passed as ``$HG_ARGS``. Parsed command line
902 arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain
902 arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain
903 string representations of the python data internally passed to
903 string representations of the python data internally passed to
904 <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified
904 <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified
905 options set to their defaults). ``$HG_PATS`` is a list of arguments.
905 options set to their defaults). ``$HG_PATS`` is a list of arguments.
906 Hook failure is ignored.
906 Hook failure is ignored.
907
907
908 ``pre-<command>``
908 ``pre-<command>``
909 Run before executing the associated command. The contents of the
909 Run before executing the associated command. The contents of the
910 command line are passed as ``$HG_ARGS``. Parsed command line arguments
910 command line are passed as ``$HG_ARGS``. Parsed command line arguments
911 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
911 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
912 representations of the data internally passed to <command>. ``$HG_OPTS``
912 representations of the data internally passed to <command>. ``$HG_OPTS``
913 is a dictionary of options (with unspecified options set to their
913 is a dictionary of options (with unspecified options set to their
914 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
914 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
915 failure, the command doesn't execute and Mercurial returns the failure
915 failure, the command doesn't execute and Mercurial returns the failure
916 code.
916 code.
917
917
918 ``prechangegroup``
918 ``prechangegroup``
919 Run before a changegroup is added via push, pull or unbundle. Exit
919 Run before a changegroup is added via push, pull or unbundle. Exit
920 status 0 allows the changegroup to proceed. Non-zero status will
920 status 0 allows the changegroup to proceed. Non-zero status will
921 cause the push, pull or unbundle to fail. URL from which changes
921 cause the push, pull or unbundle to fail. URL from which changes
922 will come is in ``$HG_URL``.
922 will come is in ``$HG_URL``.
923
923
924 ``precommit``
924 ``precommit``
925 Run before starting a local commit. Exit status 0 allows the
925 Run before starting a local commit. Exit status 0 allows the
926 commit to proceed. Non-zero status will cause the commit to fail.
926 commit to proceed. Non-zero status will cause the commit to fail.
927 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
927 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
928
928
929 ``prelistkeys``
929 ``prelistkeys``
930 Run before listing pushkeys (like bookmarks) in the
930 Run before listing pushkeys (like bookmarks) in the
931 repository. Non-zero status will cause failure. The key namespace is
931 repository. Non-zero status will cause failure. The key namespace is
932 in ``$HG_NAMESPACE``.
932 in ``$HG_NAMESPACE``.
933
933
934 ``preoutgoing``
934 ``preoutgoing``
935 Run before collecting changes to send from the local repository to
935 Run before collecting changes to send from the local repository to
936 another. Non-zero status will cause failure. This lets you prevent
936 another. Non-zero status will cause failure. This lets you prevent
937 pull over HTTP or SSH. Also prevents against local pull, push
937 pull over HTTP or SSH. Also prevents against local pull, push
938 (outbound) or bundle commands, but not effective, since you can
938 (outbound) or bundle commands, but not effective, since you can
939 just copy files instead then. Source of operation is in
939 just copy files instead then. Source of operation is in
940 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
940 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
941 SSH or HTTP repository. If "push", "pull" or "bundle", operation
941 SSH or HTTP repository. If "push", "pull" or "bundle", operation
942 is happening on behalf of repository on same system.
942 is happening on behalf of repository on same system.
943
943
944 ``prepushkey``
944 ``prepushkey``
945 Run before a pushkey (like a bookmark) is added to the
945 Run before a pushkey (like a bookmark) is added to the
946 repository. Non-zero status will cause the key to be rejected. The
946 repository. Non-zero status will cause the key to be rejected. The
947 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
947 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
948 the old value (if any) is in ``$HG_OLD``, and the new value is in
948 the old value (if any) is in ``$HG_OLD``, and the new value is in
949 ``$HG_NEW``.
949 ``$HG_NEW``.
950
950
951 ``pretag``
951 ``pretag``
952 Run before creating a tag. Exit status 0 allows the tag to be
952 Run before creating a tag. Exit status 0 allows the tag to be
953 created. Non-zero status will cause the tag to fail. ID of
953 created. Non-zero status will cause the tag to fail. ID of
954 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
954 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
955 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
955 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
956
956
957 ``pretxnopen``
957 ``pretxnopen``
958 Run before any new repository transaction is open. The reason for the
958 Run before any new repository transaction is open. The reason for the
959 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
959 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
960 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
960 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
961 transaction from being opened.
961 transaction from being opened.
962
962
963 ``pretxnclose``
963 ``pretxnclose``
964 Run right before the transaction is actually finalized. Any repository change
964 Run right before the transaction is actually finalized. Any repository change
965 will be visible to the hook program. This lets you validate the transaction
965 will be visible to the hook program. This lets you validate the transaction
966 content or change it. Exit status 0 allows the commit to proceed. Non-zero
966 content or change it. Exit status 0 allows the commit to proceed. Non-zero
967 status will cause the transaction to be rolled back. The reason for the
967 status will cause the transaction to be rolled back. The reason for the
968 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
968 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
969 the transaction will be in ``HG_TXNID``. The rest of the available data will
969 the transaction will be in ``HG_TXNID``. The rest of the available data will
970 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
970 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
971 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
971 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
972 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
972 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
973 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
973 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
974
974
975 ``txnclose``
975 ``txnclose``
976 Run after any repository transaction has been committed. At this
976 Run after any repository transaction has been committed. At this
977 point, the transaction can no longer be rolled back. The hook will run
977 point, the transaction can no longer be rolled back. The hook will run
978 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
978 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
979 details about available variables.
979 details about available variables.
980
980
981 ``txnabort``
981 ``txnabort``
982 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
982 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
983 docs for details about available variables.
983 docs for details about available variables.
984
984
985 ``pretxnchangegroup``
985 ``pretxnchangegroup``
986 Run after a changegroup has been added via push, pull or unbundle, but before
986 Run after a changegroup has been added via push, pull or unbundle, but before
987 the transaction has been committed. Changegroup is visible to hook program.
987 the transaction has been committed. Changegroup is visible to hook program.
988 This lets you validate incoming changes before accepting them. Passed the ID
988 This lets you validate incoming changes before accepting them. Passed the ID
989 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
989 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
990 Exit status 0 allows the transaction to commit. Non-zero status will cause
990 Exit status 0 allows the transaction to commit. Non-zero status will cause
991 the transaction to be rolled back and the push, pull or unbundle will fail.
991 the transaction to be rolled back and the push, pull or unbundle will fail.
992 URL that was source of changes is in ``$HG_URL``.
992 URL that was source of changes is in ``$HG_URL``.
993
993
994 ``pretxncommit``
994 ``pretxncommit``
995 Run after a changeset has been created but the transaction not yet
995 Run after a changeset has been created but the transaction not yet
996 committed. Changeset is visible to hook program. This lets you
996 committed. Changeset is visible to hook program. This lets you
997 validate commit message and changes. Exit status 0 allows the
997 validate commit message and changes. Exit status 0 allows the
998 commit to proceed. Non-zero status will cause the transaction to
998 commit to proceed. Non-zero status will cause the transaction to
999 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
999 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
1000 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
1000 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
1001
1001
1002 ``preupdate``
1002 ``preupdate``
1003 Run before updating the working directory. Exit status 0 allows
1003 Run before updating the working directory. Exit status 0 allows
1004 the update to proceed. Non-zero status will prevent the update.
1004 the update to proceed. Non-zero status will prevent the update.
1005 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
1005 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
1006 of second new parent is in ``$HG_PARENT2``.
1006 of second new parent is in ``$HG_PARENT2``.
1007
1007
1008 ``listkeys``
1008 ``listkeys``
1009 Run after listing pushkeys (like bookmarks) in the repository. The
1009 Run after listing pushkeys (like bookmarks) in the repository. The
1010 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
1010 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
1011 dictionary containing the keys and values.
1011 dictionary containing the keys and values.
1012
1012
1013 ``pushkey``
1013 ``pushkey``
1014 Run after a pushkey (like a bookmark) is added to the
1014 Run after a pushkey (like a bookmark) is added to the
1015 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
1015 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
1016 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
1016 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
1017 value is in ``$HG_NEW``.
1017 value is in ``$HG_NEW``.
1018
1018
1019 ``tag``
1019 ``tag``
1020 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
1020 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
1021 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
1021 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
1022 repository if ``$HG_LOCAL=0``.
1022 repository if ``$HG_LOCAL=0``.
1023
1023
1024 ``update``
1024 ``update``
1025 Run after updating the working directory. Changeset ID of first
1025 Run after updating the working directory. Changeset ID of first
1026 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
1026 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
1027 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
1027 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
1028 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
1028 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
1029
1029
1030 .. note::
1030 .. note::
1031
1031
1032 It is generally better to use standard hooks rather than the
1032 It is generally better to use standard hooks rather than the
1033 generic pre- and post- command hooks as they are guaranteed to be
1033 generic pre- and post- command hooks as they are guaranteed to be
1034 called in the appropriate contexts for influencing transactions.
1034 called in the appropriate contexts for influencing transactions.
1035 Also, hooks like "commit" will be called in all contexts that
1035 Also, hooks like "commit" will be called in all contexts that
1036 generate a commit (e.g. tag) and not just the commit command.
1036 generate a commit (e.g. tag) and not just the commit command.
1037
1037
1038 .. note::
1038 .. note::
1039
1039
1040 Environment variables with empty values may not be passed to
1040 Environment variables with empty values may not be passed to
1041 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
1041 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
1042 will have an empty value under Unix-like platforms for non-merge
1042 will have an empty value under Unix-like platforms for non-merge
1043 changesets, while it will not be available at all under Windows.
1043 changesets, while it will not be available at all under Windows.
1044
1044
1045 The syntax for Python hooks is as follows::
1045 The syntax for Python hooks is as follows::
1046
1046
1047 hookname = python:modulename.submodule.callable
1047 hookname = python:modulename.submodule.callable
1048 hookname = python:/path/to/python/module.py:callable
1048 hookname = python:/path/to/python/module.py:callable
1049
1049
1050 Python hooks are run within the Mercurial process. Each hook is
1050 Python hooks are run within the Mercurial process. Each hook is
1051 called with at least three keyword arguments: a ui object (keyword
1051 called with at least three keyword arguments: a ui object (keyword
1052 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
1052 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
1053 keyword that tells what kind of hook is used. Arguments listed as
1053 keyword that tells what kind of hook is used. Arguments listed as
1054 environment variables above are passed as keyword arguments, with no
1054 environment variables above are passed as keyword arguments, with no
1055 ``HG_`` prefix, and names in lower case.
1055 ``HG_`` prefix, and names in lower case.
1056
1056
1057 If a Python hook returns a "true" value or raises an exception, this
1057 If a Python hook returns a "true" value or raises an exception, this
1058 is treated as a failure.
1058 is treated as a failure.
1059
1059
1060
1060
1061 ``hostfingerprints``
1061 ``hostfingerprints``
1062 --------------------
1062 --------------------
1063
1063
1064 (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.)
1064 (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.)
1065
1065
1066 Fingerprints of the certificates of known HTTPS servers.
1066 Fingerprints of the certificates of known HTTPS servers.
1067
1067
1068 A HTTPS connection to a server with a fingerprint configured here will
1068 A HTTPS connection to a server with a fingerprint configured here will
1069 only succeed if the servers certificate matches the fingerprint.
1069 only succeed if the servers certificate matches the fingerprint.
1070 This is very similar to how ssh known hosts works.
1070 This is very similar to how ssh known hosts works.
1071
1071
1072 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
1072 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
1073 Multiple values can be specified (separated by spaces or commas). This can
1073 Multiple values can be specified (separated by spaces or commas). This can
1074 be used to define both old and new fingerprints while a host transitions
1074 be used to define both old and new fingerprints while a host transitions
1075 to a new certificate.
1075 to a new certificate.
1076
1076
1077 The CA chain and web.cacerts is not used for servers with a fingerprint.
1077 The CA chain and web.cacerts is not used for servers with a fingerprint.
1078
1078
1079 For example::
1079 For example::
1080
1080
1081 [hostfingerprints]
1081 [hostfingerprints]
1082 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1082 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1083 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1083 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1084
1084
1085 ``hostsecurity``
1085 ``hostsecurity``
1086 ----------------
1086 ----------------
1087
1087
1088 Used to specify global and per-host security settings for connecting to
1088 Used to specify global and per-host security settings for connecting to
1089 other machines.
1089 other machines.
1090
1090
1091 The following options control default behavior for all hosts.
1091 The following options control default behavior for all hosts.
1092
1092
1093 ``ciphers``
1093 ``ciphers``
1094 Defines the cryptographic ciphers to use for connections.
1094 Defines the cryptographic ciphers to use for connections.
1095
1095
1096 Value must be a valid OpenSSL Cipher List Format as documented at
1096 Value must be a valid OpenSSL Cipher List Format as documented at
1097 https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
1097 https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
1098
1098
1099 This setting is for advanced users only. Setting to incorrect values
1099 This setting is for advanced users only. Setting to incorrect values
1100 can significantly lower connection security or decrease performance.
1100 can significantly lower connection security or decrease performance.
1101 You have been warned.
1101 You have been warned.
1102
1102
1103 This option requires Python 2.7.
1103 This option requires Python 2.7.
1104
1104
1105 ``minimumprotocol``
1105 ``minimumprotocol``
1106 Defines the minimum channel encryption protocol to use.
1106 Defines the minimum channel encryption protocol to use.
1107
1107
1108 By default, the highest version of TLS supported by both client and server
1108 By default, the highest version of TLS supported by both client and server
1109 is used.
1109 is used.
1110
1110
1111 Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``.
1111 Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``.
1112
1112
1113 When running on an old Python version, only ``tls1.0`` is allowed since
1113 When running on an old Python version, only ``tls1.0`` is allowed since
1114 old versions of Python only support up to TLS 1.0.
1114 old versions of Python only support up to TLS 1.0.
1115
1115
1116 When running a Python that supports modern TLS versions, the default is
1116 When running a Python that supports modern TLS versions, the default is
1117 ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this
1117 ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this
1118 weakens security and should only be used as a feature of last resort if
1118 weakens security and should only be used as a feature of last resort if
1119 a server does not support TLS 1.1+.
1119 a server does not support TLS 1.1+.
1120
1120
1121 Options in the ``[hostsecurity]`` section can have the form
1121 Options in the ``[hostsecurity]`` section can have the form
1122 ``hostname``:``setting``. This allows multiple settings to be defined on a
1122 ``hostname``:``setting``. This allows multiple settings to be defined on a
1123 per-host basis.
1123 per-host basis.
1124
1124
1125 The following per-host settings can be defined.
1125 The following per-host settings can be defined.
1126
1126
1127 ``ciphers``
1127 ``ciphers``
1128 This behaves like ``ciphers`` as described above except it only applies
1128 This behaves like ``ciphers`` as described above except it only applies
1129 to the host on which it is defined.
1129 to the host on which it is defined.
1130
1130
1131 ``fingerprints``
1131 ``fingerprints``
1132 A list of hashes of the DER encoded peer/remote certificate. Values have
1132 A list of hashes of the DER encoded peer/remote certificate. Values have
1133 the form ``algorithm``:``fingerprint``. e.g.
1133 the form ``algorithm``:``fingerprint``. e.g.
1134 ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.
1134 ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.
1135
1135
1136 The following algorithms/prefixes are supported: ``sha1``, ``sha256``,
1136 The following algorithms/prefixes are supported: ``sha1``, ``sha256``,
1137 ``sha512``.
1137 ``sha512``.
1138
1138
1139 Use of ``sha256`` or ``sha512`` is preferred.
1139 Use of ``sha256`` or ``sha512`` is preferred.
1140
1140
1141 If a fingerprint is specified, the CA chain is not validated for this
1141 If a fingerprint is specified, the CA chain is not validated for this
1142 host and Mercurial will require the remote certificate to match one
1142 host and Mercurial will require the remote certificate to match one
1143 of the fingerprints specified. This means if the server updates its
1143 of the fingerprints specified. This means if the server updates its
1144 certificate, Mercurial will abort until a new fingerprint is defined.
1144 certificate, Mercurial will abort until a new fingerprint is defined.
1145 This can provide stronger security than traditional CA-based validation
1145 This can provide stronger security than traditional CA-based validation
1146 at the expense of convenience.
1146 at the expense of convenience.
1147
1147
1148 This option takes precedence over ``verifycertsfile``.
1148 This option takes precedence over ``verifycertsfile``.
1149
1149
1150 ``minimumprotocol``
1150 ``minimumprotocol``
1151 This behaves like ``minimumprotocol`` as described above except it
1151 This behaves like ``minimumprotocol`` as described above except it
1152 only applies to the host on which it is defined.
1152 only applies to the host on which it is defined.
1153
1153
1154 ``verifycertsfile``
1154 ``verifycertsfile``
1155 Path to file a containing a list of PEM encoded certificates used to
1155 Path to file a containing a list of PEM encoded certificates used to
1156 verify the server certificate. Environment variables and ``~user``
1156 verify the server certificate. Environment variables and ``~user``
1157 constructs are expanded in the filename.
1157 constructs are expanded in the filename.
1158
1158
1159 The server certificate or the certificate's certificate authority (CA)
1159 The server certificate or the certificate's certificate authority (CA)
1160 must match a certificate from this file or certificate verification
1160 must match a certificate from this file or certificate verification
1161 will fail and connections to the server will be refused.
1161 will fail and connections to the server will be refused.
1162
1162
1163 If defined, only certificates provided by this file will be used:
1163 If defined, only certificates provided by this file will be used:
1164 ``web.cacerts`` and any system/default certificates will not be
1164 ``web.cacerts`` and any system/default certificates will not be
1165 used.
1165 used.
1166
1166
1167 This option has no effect if the per-host ``fingerprints`` option
1167 This option has no effect if the per-host ``fingerprints`` option
1168 is set.
1168 is set.
1169
1169
1170 The format of the file is as follows::
1170 The format of the file is as follows::
1171
1171
1172 -----BEGIN CERTIFICATE-----
1172 -----BEGIN CERTIFICATE-----
1173 ... (certificate in base64 PEM encoding) ...
1173 ... (certificate in base64 PEM encoding) ...
1174 -----END CERTIFICATE-----
1174 -----END CERTIFICATE-----
1175 -----BEGIN CERTIFICATE-----
1175 -----BEGIN CERTIFICATE-----
1176 ... (certificate in base64 PEM encoding) ...
1176 ... (certificate in base64 PEM encoding) ...
1177 -----END CERTIFICATE-----
1177 -----END CERTIFICATE-----
1178
1178
1179 For example::
1179 For example::
1180
1180
1181 [hostsecurity]
1181 [hostsecurity]
1182 hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
1182 hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
1183 hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1183 hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1184 foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem
1184 foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem
1185
1185
1186 To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
1186 To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
1187 when connecting to ``hg.example.com``::
1187 when connecting to ``hg.example.com``::
1188
1188
1189 [hostsecurity]
1189 [hostsecurity]
1190 minimumprotocol = tls1.2
1190 minimumprotocol = tls1.2
1191 hg.example.com:minimumprotocol = tls1.1
1191 hg.example.com:minimumprotocol = tls1.1
1192
1192
1193 ``http_proxy``
1193 ``http_proxy``
1194 --------------
1194 --------------
1195
1195
1196 Used to access web-based Mercurial repositories through a HTTP
1196 Used to access web-based Mercurial repositories through a HTTP
1197 proxy.
1197 proxy.
1198
1198
1199 ``host``
1199 ``host``
1200 Host name and (optional) port of the proxy server, for example
1200 Host name and (optional) port of the proxy server, for example
1201 "myproxy:8000".
1201 "myproxy:8000".
1202
1202
1203 ``no``
1203 ``no``
1204 Optional. Comma-separated list of host names that should bypass
1204 Optional. Comma-separated list of host names that should bypass
1205 the proxy.
1205 the proxy.
1206
1206
1207 ``passwd``
1207 ``passwd``
1208 Optional. Password to authenticate with at the proxy server.
1208 Optional. Password to authenticate with at the proxy server.
1209
1209
1210 ``user``
1210 ``user``
1211 Optional. User name to authenticate with at the proxy server.
1211 Optional. User name to authenticate with at the proxy server.
1212
1212
1213 ``always``
1213 ``always``
1214 Optional. Always use the proxy, even for localhost and any entries
1214 Optional. Always use the proxy, even for localhost and any entries
1215 in ``http_proxy.no``. (default: False)
1215 in ``http_proxy.no``. (default: False)
1216
1216
1217 ``merge``
1217 ``merge``
1218 ---------
1218 ---------
1219
1219
1220 This section specifies behavior during merges and updates.
1220 This section specifies behavior during merges and updates.
1221
1221
1222 ``checkignored``
1222 ``checkignored``
1223 Controls behavior when an ignored file on disk has the same name as a tracked
1223 Controls behavior when an ignored file on disk has the same name as a tracked
1224 file in the changeset being merged or updated to, and has different
1224 file in the changeset being merged or updated to, and has different
1225 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1225 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1226 abort on such files. With ``warn``, warn on such files and back them up as
1226 abort on such files. With ``warn``, warn on such files and back them up as
1227 ``.orig``. With ``ignore``, don't print a warning and back them up as
1227 ``.orig``. With ``ignore``, don't print a warning and back them up as
1228 ``.orig``. (default: ``abort``)
1228 ``.orig``. (default: ``abort``)
1229
1229
1230 ``checkunknown``
1230 ``checkunknown``
1231 Controls behavior when an unknown file that isn't ignored has the same name
1231 Controls behavior when an unknown file that isn't ignored has the same name
1232 as a tracked file in the changeset being merged or updated to, and has
1232 as a tracked file in the changeset being merged or updated to, and has
1233 different contents. Similar to ``merge.checkignored``, except for files that
1233 different contents. Similar to ``merge.checkignored``, except for files that
1234 are not ignored. (default: ``abort``)
1234 are not ignored. (default: ``abort``)
1235
1235
1236 ``merge-patterns``
1236 ``merge-patterns``
1237 ------------------
1237 ------------------
1238
1238
1239 This section specifies merge tools to associate with particular file
1239 This section specifies merge tools to associate with particular file
1240 patterns. Tools matched here will take precedence over the default
1240 patterns. Tools matched here will take precedence over the default
1241 merge tool. Patterns are globs by default, rooted at the repository
1241 merge tool. Patterns are globs by default, rooted at the repository
1242 root.
1242 root.
1243
1243
1244 Example::
1244 Example::
1245
1245
1246 [merge-patterns]
1246 [merge-patterns]
1247 **.c = kdiff3
1247 **.c = kdiff3
1248 **.jpg = myimgmerge
1248 **.jpg = myimgmerge
1249
1249
1250 ``merge-tools``
1250 ``merge-tools``
1251 ---------------
1251 ---------------
1252
1252
1253 This section configures external merge tools to use for file-level
1253 This section configures external merge tools to use for file-level
1254 merges. This section has likely been preconfigured at install time.
1254 merges. This section has likely been preconfigured at install time.
1255 Use :hg:`config merge-tools` to check the existing configuration.
1255 Use :hg:`config merge-tools` to check the existing configuration.
1256 Also see :hg:`help merge-tools` for more details.
1256 Also see :hg:`help merge-tools` for more details.
1257
1257
1258 Example ``~/.hgrc``::
1258 Example ``~/.hgrc``::
1259
1259
1260 [merge-tools]
1260 [merge-tools]
1261 # Override stock tool location
1261 # Override stock tool location
1262 kdiff3.executable = ~/bin/kdiff3
1262 kdiff3.executable = ~/bin/kdiff3
1263 # Specify command line
1263 # Specify command line
1264 kdiff3.args = $base $local $other -o $output
1264 kdiff3.args = $base $local $other -o $output
1265 # Give higher priority
1265 # Give higher priority
1266 kdiff3.priority = 1
1266 kdiff3.priority = 1
1267
1267
1268 # Changing the priority of preconfigured tool
1268 # Changing the priority of preconfigured tool
1269 meld.priority = 0
1269 meld.priority = 0
1270
1270
1271 # Disable a preconfigured tool
1271 # Disable a preconfigured tool
1272 vimdiff.disabled = yes
1272 vimdiff.disabled = yes
1273
1273
1274 # Define new tool
1274 # Define new tool
1275 myHtmlTool.args = -m $local $other $base $output
1275 myHtmlTool.args = -m $local $other $base $output
1276 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1276 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1277 myHtmlTool.priority = 1
1277 myHtmlTool.priority = 1
1278
1278
1279 Supported arguments:
1279 Supported arguments:
1280
1280
1281 ``priority``
1281 ``priority``
1282 The priority in which to evaluate this tool.
1282 The priority in which to evaluate this tool.
1283 (default: 0)
1283 (default: 0)
1284
1284
1285 ``executable``
1285 ``executable``
1286 Either just the name of the executable or its pathname.
1286 Either just the name of the executable or its pathname.
1287
1287
1288 .. container:: windows
1288 .. container:: windows
1289
1289
1290 On Windows, the path can use environment variables with ${ProgramFiles}
1290 On Windows, the path can use environment variables with ${ProgramFiles}
1291 syntax.
1291 syntax.
1292
1292
1293 (default: the tool name)
1293 (default: the tool name)
1294
1294
1295 ``args``
1295 ``args``
1296 The arguments to pass to the tool executable. You can refer to the
1296 The arguments to pass to the tool executable. You can refer to the
1297 files being merged as well as the output file through these
1297 files being merged as well as the output file through these
1298 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1298 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1299 of ``$local`` and ``$other`` can vary depending on which action is being
1299 of ``$local`` and ``$other`` can vary depending on which action is being
1300 performed. During and update or merge, ``$local`` represents the original
1300 performed. During and update or merge, ``$local`` represents the original
1301 state of the file, while ``$other`` represents the commit you are updating
1301 state of the file, while ``$other`` represents the commit you are updating
1302 to or the commit you are merging with. During a rebase ``$local``
1302 to or the commit you are merging with. During a rebase ``$local``
1303 represents the destination of the rebase, and ``$other`` represents the
1303 represents the destination of the rebase, and ``$other`` represents the
1304 commit being rebased.
1304 commit being rebased.
1305 (default: ``$local $base $other``)
1305 (default: ``$local $base $other``)
1306
1306
1307 ``premerge``
1307 ``premerge``
1308 Attempt to run internal non-interactive 3-way merge tool before
1308 Attempt to run internal non-interactive 3-way merge tool before
1309 launching external tool. Options are ``true``, ``false``, ``keep`` or
1309 launching external tool. Options are ``true``, ``false``, ``keep`` or
1310 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1310 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1311 premerge fails. The ``keep-merge3`` will do the same but include information
1311 premerge fails. The ``keep-merge3`` will do the same but include information
1312 about the base of the merge in the marker (see internal :merge3 in
1312 about the base of the merge in the marker (see internal :merge3 in
1313 :hg:`help merge-tools`).
1313 :hg:`help merge-tools`).
1314 (default: True)
1314 (default: True)
1315
1315
1316 ``binary``
1316 ``binary``
1317 This tool can merge binary files. (default: False, unless tool
1317 This tool can merge binary files. (default: False, unless tool
1318 was selected by file pattern match)
1318 was selected by file pattern match)
1319
1319
1320 ``symlink``
1320 ``symlink``
1321 This tool can merge symlinks. (default: False)
1321 This tool can merge symlinks. (default: False)
1322
1322
1323 ``check``
1323 ``check``
1324 A list of merge success-checking options:
1324 A list of merge success-checking options:
1325
1325
1326 ``changed``
1326 ``changed``
1327 Ask whether merge was successful when the merged file shows no changes.
1327 Ask whether merge was successful when the merged file shows no changes.
1328 ``conflicts``
1328 ``conflicts``
1329 Check whether there are conflicts even though the tool reported success.
1329 Check whether there are conflicts even though the tool reported success.
1330 ``prompt``
1330 ``prompt``
1331 Always prompt for merge success, regardless of success reported by tool.
1331 Always prompt for merge success, regardless of success reported by tool.
1332
1332
1333 ``fixeol``
1333 ``fixeol``
1334 Attempt to fix up EOL changes caused by the merge tool.
1334 Attempt to fix up EOL changes caused by the merge tool.
1335 (default: False)
1335 (default: False)
1336
1336
1337 ``gui``
1337 ``gui``
1338 This tool requires a graphical interface to run. (default: False)
1338 This tool requires a graphical interface to run. (default: False)
1339
1339
1340 .. container:: windows
1340 .. container:: windows
1341
1341
1342 ``regkey``
1342 ``regkey``
1343 Windows registry key which describes install location of this
1343 Windows registry key which describes install location of this
1344 tool. Mercurial will search for this key first under
1344 tool. Mercurial will search for this key first under
1345 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1345 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1346 (default: None)
1346 (default: None)
1347
1347
1348 ``regkeyalt``
1348 ``regkeyalt``
1349 An alternate Windows registry key to try if the first key is not
1349 An alternate Windows registry key to try if the first key is not
1350 found. The alternate key uses the same ``regname`` and ``regappend``
1350 found. The alternate key uses the same ``regname`` and ``regappend``
1351 semantics of the primary key. The most common use for this key
1351 semantics of the primary key. The most common use for this key
1352 is to search for 32bit applications on 64bit operating systems.
1352 is to search for 32bit applications on 64bit operating systems.
1353 (default: None)
1353 (default: None)
1354
1354
1355 ``regname``
1355 ``regname``
1356 Name of value to read from specified registry key.
1356 Name of value to read from specified registry key.
1357 (default: the unnamed (default) value)
1357 (default: the unnamed (default) value)
1358
1358
1359 ``regappend``
1359 ``regappend``
1360 String to append to the value read from the registry, typically
1360 String to append to the value read from the registry, typically
1361 the executable name of the tool.
1361 the executable name of the tool.
1362 (default: None)
1362 (default: None)
1363
1363
1364 ``pager``
1364 ``pager``
1365 ---------
1365 ---------
1366
1366
1367 Setting used to control when to paginate and with what external tool. See
1367 Setting used to control when to paginate and with what external tool. See
1368 :hg:`help pager` for details.
1368 :hg:`help pager` for details.
1369
1369
1370 ``pager``
1370 ``pager``
1371 Define the external tool used as pager.
1371 Define the external tool used as pager.
1372
1372
1373 If no pager is set, Mercurial uses the environment variable $PAGER.
1373 If no pager is set, Mercurial uses the environment variable $PAGER.
1374 If neither pager.pager, nor $PAGER is set, a default pager will be
1374 If neither pager.pager, nor $PAGER is set, a default pager will be
1375 used, typically `less` on Unix and `more` on Windows. Example::
1375 used, typically `less` on Unix and `more` on Windows. Example::
1376
1376
1377 [pager]
1377 [pager]
1378 pager = less -FRX
1378 pager = less -FRX
1379
1379
1380 ``ignore``
1380 ``ignore``
1381 List of commands to disable the pager for. Example::
1381 List of commands to disable the pager for. Example::
1382
1382
1383 [pager]
1383 [pager]
1384 ignore = version, help, update
1384 ignore = version, help, update
1385
1385
1386 ``patch``
1386 ``patch``
1387 ---------
1387 ---------
1388
1388
1389 Settings used when applying patches, for instance through the 'import'
1389 Settings used when applying patches, for instance through the 'import'
1390 command or with Mercurial Queues extension.
1390 command or with Mercurial Queues extension.
1391
1391
1392 ``eol``
1392 ``eol``
1393 When set to 'strict' patch content and patched files end of lines
1393 When set to 'strict' patch content and patched files end of lines
1394 are preserved. When set to ``lf`` or ``crlf``, both files end of
1394 are preserved. When set to ``lf`` or ``crlf``, both files end of
1395 lines are ignored when patching and the result line endings are
1395 lines are ignored when patching and the result line endings are
1396 normalized to either LF (Unix) or CRLF (Windows). When set to
1396 normalized to either LF (Unix) or CRLF (Windows). When set to
1397 ``auto``, end of lines are again ignored while patching but line
1397 ``auto``, end of lines are again ignored while patching but line
1398 endings in patched files are normalized to their original setting
1398 endings in patched files are normalized to their original setting
1399 on a per-file basis. If target file does not exist or has no end
1399 on a per-file basis. If target file does not exist or has no end
1400 of line, patch line endings are preserved.
1400 of line, patch line endings are preserved.
1401 (default: strict)
1401 (default: strict)
1402
1402
1403 ``fuzz``
1403 ``fuzz``
1404 The number of lines of 'fuzz' to allow when applying patches. This
1404 The number of lines of 'fuzz' to allow when applying patches. This
1405 controls how much context the patcher is allowed to ignore when
1405 controls how much context the patcher is allowed to ignore when
1406 trying to apply a patch.
1406 trying to apply a patch.
1407 (default: 2)
1407 (default: 2)
1408
1408
1409 ``paths``
1409 ``paths``
1410 ---------
1410 ---------
1411
1411
1412 Assigns symbolic names and behavior to repositories.
1412 Assigns symbolic names and behavior to repositories.
1413
1413
1414 Options are symbolic names defining the URL or directory that is the
1414 Options are symbolic names defining the URL or directory that is the
1415 location of the repository. Example::
1415 location of the repository. Example::
1416
1416
1417 [paths]
1417 [paths]
1418 my_server = https://example.com/my_repo
1418 my_server = https://example.com/my_repo
1419 local_path = /home/me/repo
1419 local_path = /home/me/repo
1420
1420
1421 These symbolic names can be used from the command line. To pull
1421 These symbolic names can be used from the command line. To pull
1422 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1422 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1423 :hg:`push local_path`.
1423 :hg:`push local_path`.
1424
1424
1425 Options containing colons (``:``) denote sub-options that can influence
1425 Options containing colons (``:``) denote sub-options that can influence
1426 behavior for that specific path. Example::
1426 behavior for that specific path. Example::
1427
1427
1428 [paths]
1428 [paths]
1429 my_server = https://example.com/my_path
1429 my_server = https://example.com/my_path
1430 my_server:pushurl = ssh://example.com/my_path
1430 my_server:pushurl = ssh://example.com/my_path
1431
1431
1432 The following sub-options can be defined:
1432 The following sub-options can be defined:
1433
1433
1434 ``pushurl``
1434 ``pushurl``
1435 The URL to use for push operations. If not defined, the location
1435 The URL to use for push operations. If not defined, the location
1436 defined by the path's main entry is used.
1436 defined by the path's main entry is used.
1437
1437
1438 ``pushrev``
1438 ``pushrev``
1439 A revset defining which revisions to push by default.
1439 A revset defining which revisions to push by default.
1440
1440
1441 When :hg:`push` is executed without a ``-r`` argument, the revset
1441 When :hg:`push` is executed without a ``-r`` argument, the revset
1442 defined by this sub-option is evaluated to determine what to push.
1442 defined by this sub-option is evaluated to determine what to push.
1443
1443
1444 For example, a value of ``.`` will push the working directory's
1444 For example, a value of ``.`` will push the working directory's
1445 revision by default.
1445 revision by default.
1446
1446
1447 Revsets specifying bookmarks will not result in the bookmark being
1447 Revsets specifying bookmarks will not result in the bookmark being
1448 pushed.
1448 pushed.
1449
1449
1450 The following special named paths exist:
1450 The following special named paths exist:
1451
1451
1452 ``default``
1452 ``default``
1453 The URL or directory to use when no source or remote is specified.
1453 The URL or directory to use when no source or remote is specified.
1454
1454
1455 :hg:`clone` will automatically define this path to the location the
1455 :hg:`clone` will automatically define this path to the location the
1456 repository was cloned from.
1456 repository was cloned from.
1457
1457
1458 ``default-push``
1458 ``default-push``
1459 (deprecated) The URL or directory for the default :hg:`push` location.
1459 (deprecated) The URL or directory for the default :hg:`push` location.
1460 ``default:pushurl`` should be used instead.
1460 ``default:pushurl`` should be used instead.
1461
1461
1462 ``phases``
1462 ``phases``
1463 ----------
1463 ----------
1464
1464
1465 Specifies default handling of phases. See :hg:`help phases` for more
1465 Specifies default handling of phases. See :hg:`help phases` for more
1466 information about working with phases.
1466 information about working with phases.
1467
1467
1468 ``publish``
1468 ``publish``
1469 Controls draft phase behavior when working as a server. When true,
1469 Controls draft phase behavior when working as a server. When true,
1470 pushed changesets are set to public in both client and server and
1470 pushed changesets are set to public in both client and server and
1471 pulled or cloned changesets are set to public in the client.
1471 pulled or cloned changesets are set to public in the client.
1472 (default: True)
1472 (default: True)
1473
1473
1474 ``new-commit``
1474 ``new-commit``
1475 Phase of newly-created commits.
1475 Phase of newly-created commits.
1476 (default: draft)
1476 (default: draft)
1477
1477
1478 ``checksubrepos``
1478 ``checksubrepos``
1479 Check the phase of the current revision of each subrepository. Allowed
1479 Check the phase of the current revision of each subrepository. Allowed
1480 values are "ignore", "follow" and "abort". For settings other than
1480 values are "ignore", "follow" and "abort". For settings other than
1481 "ignore", the phase of the current revision of each subrepository is
1481 "ignore", the phase of the current revision of each subrepository is
1482 checked before committing the parent repository. If any of those phases is
1482 checked before committing the parent repository. If any of those phases is
1483 greater than the phase of the parent repository (e.g. if a subrepo is in a
1483 greater than the phase of the parent repository (e.g. if a subrepo is in a
1484 "secret" phase while the parent repo is in "draft" phase), the commit is
1484 "secret" phase while the parent repo is in "draft" phase), the commit is
1485 either aborted (if checksubrepos is set to "abort") or the higher phase is
1485 either aborted (if checksubrepos is set to "abort") or the higher phase is
1486 used for the parent repository commit (if set to "follow").
1486 used for the parent repository commit (if set to "follow").
1487 (default: follow)
1487 (default: follow)
1488
1488
1489
1489
1490 ``profiling``
1490 ``profiling``
1491 -------------
1491 -------------
1492
1492
1493 Specifies profiling type, format, and file output. Two profilers are
1493 Specifies profiling type, format, and file output. Two profilers are
1494 supported: an instrumenting profiler (named ``ls``), and a sampling
1494 supported: an instrumenting profiler (named ``ls``), and a sampling
1495 profiler (named ``stat``).
1495 profiler (named ``stat``).
1496
1496
1497 In this section description, 'profiling data' stands for the raw data
1497 In this section description, 'profiling data' stands for the raw data
1498 collected during profiling, while 'profiling report' stands for a
1498 collected during profiling, while 'profiling report' stands for a
1499 statistical text report generated from the profiling data. The
1499 statistical text report generated from the profiling data. The
1500 profiling is done using lsprof.
1500 profiling is done using lsprof.
1501
1501
1502 ``enabled``
1502 ``enabled``
1503 Enable the profiler.
1503 Enable the profiler.
1504 (default: false)
1504 (default: false)
1505
1505
1506 This is equivalent to passing ``--profile`` on the command line.
1506 This is equivalent to passing ``--profile`` on the command line.
1507
1507
1508 ``type``
1508 ``type``
1509 The type of profiler to use.
1509 The type of profiler to use.
1510 (default: stat)
1510 (default: stat)
1511
1511
1512 ``ls``
1512 ``ls``
1513 Use Python's built-in instrumenting profiler. This profiler
1513 Use Python's built-in instrumenting profiler. This profiler
1514 works on all platforms, but each line number it reports is the
1514 works on all platforms, but each line number it reports is the
1515 first line of a function. This restriction makes it difficult to
1515 first line of a function. This restriction makes it difficult to
1516 identify the expensive parts of a non-trivial function.
1516 identify the expensive parts of a non-trivial function.
1517 ``stat``
1517 ``stat``
1518 Use a statistical profiler, statprof. This profiler is most
1518 Use a statistical profiler, statprof. This profiler is most
1519 useful for profiling commands that run for longer than about 0.1
1519 useful for profiling commands that run for longer than about 0.1
1520 seconds.
1520 seconds.
1521
1521
1522 ``format``
1522 ``format``
1523 Profiling format. Specific to the ``ls`` instrumenting profiler.
1523 Profiling format. Specific to the ``ls`` instrumenting profiler.
1524 (default: text)
1524 (default: text)
1525
1525
1526 ``text``
1526 ``text``
1527 Generate a profiling report. When saving to a file, it should be
1527 Generate a profiling report. When saving to a file, it should be
1528 noted that only the report is saved, and the profiling data is
1528 noted that only the report is saved, and the profiling data is
1529 not kept.
1529 not kept.
1530 ``kcachegrind``
1530 ``kcachegrind``
1531 Format profiling data for kcachegrind use: when saving to a
1531 Format profiling data for kcachegrind use: when saving to a
1532 file, the generated file can directly be loaded into
1532 file, the generated file can directly be loaded into
1533 kcachegrind.
1533 kcachegrind.
1534
1534
1535 ``statformat``
1535 ``statformat``
1536 Profiling format for the ``stat`` profiler.
1536 Profiling format for the ``stat`` profiler.
1537 (default: hotpath)
1537 (default: hotpath)
1538
1538
1539 ``hotpath``
1539 ``hotpath``
1540 Show a tree-based display containing the hot path of execution (where
1540 Show a tree-based display containing the hot path of execution (where
1541 most time was spent).
1541 most time was spent).
1542 ``bymethod``
1542 ``bymethod``
1543 Show a table of methods ordered by how frequently they are active.
1543 Show a table of methods ordered by how frequently they are active.
1544 ``byline``
1544 ``byline``
1545 Show a table of lines in files ordered by how frequently they are active.
1545 Show a table of lines in files ordered by how frequently they are active.
1546 ``json``
1546 ``json``
1547 Render profiling data as JSON.
1547 Render profiling data as JSON.
1548
1548
1549 ``frequency``
1549 ``frequency``
1550 Sampling frequency. Specific to the ``stat`` sampling profiler.
1550 Sampling frequency. Specific to the ``stat`` sampling profiler.
1551 (default: 1000)
1551 (default: 1000)
1552
1552
1553 ``output``
1553 ``output``
1554 File path where profiling data or report should be saved. If the
1554 File path where profiling data or report should be saved. If the
1555 file exists, it is replaced. (default: None, data is printed on
1555 file exists, it is replaced. (default: None, data is printed on
1556 stderr)
1556 stderr)
1557
1557
1558 ``sort``
1558 ``sort``
1559 Sort field. Specific to the ``ls`` instrumenting profiler.
1559 Sort field. Specific to the ``ls`` instrumenting profiler.
1560 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1560 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1561 ``inlinetime``.
1561 ``inlinetime``.
1562 (default: inlinetime)
1562 (default: inlinetime)
1563
1563
1564 ``limit``
1564 ``limit``
1565 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1565 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1566 (default: 30)
1566 (default: 30)
1567
1567
1568 ``nested``
1568 ``nested``
1569 Show at most this number of lines of drill-down info after each main entry.
1569 Show at most this number of lines of drill-down info after each main entry.
1570 This can help explain the difference between Total and Inline.
1570 This can help explain the difference between Total and Inline.
1571 Specific to the ``ls`` instrumenting profiler.
1571 Specific to the ``ls`` instrumenting profiler.
1572 (default: 5)
1572 (default: 5)
1573
1573
1574 ``progress``
1574 ``progress``
1575 ------------
1575 ------------
1576
1576
1577 Mercurial commands can draw progress bars that are as informative as
1577 Mercurial commands can draw progress bars that are as informative as
1578 possible. Some progress bars only offer indeterminate information, while others
1578 possible. Some progress bars only offer indeterminate information, while others
1579 have a definite end point.
1579 have a definite end point.
1580
1580
1581 ``delay``
1581 ``delay``
1582 Number of seconds (float) before showing the progress bar. (default: 3)
1582 Number of seconds (float) before showing the progress bar. (default: 3)
1583
1583
1584 ``changedelay``
1584 ``changedelay``
1585 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1585 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1586 that value will be used instead. (default: 1)
1586 that value will be used instead. (default: 1)
1587
1587
1588 ``refresh``
1588 ``refresh``
1589 Time in seconds between refreshes of the progress bar. (default: 0.1)
1589 Time in seconds between refreshes of the progress bar. (default: 0.1)
1590
1590
1591 ``format``
1591 ``format``
1592 Format of the progress bar.
1592 Format of the progress bar.
1593
1593
1594 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1594 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1595 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1595 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1596 last 20 characters of the item, but this can be changed by adding either
1596 last 20 characters of the item, but this can be changed by adding either
1597 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1597 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1598 first num characters.
1598 first num characters.
1599
1599
1600 (default: topic bar number estimate)
1600 (default: topic bar number estimate)
1601
1601
1602 ``width``
1602 ``width``
1603 If set, the maximum width of the progress information (that is, min(width,
1603 If set, the maximum width of the progress information (that is, min(width,
1604 term width) will be used).
1604 term width) will be used).
1605
1605
1606 ``clear-complete``
1606 ``clear-complete``
1607 Clear the progress bar after it's done. (default: True)
1607 Clear the progress bar after it's done. (default: True)
1608
1608
1609 ``disable``
1609 ``disable``
1610 If true, don't show a progress bar.
1610 If true, don't show a progress bar.
1611
1611
1612 ``assume-tty``
1612 ``assume-tty``
1613 If true, ALWAYS show a progress bar, unless disable is given.
1613 If true, ALWAYS show a progress bar, unless disable is given.
1614
1614
1615 ``rebase``
1615 ``rebase``
1616 ----------
1616 ----------
1617
1617
1618 ``allowdivergence``
1618 ``allowdivergence``
1619 Default to False, when True allow creating divergence when performing
1619 Default to False, when True allow creating divergence when performing
1620 rebase of obsolete changesets.
1620 rebase of obsolete changesets.
1621
1621
1622 ``revsetalias``
1622 ``revsetalias``
1623 ---------------
1623 ---------------
1624
1624
1625 Alias definitions for revsets. See :hg:`help revsets` for details.
1625 Alias definitions for revsets. See :hg:`help revsets` for details.
1626
1626
1627 ``server``
1627 ``server``
1628 ----------
1628 ----------
1629
1629
1630 Controls generic server settings.
1630 Controls generic server settings.
1631
1631
1632 ``compressionengines``
1632 ``compressionengines``
1633 List of compression engines and their relative priority to advertise
1633 List of compression engines and their relative priority to advertise
1634 to clients.
1634 to clients.
1635
1635
1636 The order of compression engines determines their priority, the first
1636 The order of compression engines determines their priority, the first
1637 having the highest priority. If a compression engine is not listed
1637 having the highest priority. If a compression engine is not listed
1638 here, it won't be advertised to clients.
1638 here, it won't be advertised to clients.
1639
1639
1640 If not set (the default), built-in defaults are used. Run
1640 If not set (the default), built-in defaults are used. Run
1641 :hg:`debuginstall` to list available compression engines and their
1641 :hg:`debuginstall` to list available compression engines and their
1642 default wire protocol priority.
1642 default wire protocol priority.
1643
1643
1644 Older Mercurial clients only support zlib compression and this setting
1644 Older Mercurial clients only support zlib compression and this setting
1645 has no effect for legacy clients.
1645 has no effect for legacy clients.
1646
1646
1647 ``uncompressed``
1647 ``uncompressed``
1648 Whether to allow clients to clone a repository using the
1648 Whether to allow clients to clone a repository using the
1649 uncompressed streaming protocol. This transfers about 40% more
1649 uncompressed streaming protocol. This transfers about 40% more
1650 data than a regular clone, but uses less memory and CPU on both
1650 data than a regular clone, but uses less memory and CPU on both
1651 server and client. Over a LAN (100 Mbps or better) or a very fast
1651 server and client. Over a LAN (100 Mbps or better) or a very fast
1652 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1652 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1653 regular clone. Over most WAN connections (anything slower than
1653 regular clone. Over most WAN connections (anything slower than
1654 about 6 Mbps), uncompressed streaming is slower, because of the
1654 about 6 Mbps), uncompressed streaming is slower, because of the
1655 extra data transfer overhead. This mode will also temporarily hold
1655 extra data transfer overhead. This mode will also temporarily hold
1656 the write lock while determining what data to transfer.
1656 the write lock while determining what data to transfer.
1657 (default: True)
1657 (default: True)
1658
1658
1659 ``preferuncompressed``
1659 ``preferuncompressed``
1660 When set, clients will try to use the uncompressed streaming
1660 When set, clients will try to use the uncompressed streaming
1661 protocol. (default: False)
1661 protocol. (default: False)
1662
1662
1663 ``disablefullbundle``
1664 When set, servers will refuse attempts to do pull-based clones.
1665 If this option is set, ``preferuncompressed`` and/or clone bundles
1666 are highly recommended. Partial clones will still be allowed.
1667 (default: False)
1668
1663 ``validate``
1669 ``validate``
1664 Whether to validate the completeness of pushed changesets by
1670 Whether to validate the completeness of pushed changesets by
1665 checking that all new file revisions specified in manifests are
1671 checking that all new file revisions specified in manifests are
1666 present. (default: False)
1672 present. (default: False)
1667
1673
1668 ``maxhttpheaderlen``
1674 ``maxhttpheaderlen``
1669 Instruct HTTP clients not to send request headers longer than this
1675 Instruct HTTP clients not to send request headers longer than this
1670 many bytes. (default: 1024)
1676 many bytes. (default: 1024)
1671
1677
1672 ``bundle1``
1678 ``bundle1``
1673 Whether to allow clients to push and pull using the legacy bundle1
1679 Whether to allow clients to push and pull using the legacy bundle1
1674 exchange format. (default: True)
1680 exchange format. (default: True)
1675
1681
1676 ``bundle1gd``
1682 ``bundle1gd``
1677 Like ``bundle1`` but only used if the repository is using the
1683 Like ``bundle1`` but only used if the repository is using the
1678 *generaldelta* storage format. (default: True)
1684 *generaldelta* storage format. (default: True)
1679
1685
1680 ``bundle1.push``
1686 ``bundle1.push``
1681 Whether to allow clients to push using the legacy bundle1 exchange
1687 Whether to allow clients to push using the legacy bundle1 exchange
1682 format. (default: True)
1688 format. (default: True)
1683
1689
1684 ``bundle1gd.push``
1690 ``bundle1gd.push``
1685 Like ``bundle1.push`` but only used if the repository is using the
1691 Like ``bundle1.push`` but only used if the repository is using the
1686 *generaldelta* storage format. (default: True)
1692 *generaldelta* storage format. (default: True)
1687
1693
1688 ``bundle1.pull``
1694 ``bundle1.pull``
1689 Whether to allow clients to pull using the legacy bundle1 exchange
1695 Whether to allow clients to pull using the legacy bundle1 exchange
1690 format. (default: True)
1696 format. (default: True)
1691
1697
1692 ``bundle1gd.pull``
1698 ``bundle1gd.pull``
1693 Like ``bundle1.pull`` but only used if the repository is using the
1699 Like ``bundle1.pull`` but only used if the repository is using the
1694 *generaldelta* storage format. (default: True)
1700 *generaldelta* storage format. (default: True)
1695
1701
1696 Large repositories using the *generaldelta* storage format should
1702 Large repositories using the *generaldelta* storage format should
1697 consider setting this option because converting *generaldelta*
1703 consider setting this option because converting *generaldelta*
1698 repositories to the exchange format required by the bundle1 data
1704 repositories to the exchange format required by the bundle1 data
1699 format can consume a lot of CPU.
1705 format can consume a lot of CPU.
1700
1706
1701 ``zliblevel``
1707 ``zliblevel``
1702 Integer between ``-1`` and ``9`` that controls the zlib compression level
1708 Integer between ``-1`` and ``9`` that controls the zlib compression level
1703 for wire protocol commands that send zlib compressed output (notably the
1709 for wire protocol commands that send zlib compressed output (notably the
1704 commands that send repository history data).
1710 commands that send repository history data).
1705
1711
1706 The default (``-1``) uses the default zlib compression level, which is
1712 The default (``-1``) uses the default zlib compression level, which is
1707 likely equivalent to ``6``. ``0`` means no compression. ``9`` means
1713 likely equivalent to ``6``. ``0`` means no compression. ``9`` means
1708 maximum compression.
1714 maximum compression.
1709
1715
1710 Setting this option allows server operators to make trade-offs between
1716 Setting this option allows server operators to make trade-offs between
1711 bandwidth and CPU used. Lowering the compression lowers CPU utilization
1717 bandwidth and CPU used. Lowering the compression lowers CPU utilization
1712 but sends more bytes to clients.
1718 but sends more bytes to clients.
1713
1719
1714 This option only impacts the HTTP server.
1720 This option only impacts the HTTP server.
1715
1721
1716 ``zstdlevel``
1722 ``zstdlevel``
1717 Integer between ``1`` and ``22`` that controls the zstd compression level
1723 Integer between ``1`` and ``22`` that controls the zstd compression level
1718 for wire protocol commands. ``1`` is the minimal amount of compression and
1724 for wire protocol commands. ``1`` is the minimal amount of compression and
1719 ``22`` is the highest amount of compression.
1725 ``22`` is the highest amount of compression.
1720
1726
1721 The default (``3``) should be significantly faster than zlib while likely
1727 The default (``3``) should be significantly faster than zlib while likely
1722 delivering better compression ratios.
1728 delivering better compression ratios.
1723
1729
1724 This option only impacts the HTTP server.
1730 This option only impacts the HTTP server.
1725
1731
1726 See also ``server.zliblevel``.
1732 See also ``server.zliblevel``.
1727
1733
1728 ``smtp``
1734 ``smtp``
1729 --------
1735 --------
1730
1736
1731 Configuration for extensions that need to send email messages.
1737 Configuration for extensions that need to send email messages.
1732
1738
1733 ``host``
1739 ``host``
1734 Host name of mail server, e.g. "mail.example.com".
1740 Host name of mail server, e.g. "mail.example.com".
1735
1741
1736 ``port``
1742 ``port``
1737 Optional. Port to connect to on mail server. (default: 465 if
1743 Optional. Port to connect to on mail server. (default: 465 if
1738 ``tls`` is smtps; 25 otherwise)
1744 ``tls`` is smtps; 25 otherwise)
1739
1745
1740 ``tls``
1746 ``tls``
1741 Optional. Method to enable TLS when connecting to mail server: starttls,
1747 Optional. Method to enable TLS when connecting to mail server: starttls,
1742 smtps or none. (default: none)
1748 smtps or none. (default: none)
1743
1749
1744 ``username``
1750 ``username``
1745 Optional. User name for authenticating with the SMTP server.
1751 Optional. User name for authenticating with the SMTP server.
1746 (default: None)
1752 (default: None)
1747
1753
1748 ``password``
1754 ``password``
1749 Optional. Password for authenticating with the SMTP server. If not
1755 Optional. Password for authenticating with the SMTP server. If not
1750 specified, interactive sessions will prompt the user for a
1756 specified, interactive sessions will prompt the user for a
1751 password; non-interactive sessions will fail. (default: None)
1757 password; non-interactive sessions will fail. (default: None)
1752
1758
1753 ``local_hostname``
1759 ``local_hostname``
1754 Optional. The hostname that the sender can use to identify
1760 Optional. The hostname that the sender can use to identify
1755 itself to the MTA.
1761 itself to the MTA.
1756
1762
1757
1763
1758 ``subpaths``
1764 ``subpaths``
1759 ------------
1765 ------------
1760
1766
1761 Subrepository source URLs can go stale if a remote server changes name
1767 Subrepository source URLs can go stale if a remote server changes name
1762 or becomes temporarily unavailable. This section lets you define
1768 or becomes temporarily unavailable. This section lets you define
1763 rewrite rules of the form::
1769 rewrite rules of the form::
1764
1770
1765 <pattern> = <replacement>
1771 <pattern> = <replacement>
1766
1772
1767 where ``pattern`` is a regular expression matching a subrepository
1773 where ``pattern`` is a regular expression matching a subrepository
1768 source URL and ``replacement`` is the replacement string used to
1774 source URL and ``replacement`` is the replacement string used to
1769 rewrite it. Groups can be matched in ``pattern`` and referenced in
1775 rewrite it. Groups can be matched in ``pattern`` and referenced in
1770 ``replacements``. For instance::
1776 ``replacements``. For instance::
1771
1777
1772 http://server/(.*)-hg/ = http://hg.server/\1/
1778 http://server/(.*)-hg/ = http://hg.server/\1/
1773
1779
1774 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1780 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1775
1781
1776 Relative subrepository paths are first made absolute, and the
1782 Relative subrepository paths are first made absolute, and the
1777 rewrite rules are then applied on the full (absolute) path. If ``pattern``
1783 rewrite rules are then applied on the full (absolute) path. If ``pattern``
1778 doesn't match the full path, an attempt is made to apply it on the
1784 doesn't match the full path, an attempt is made to apply it on the
1779 relative path alone. The rules are applied in definition order.
1785 relative path alone. The rules are applied in definition order.
1780
1786
1781 ``templatealias``
1787 ``templatealias``
1782 -----------------
1788 -----------------
1783
1789
1784 Alias definitions for templates. See :hg:`help templates` for details.
1790 Alias definitions for templates. See :hg:`help templates` for details.
1785
1791
1786 ``templates``
1792 ``templates``
1787 -------------
1793 -------------
1788
1794
1789 Use the ``[templates]`` section to define template strings.
1795 Use the ``[templates]`` section to define template strings.
1790 See :hg:`help templates` for details.
1796 See :hg:`help templates` for details.
1791
1797
1792 ``trusted``
1798 ``trusted``
1793 -----------
1799 -----------
1794
1800
1795 Mercurial will not use the settings in the
1801 Mercurial will not use the settings in the
1796 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1802 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1797 user or to a trusted group, as various hgrc features allow arbitrary
1803 user or to a trusted group, as various hgrc features allow arbitrary
1798 commands to be run. This issue is often encountered when configuring
1804 commands to be run. This issue is often encountered when configuring
1799 hooks or extensions for shared repositories or servers. However,
1805 hooks or extensions for shared repositories or servers. However,
1800 the web interface will use some safe settings from the ``[web]``
1806 the web interface will use some safe settings from the ``[web]``
1801 section.
1807 section.
1802
1808
1803 This section specifies what users and groups are trusted. The
1809 This section specifies what users and groups are trusted. The
1804 current user is always trusted. To trust everybody, list a user or a
1810 current user is always trusted. To trust everybody, list a user or a
1805 group with name ``*``. These settings must be placed in an
1811 group with name ``*``. These settings must be placed in an
1806 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1812 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1807 user or service running Mercurial.
1813 user or service running Mercurial.
1808
1814
1809 ``users``
1815 ``users``
1810 Comma-separated list of trusted users.
1816 Comma-separated list of trusted users.
1811
1817
1812 ``groups``
1818 ``groups``
1813 Comma-separated list of trusted groups.
1819 Comma-separated list of trusted groups.
1814
1820
1815
1821
1816 ``ui``
1822 ``ui``
1817 ------
1823 ------
1818
1824
1819 User interface controls.
1825 User interface controls.
1820
1826
1821 ``archivemeta``
1827 ``archivemeta``
1822 Whether to include the .hg_archival.txt file containing meta data
1828 Whether to include the .hg_archival.txt file containing meta data
1823 (hashes for the repository base and for tip) in archives created
1829 (hashes for the repository base and for tip) in archives created
1824 by the :hg:`archive` command or downloaded via hgweb.
1830 by the :hg:`archive` command or downloaded via hgweb.
1825 (default: True)
1831 (default: True)
1826
1832
1827 ``askusername``
1833 ``askusername``
1828 Whether to prompt for a username when committing. If True, and
1834 Whether to prompt for a username when committing. If True, and
1829 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1835 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1830 be prompted to enter a username. If no username is entered, the
1836 be prompted to enter a username. If no username is entered, the
1831 default ``USER@HOST`` is used instead.
1837 default ``USER@HOST`` is used instead.
1832 (default: False)
1838 (default: False)
1833
1839
1834 ``clonebundles``
1840 ``clonebundles``
1835 Whether the "clone bundles" feature is enabled.
1841 Whether the "clone bundles" feature is enabled.
1836
1842
1837 When enabled, :hg:`clone` may download and apply a server-advertised
1843 When enabled, :hg:`clone` may download and apply a server-advertised
1838 bundle file from a URL instead of using the normal exchange mechanism.
1844 bundle file from a URL instead of using the normal exchange mechanism.
1839
1845
1840 This can likely result in faster and more reliable clones.
1846 This can likely result in faster and more reliable clones.
1841
1847
1842 (default: True)
1848 (default: True)
1843
1849
1844 ``clonebundlefallback``
1850 ``clonebundlefallback``
1845 Whether failure to apply an advertised "clone bundle" from a server
1851 Whether failure to apply an advertised "clone bundle" from a server
1846 should result in fallback to a regular clone.
1852 should result in fallback to a regular clone.
1847
1853
1848 This is disabled by default because servers advertising "clone
1854 This is disabled by default because servers advertising "clone
1849 bundles" often do so to reduce server load. If advertised bundles
1855 bundles" often do so to reduce server load. If advertised bundles
1850 start mass failing and clients automatically fall back to a regular
1856 start mass failing and clients automatically fall back to a regular
1851 clone, this would add significant and unexpected load to the server
1857 clone, this would add significant and unexpected load to the server
1852 since the server is expecting clone operations to be offloaded to
1858 since the server is expecting clone operations to be offloaded to
1853 pre-generated bundles. Failing fast (the default behavior) ensures
1859 pre-generated bundles. Failing fast (the default behavior) ensures
1854 clients don't overwhelm the server when "clone bundle" application
1860 clients don't overwhelm the server when "clone bundle" application
1855 fails.
1861 fails.
1856
1862
1857 (default: False)
1863 (default: False)
1858
1864
1859 ``clonebundleprefers``
1865 ``clonebundleprefers``
1860 Defines preferences for which "clone bundles" to use.
1866 Defines preferences for which "clone bundles" to use.
1861
1867
1862 Servers advertising "clone bundles" may advertise multiple available
1868 Servers advertising "clone bundles" may advertise multiple available
1863 bundles. Each bundle may have different attributes, such as the bundle
1869 bundles. Each bundle may have different attributes, such as the bundle
1864 type and compression format. This option is used to prefer a particular
1870 type and compression format. This option is used to prefer a particular
1865 bundle over another.
1871 bundle over another.
1866
1872
1867 The following keys are defined by Mercurial:
1873 The following keys are defined by Mercurial:
1868
1874
1869 BUNDLESPEC
1875 BUNDLESPEC
1870 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1876 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1871 e.g. ``gzip-v2`` or ``bzip2-v1``.
1877 e.g. ``gzip-v2`` or ``bzip2-v1``.
1872
1878
1873 COMPRESSION
1879 COMPRESSION
1874 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1880 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1875
1881
1876 Server operators may define custom keys.
1882 Server operators may define custom keys.
1877
1883
1878 Example values: ``COMPRESSION=bzip2``,
1884 Example values: ``COMPRESSION=bzip2``,
1879 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1885 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1880
1886
1881 By default, the first bundle advertised by the server is used.
1887 By default, the first bundle advertised by the server is used.
1882
1888
1883 ``color``
1889 ``color``
1884 When to colorize output. Possible value are Boolean ("yes" or "no"), or
1890 When to colorize output. Possible value are Boolean ("yes" or "no"), or
1885 "debug", or "always". (default: "yes"). "yes" will use color whenever it
1891 "debug", or "always". (default: "yes"). "yes" will use color whenever it
1886 seems possible. See :hg:`help color` for details.
1892 seems possible. See :hg:`help color` for details.
1887
1893
1888 ``commitsubrepos``
1894 ``commitsubrepos``
1889 Whether to commit modified subrepositories when committing the
1895 Whether to commit modified subrepositories when committing the
1890 parent repository. If False and one subrepository has uncommitted
1896 parent repository. If False and one subrepository has uncommitted
1891 changes, abort the commit.
1897 changes, abort the commit.
1892 (default: False)
1898 (default: False)
1893
1899
1894 ``debug``
1900 ``debug``
1895 Print debugging information. (default: False)
1901 Print debugging information. (default: False)
1896
1902
1897 ``editor``
1903 ``editor``
1898 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1904 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1899
1905
1900 ``fallbackencoding``
1906 ``fallbackencoding``
1901 Encoding to try if it's not possible to decode the changelog using
1907 Encoding to try if it's not possible to decode the changelog using
1902 UTF-8. (default: ISO-8859-1)
1908 UTF-8. (default: ISO-8859-1)
1903
1909
1904 ``graphnodetemplate``
1910 ``graphnodetemplate``
1905 The template used to print changeset nodes in an ASCII revision graph.
1911 The template used to print changeset nodes in an ASCII revision graph.
1906 (default: ``{graphnode}``)
1912 (default: ``{graphnode}``)
1907
1913
1908 ``ignore``
1914 ``ignore``
1909 A file to read per-user ignore patterns from. This file should be
1915 A file to read per-user ignore patterns from. This file should be
1910 in the same format as a repository-wide .hgignore file. Filenames
1916 in the same format as a repository-wide .hgignore file. Filenames
1911 are relative to the repository root. This option supports hook syntax,
1917 are relative to the repository root. This option supports hook syntax,
1912 so if you want to specify multiple ignore files, you can do so by
1918 so if you want to specify multiple ignore files, you can do so by
1913 setting something like ``ignore.other = ~/.hgignore2``. For details
1919 setting something like ``ignore.other = ~/.hgignore2``. For details
1914 of the ignore file format, see the ``hgignore(5)`` man page.
1920 of the ignore file format, see the ``hgignore(5)`` man page.
1915
1921
1916 ``interactive``
1922 ``interactive``
1917 Allow to prompt the user. (default: True)
1923 Allow to prompt the user. (default: True)
1918
1924
1919 ``interface``
1925 ``interface``
1920 Select the default interface for interactive features (default: text).
1926 Select the default interface for interactive features (default: text).
1921 Possible values are 'text' and 'curses'.
1927 Possible values are 'text' and 'curses'.
1922
1928
1923 ``interface.chunkselector``
1929 ``interface.chunkselector``
1924 Select the interface for change recording (e.g. :hg:`commit -i`).
1930 Select the interface for change recording (e.g. :hg:`commit -i`).
1925 Possible values are 'text' and 'curses'.
1931 Possible values are 'text' and 'curses'.
1926 This config overrides the interface specified by ui.interface.
1932 This config overrides the interface specified by ui.interface.
1927
1933
1928 ``logtemplate``
1934 ``logtemplate``
1929 Template string for commands that print changesets.
1935 Template string for commands that print changesets.
1930
1936
1931 ``merge``
1937 ``merge``
1932 The conflict resolution program to use during a manual merge.
1938 The conflict resolution program to use during a manual merge.
1933 For more information on merge tools see :hg:`help merge-tools`.
1939 For more information on merge tools see :hg:`help merge-tools`.
1934 For configuring merge tools see the ``[merge-tools]`` section.
1940 For configuring merge tools see the ``[merge-tools]`` section.
1935
1941
1936 ``mergemarkers``
1942 ``mergemarkers``
1937 Sets the merge conflict marker label styling. The ``detailed``
1943 Sets the merge conflict marker label styling. The ``detailed``
1938 style uses the ``mergemarkertemplate`` setting to style the labels.
1944 style uses the ``mergemarkertemplate`` setting to style the labels.
1939 The ``basic`` style just uses 'local' and 'other' as the marker label.
1945 The ``basic`` style just uses 'local' and 'other' as the marker label.
1940 One of ``basic`` or ``detailed``.
1946 One of ``basic`` or ``detailed``.
1941 (default: ``basic``)
1947 (default: ``basic``)
1942
1948
1943 ``mergemarkertemplate``
1949 ``mergemarkertemplate``
1944 The template used to print the commit description next to each conflict
1950 The template used to print the commit description next to each conflict
1945 marker during merge conflicts. See :hg:`help templates` for the template
1951 marker during merge conflicts. See :hg:`help templates` for the template
1946 format.
1952 format.
1947
1953
1948 Defaults to showing the hash, tags, branches, bookmarks, author, and
1954 Defaults to showing the hash, tags, branches, bookmarks, author, and
1949 the first line of the commit description.
1955 the first line of the commit description.
1950
1956
1951 If you use non-ASCII characters in names for tags, branches, bookmarks,
1957 If you use non-ASCII characters in names for tags, branches, bookmarks,
1952 authors, and/or commit descriptions, you must pay attention to encodings of
1958 authors, and/or commit descriptions, you must pay attention to encodings of
1953 managed files. At template expansion, non-ASCII characters use the encoding
1959 managed files. At template expansion, non-ASCII characters use the encoding
1954 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1960 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1955 environment variables that govern your locale. If the encoding of the merge
1961 environment variables that govern your locale. If the encoding of the merge
1956 markers is different from the encoding of the merged files,
1962 markers is different from the encoding of the merged files,
1957 serious problems may occur.
1963 serious problems may occur.
1958
1964
1959 ``origbackuppath``
1965 ``origbackuppath``
1960 The path to a directory used to store generated .orig files. If the path is
1966 The path to a directory used to store generated .orig files. If the path is
1961 not a directory, one will be created.
1967 not a directory, one will be created.
1962
1968
1963 ``paginate``
1969 ``paginate``
1964 Control the pagination of command output (default: True). See :hg:`help pager`
1970 Control the pagination of command output (default: True). See :hg:`help pager`
1965 for details.
1971 for details.
1966
1972
1967 ``patch``
1973 ``patch``
1968 An optional external tool that ``hg import`` and some extensions
1974 An optional external tool that ``hg import`` and some extensions
1969 will use for applying patches. By default Mercurial uses an
1975 will use for applying patches. By default Mercurial uses an
1970 internal patch utility. The external tool must work as the common
1976 internal patch utility. The external tool must work as the common
1971 Unix ``patch`` program. In particular, it must accept a ``-p``
1977 Unix ``patch`` program. In particular, it must accept a ``-p``
1972 argument to strip patch headers, a ``-d`` argument to specify the
1978 argument to strip patch headers, a ``-d`` argument to specify the
1973 current directory, a file name to patch, and a patch file to take
1979 current directory, a file name to patch, and a patch file to take
1974 from stdin.
1980 from stdin.
1975
1981
1976 It is possible to specify a patch tool together with extra
1982 It is possible to specify a patch tool together with extra
1977 arguments. For example, setting this option to ``patch --merge``
1983 arguments. For example, setting this option to ``patch --merge``
1978 will use the ``patch`` program with its 2-way merge option.
1984 will use the ``patch`` program with its 2-way merge option.
1979
1985
1980 ``portablefilenames``
1986 ``portablefilenames``
1981 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1987 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1982 (default: ``warn``)
1988 (default: ``warn``)
1983
1989
1984 ``warn``
1990 ``warn``
1985 Print a warning message on POSIX platforms, if a file with a non-portable
1991 Print a warning message on POSIX platforms, if a file with a non-portable
1986 filename is added (e.g. a file with a name that can't be created on
1992 filename is added (e.g. a file with a name that can't be created on
1987 Windows because it contains reserved parts like ``AUX``, reserved
1993 Windows because it contains reserved parts like ``AUX``, reserved
1988 characters like ``:``, or would cause a case collision with an existing
1994 characters like ``:``, or would cause a case collision with an existing
1989 file).
1995 file).
1990
1996
1991 ``ignore``
1997 ``ignore``
1992 Don't print a warning.
1998 Don't print a warning.
1993
1999
1994 ``abort``
2000 ``abort``
1995 The command is aborted.
2001 The command is aborted.
1996
2002
1997 ``true``
2003 ``true``
1998 Alias for ``warn``.
2004 Alias for ``warn``.
1999
2005
2000 ``false``
2006 ``false``
2001 Alias for ``ignore``.
2007 Alias for ``ignore``.
2002
2008
2003 .. container:: windows
2009 .. container:: windows
2004
2010
2005 On Windows, this configuration option is ignored and the command aborted.
2011 On Windows, this configuration option is ignored and the command aborted.
2006
2012
2007 ``quiet``
2013 ``quiet``
2008 Reduce the amount of output printed.
2014 Reduce the amount of output printed.
2009 (default: False)
2015 (default: False)
2010
2016
2011 ``remotecmd``
2017 ``remotecmd``
2012 Remote command to use for clone/push/pull operations.
2018 Remote command to use for clone/push/pull operations.
2013 (default: ``hg``)
2019 (default: ``hg``)
2014
2020
2015 ``report_untrusted``
2021 ``report_untrusted``
2016 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
2022 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
2017 trusted user or group.
2023 trusted user or group.
2018 (default: True)
2024 (default: True)
2019
2025
2020 ``slash``
2026 ``slash``
2021 Display paths using a slash (``/``) as the path separator. This
2027 Display paths using a slash (``/``) as the path separator. This
2022 only makes a difference on systems where the default path
2028 only makes a difference on systems where the default path
2023 separator is not the slash character (e.g. Windows uses the
2029 separator is not the slash character (e.g. Windows uses the
2024 backslash character (``\``)).
2030 backslash character (``\``)).
2025 (default: False)
2031 (default: False)
2026
2032
2027 ``statuscopies``
2033 ``statuscopies``
2028 Display copies in the status command.
2034 Display copies in the status command.
2029
2035
2030 ``ssh``
2036 ``ssh``
2031 Command to use for SSH connections. (default: ``ssh``)
2037 Command to use for SSH connections. (default: ``ssh``)
2032
2038
2033 ``strict``
2039 ``strict``
2034 Require exact command names, instead of allowing unambiguous
2040 Require exact command names, instead of allowing unambiguous
2035 abbreviations. (default: False)
2041 abbreviations. (default: False)
2036
2042
2037 ``style``
2043 ``style``
2038 Name of style to use for command output.
2044 Name of style to use for command output.
2039
2045
2040 ``supportcontact``
2046 ``supportcontact``
2041 A URL where users should report a Mercurial traceback. Use this if you are a
2047 A URL where users should report a Mercurial traceback. Use this if you are a
2042 large organisation with its own Mercurial deployment process and crash
2048 large organisation with its own Mercurial deployment process and crash
2043 reports should be addressed to your internal support.
2049 reports should be addressed to your internal support.
2044
2050
2045 ``textwidth``
2051 ``textwidth``
2046 Maximum width of help text. A longer line generated by ``hg help`` or
2052 Maximum width of help text. A longer line generated by ``hg help`` or
2047 ``hg subcommand --help`` will be broken after white space to get this
2053 ``hg subcommand --help`` will be broken after white space to get this
2048 width or the terminal width, whichever comes first.
2054 width or the terminal width, whichever comes first.
2049 A non-positive value will disable this and the terminal width will be
2055 A non-positive value will disable this and the terminal width will be
2050 used. (default: 78)
2056 used. (default: 78)
2051
2057
2052 ``timeout``
2058 ``timeout``
2053 The timeout used when a lock is held (in seconds), a negative value
2059 The timeout used when a lock is held (in seconds), a negative value
2054 means no timeout. (default: 600)
2060 means no timeout. (default: 600)
2055
2061
2056 ``traceback``
2062 ``traceback``
2057 Mercurial always prints a traceback when an unknown exception
2063 Mercurial always prints a traceback when an unknown exception
2058 occurs. Setting this to True will make Mercurial print a traceback
2064 occurs. Setting this to True will make Mercurial print a traceback
2059 on all exceptions, even those recognized by Mercurial (such as
2065 on all exceptions, even those recognized by Mercurial (such as
2060 IOError or MemoryError). (default: False)
2066 IOError or MemoryError). (default: False)
2061
2067
2062 ``username``
2068 ``username``
2063 The committer of a changeset created when running "commit".
2069 The committer of a changeset created when running "commit".
2064 Typically a person's name and email address, e.g. ``Fred Widget
2070 Typically a person's name and email address, e.g. ``Fred Widget
2065 <fred@example.com>``. Environment variables in the
2071 <fred@example.com>``. Environment variables in the
2066 username are expanded.
2072 username are expanded.
2067
2073
2068 (default: ``$EMAIL`` or ``username@hostname``. If the username in
2074 (default: ``$EMAIL`` or ``username@hostname``. If the username in
2069 hgrc is empty, e.g. if the system admin set ``username =`` in the
2075 hgrc is empty, e.g. if the system admin set ``username =`` in the
2070 system hgrc, it has to be specified manually or in a different
2076 system hgrc, it has to be specified manually or in a different
2071 hgrc file)
2077 hgrc file)
2072
2078
2073 ``verbose``
2079 ``verbose``
2074 Increase the amount of output printed. (default: False)
2080 Increase the amount of output printed. (default: False)
2075
2081
2076
2082
2077 ``web``
2083 ``web``
2078 -------
2084 -------
2079
2085
2080 Web interface configuration. The settings in this section apply to
2086 Web interface configuration. The settings in this section apply to
2081 both the builtin webserver (started by :hg:`serve`) and the script you
2087 both the builtin webserver (started by :hg:`serve`) and the script you
2082 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
2088 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
2083 and WSGI).
2089 and WSGI).
2084
2090
2085 The Mercurial webserver does no authentication (it does not prompt for
2091 The Mercurial webserver does no authentication (it does not prompt for
2086 usernames and passwords to validate *who* users are), but it does do
2092 usernames and passwords to validate *who* users are), but it does do
2087 authorization (it grants or denies access for *authenticated users*
2093 authorization (it grants or denies access for *authenticated users*
2088 based on settings in this section). You must either configure your
2094 based on settings in this section). You must either configure your
2089 webserver to do authentication for you, or disable the authorization
2095 webserver to do authentication for you, or disable the authorization
2090 checks.
2096 checks.
2091
2097
2092 For a quick setup in a trusted environment, e.g., a private LAN, where
2098 For a quick setup in a trusted environment, e.g., a private LAN, where
2093 you want it to accept pushes from anybody, you can use the following
2099 you want it to accept pushes from anybody, you can use the following
2094 command line::
2100 command line::
2095
2101
2096 $ hg --config web.allow_push=* --config web.push_ssl=False serve
2102 $ hg --config web.allow_push=* --config web.push_ssl=False serve
2097
2103
2098 Note that this will allow anybody to push anything to the server and
2104 Note that this will allow anybody to push anything to the server and
2099 that this should not be used for public servers.
2105 that this should not be used for public servers.
2100
2106
2101 The full set of options is:
2107 The full set of options is:
2102
2108
2103 ``accesslog``
2109 ``accesslog``
2104 Where to output the access log. (default: stdout)
2110 Where to output the access log. (default: stdout)
2105
2111
2106 ``address``
2112 ``address``
2107 Interface address to bind to. (default: all)
2113 Interface address to bind to. (default: all)
2108
2114
2109 ``allow_archive``
2115 ``allow_archive``
2110 List of archive format (bz2, gz, zip) allowed for downloading.
2116 List of archive format (bz2, gz, zip) allowed for downloading.
2111 (default: empty)
2117 (default: empty)
2112
2118
2113 ``allowbz2``
2119 ``allowbz2``
2114 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
2120 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
2115 revisions.
2121 revisions.
2116 (default: False)
2122 (default: False)
2117
2123
2118 ``allowgz``
2124 ``allowgz``
2119 (DEPRECATED) Whether to allow .tar.gz downloading of repository
2125 (DEPRECATED) Whether to allow .tar.gz downloading of repository
2120 revisions.
2126 revisions.
2121 (default: False)
2127 (default: False)
2122
2128
2123 ``allowpull``
2129 ``allowpull``
2124 Whether to allow pulling from the repository. (default: True)
2130 Whether to allow pulling from the repository. (default: True)
2125
2131
2126 ``allow_push``
2132 ``allow_push``
2127 Whether to allow pushing to the repository. If empty or not set,
2133 Whether to allow pushing to the repository. If empty or not set,
2128 pushing is not allowed. If the special value ``*``, any remote
2134 pushing is not allowed. If the special value ``*``, any remote
2129 user can push, including unauthenticated users. Otherwise, the
2135 user can push, including unauthenticated users. Otherwise, the
2130 remote user must have been authenticated, and the authenticated
2136 remote user must have been authenticated, and the authenticated
2131 user name must be present in this list. The contents of the
2137 user name must be present in this list. The contents of the
2132 allow_push list are examined after the deny_push list.
2138 allow_push list are examined after the deny_push list.
2133
2139
2134 ``allow_read``
2140 ``allow_read``
2135 If the user has not already been denied repository access due to
2141 If the user has not already been denied repository access due to
2136 the contents of deny_read, this list determines whether to grant
2142 the contents of deny_read, this list determines whether to grant
2137 repository access to the user. If this list is not empty, and the
2143 repository access to the user. If this list is not empty, and the
2138 user is unauthenticated or not present in the list, then access is
2144 user is unauthenticated or not present in the list, then access is
2139 denied for the user. If the list is empty or not set, then access
2145 denied for the user. If the list is empty or not set, then access
2140 is permitted to all users by default. Setting allow_read to the
2146 is permitted to all users by default. Setting allow_read to the
2141 special value ``*`` is equivalent to it not being set (i.e. access
2147 special value ``*`` is equivalent to it not being set (i.e. access
2142 is permitted to all users). The contents of the allow_read list are
2148 is permitted to all users). The contents of the allow_read list are
2143 examined after the deny_read list.
2149 examined after the deny_read list.
2144
2150
2145 ``allowzip``
2151 ``allowzip``
2146 (DEPRECATED) Whether to allow .zip downloading of repository
2152 (DEPRECATED) Whether to allow .zip downloading of repository
2147 revisions. This feature creates temporary files.
2153 revisions. This feature creates temporary files.
2148 (default: False)
2154 (default: False)
2149
2155
2150 ``archivesubrepos``
2156 ``archivesubrepos``
2151 Whether to recurse into subrepositories when archiving.
2157 Whether to recurse into subrepositories when archiving.
2152 (default: False)
2158 (default: False)
2153
2159
2154 ``baseurl``
2160 ``baseurl``
2155 Base URL to use when publishing URLs in other locations, so
2161 Base URL to use when publishing URLs in other locations, so
2156 third-party tools like email notification hooks can construct
2162 third-party tools like email notification hooks can construct
2157 URLs. Example: ``http://hgserver/repos/``.
2163 URLs. Example: ``http://hgserver/repos/``.
2158
2164
2159 ``cacerts``
2165 ``cacerts``
2160 Path to file containing a list of PEM encoded certificate
2166 Path to file containing a list of PEM encoded certificate
2161 authority certificates. Environment variables and ``~user``
2167 authority certificates. Environment variables and ``~user``
2162 constructs are expanded in the filename. If specified on the
2168 constructs are expanded in the filename. If specified on the
2163 client, then it will verify the identity of remote HTTPS servers
2169 client, then it will verify the identity of remote HTTPS servers
2164 with these certificates.
2170 with these certificates.
2165
2171
2166 To disable SSL verification temporarily, specify ``--insecure`` from
2172 To disable SSL verification temporarily, specify ``--insecure`` from
2167 command line.
2173 command line.
2168
2174
2169 You can use OpenSSL's CA certificate file if your platform has
2175 You can use OpenSSL's CA certificate file if your platform has
2170 one. On most Linux systems this will be
2176 one. On most Linux systems this will be
2171 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
2177 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
2172 generate this file manually. The form must be as follows::
2178 generate this file manually. The form must be as follows::
2173
2179
2174 -----BEGIN CERTIFICATE-----
2180 -----BEGIN CERTIFICATE-----
2175 ... (certificate in base64 PEM encoding) ...
2181 ... (certificate in base64 PEM encoding) ...
2176 -----END CERTIFICATE-----
2182 -----END CERTIFICATE-----
2177 -----BEGIN CERTIFICATE-----
2183 -----BEGIN CERTIFICATE-----
2178 ... (certificate in base64 PEM encoding) ...
2184 ... (certificate in base64 PEM encoding) ...
2179 -----END CERTIFICATE-----
2185 -----END CERTIFICATE-----
2180
2186
2181 ``cache``
2187 ``cache``
2182 Whether to support caching in hgweb. (default: True)
2188 Whether to support caching in hgweb. (default: True)
2183
2189
2184 ``certificate``
2190 ``certificate``
2185 Certificate to use when running :hg:`serve`.
2191 Certificate to use when running :hg:`serve`.
2186
2192
2187 ``collapse``
2193 ``collapse``
2188 With ``descend`` enabled, repositories in subdirectories are shown at
2194 With ``descend`` enabled, repositories in subdirectories are shown at
2189 a single level alongside repositories in the current path. With
2195 a single level alongside repositories in the current path. With
2190 ``collapse`` also enabled, repositories residing at a deeper level than
2196 ``collapse`` also enabled, repositories residing at a deeper level than
2191 the current path are grouped behind navigable directory entries that
2197 the current path are grouped behind navigable directory entries that
2192 lead to the locations of these repositories. In effect, this setting
2198 lead to the locations of these repositories. In effect, this setting
2193 collapses each collection of repositories found within a subdirectory
2199 collapses each collection of repositories found within a subdirectory
2194 into a single entry for that subdirectory. (default: False)
2200 into a single entry for that subdirectory. (default: False)
2195
2201
2196 ``comparisoncontext``
2202 ``comparisoncontext``
2197 Number of lines of context to show in side-by-side file comparison. If
2203 Number of lines of context to show in side-by-side file comparison. If
2198 negative or the value ``full``, whole files are shown. (default: 5)
2204 negative or the value ``full``, whole files are shown. (default: 5)
2199
2205
2200 This setting can be overridden by a ``context`` request parameter to the
2206 This setting can be overridden by a ``context`` request parameter to the
2201 ``comparison`` command, taking the same values.
2207 ``comparison`` command, taking the same values.
2202
2208
2203 ``contact``
2209 ``contact``
2204 Name or email address of the person in charge of the repository.
2210 Name or email address of the person in charge of the repository.
2205 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
2211 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
2206
2212
2207 ``csp``
2213 ``csp``
2208 Send a ``Content-Security-Policy`` HTTP header with this value.
2214 Send a ``Content-Security-Policy`` HTTP header with this value.
2209
2215
2210 The value may contain a special string ``%nonce%``, which will be replaced
2216 The value may contain a special string ``%nonce%``, which will be replaced
2211 by a randomly-generated one-time use value. If the value contains
2217 by a randomly-generated one-time use value. If the value contains
2212 ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the
2218 ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the
2213 one-time property of the nonce. This nonce will also be inserted into
2219 one-time property of the nonce. This nonce will also be inserted into
2214 ``<script>`` elements containing inline JavaScript.
2220 ``<script>`` elements containing inline JavaScript.
2215
2221
2216 Note: lots of HTML content sent by the server is derived from repository
2222 Note: lots of HTML content sent by the server is derived from repository
2217 data. Please consider the potential for malicious repository data to
2223 data. Please consider the potential for malicious repository data to
2218 "inject" itself into generated HTML content as part of your security
2224 "inject" itself into generated HTML content as part of your security
2219 threat model.
2225 threat model.
2220
2226
2221 ``deny_push``
2227 ``deny_push``
2222 Whether to deny pushing to the repository. If empty or not set,
2228 Whether to deny pushing to the repository. If empty or not set,
2223 push is not denied. If the special value ``*``, all remote users are
2229 push is not denied. If the special value ``*``, all remote users are
2224 denied push. Otherwise, unauthenticated users are all denied, and
2230 denied push. Otherwise, unauthenticated users are all denied, and
2225 any authenticated user name present in this list is also denied. The
2231 any authenticated user name present in this list is also denied. The
2226 contents of the deny_push list are examined before the allow_push list.
2232 contents of the deny_push list are examined before the allow_push list.
2227
2233
2228 ``deny_read``
2234 ``deny_read``
2229 Whether to deny reading/viewing of the repository. If this list is
2235 Whether to deny reading/viewing of the repository. If this list is
2230 not empty, unauthenticated users are all denied, and any
2236 not empty, unauthenticated users are all denied, and any
2231 authenticated user name present in this list is also denied access to
2237 authenticated user name present in this list is also denied access to
2232 the repository. If set to the special value ``*``, all remote users
2238 the repository. If set to the special value ``*``, all remote users
2233 are denied access (rarely needed ;). If deny_read is empty or not set,
2239 are denied access (rarely needed ;). If deny_read is empty or not set,
2234 the determination of repository access depends on the presence and
2240 the determination of repository access depends on the presence and
2235 content of the allow_read list (see description). If both
2241 content of the allow_read list (see description). If both
2236 deny_read and allow_read are empty or not set, then access is
2242 deny_read and allow_read are empty or not set, then access is
2237 permitted to all users by default. If the repository is being
2243 permitted to all users by default. If the repository is being
2238 served via hgwebdir, denied users will not be able to see it in
2244 served via hgwebdir, denied users will not be able to see it in
2239 the list of repositories. The contents of the deny_read list have
2245 the list of repositories. The contents of the deny_read list have
2240 priority over (are examined before) the contents of the allow_read
2246 priority over (are examined before) the contents of the allow_read
2241 list.
2247 list.
2242
2248
2243 ``descend``
2249 ``descend``
2244 hgwebdir indexes will not descend into subdirectories. Only repositories
2250 hgwebdir indexes will not descend into subdirectories. Only repositories
2245 directly in the current path will be shown (other repositories are still
2251 directly in the current path will be shown (other repositories are still
2246 available from the index corresponding to their containing path).
2252 available from the index corresponding to their containing path).
2247
2253
2248 ``description``
2254 ``description``
2249 Textual description of the repository's purpose or contents.
2255 Textual description of the repository's purpose or contents.
2250 (default: "unknown")
2256 (default: "unknown")
2251
2257
2252 ``encoding``
2258 ``encoding``
2253 Character encoding name. (default: the current locale charset)
2259 Character encoding name. (default: the current locale charset)
2254 Example: "UTF-8".
2260 Example: "UTF-8".
2255
2261
2256 ``errorlog``
2262 ``errorlog``
2257 Where to output the error log. (default: stderr)
2263 Where to output the error log. (default: stderr)
2258
2264
2259 ``guessmime``
2265 ``guessmime``
2260 Control MIME types for raw download of file content.
2266 Control MIME types for raw download of file content.
2261 Set to True to let hgweb guess the content type from the file
2267 Set to True to let hgweb guess the content type from the file
2262 extension. This will serve HTML files as ``text/html`` and might
2268 extension. This will serve HTML files as ``text/html`` and might
2263 allow cross-site scripting attacks when serving untrusted
2269 allow cross-site scripting attacks when serving untrusted
2264 repositories. (default: False)
2270 repositories. (default: False)
2265
2271
2266 ``hidden``
2272 ``hidden``
2267 Whether to hide the repository in the hgwebdir index.
2273 Whether to hide the repository in the hgwebdir index.
2268 (default: False)
2274 (default: False)
2269
2275
2270 ``ipv6``
2276 ``ipv6``
2271 Whether to use IPv6. (default: False)
2277 Whether to use IPv6. (default: False)
2272
2278
2273 ``labels``
2279 ``labels``
2274 List of string *labels* associated with the repository.
2280 List of string *labels* associated with the repository.
2275
2281
2276 Labels are exposed as a template keyword and can be used to customize
2282 Labels are exposed as a template keyword and can be used to customize
2277 output. e.g. the ``index`` template can group or filter repositories
2283 output. e.g. the ``index`` template can group or filter repositories
2278 by labels and the ``summary`` template can display additional content
2284 by labels and the ``summary`` template can display additional content
2279 if a specific label is present.
2285 if a specific label is present.
2280
2286
2281 ``logoimg``
2287 ``logoimg``
2282 File name of the logo image that some templates display on each page.
2288 File name of the logo image that some templates display on each page.
2283 The file name is relative to ``staticurl``. That is, the full path to
2289 The file name is relative to ``staticurl``. That is, the full path to
2284 the logo image is "staticurl/logoimg".
2290 the logo image is "staticurl/logoimg".
2285 If unset, ``hglogo.png`` will be used.
2291 If unset, ``hglogo.png`` will be used.
2286
2292
2287 ``logourl``
2293 ``logourl``
2288 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
2294 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
2289 will be used.
2295 will be used.
2290
2296
2291 ``maxchanges``
2297 ``maxchanges``
2292 Maximum number of changes to list on the changelog. (default: 10)
2298 Maximum number of changes to list on the changelog. (default: 10)
2293
2299
2294 ``maxfiles``
2300 ``maxfiles``
2295 Maximum number of files to list per changeset. (default: 10)
2301 Maximum number of files to list per changeset. (default: 10)
2296
2302
2297 ``maxshortchanges``
2303 ``maxshortchanges``
2298 Maximum number of changes to list on the shortlog, graph or filelog
2304 Maximum number of changes to list on the shortlog, graph or filelog
2299 pages. (default: 60)
2305 pages. (default: 60)
2300
2306
2301 ``name``
2307 ``name``
2302 Repository name to use in the web interface.
2308 Repository name to use in the web interface.
2303 (default: current working directory)
2309 (default: current working directory)
2304
2310
2305 ``port``
2311 ``port``
2306 Port to listen on. (default: 8000)
2312 Port to listen on. (default: 8000)
2307
2313
2308 ``prefix``
2314 ``prefix``
2309 Prefix path to serve from. (default: '' (server root))
2315 Prefix path to serve from. (default: '' (server root))
2310
2316
2311 ``push_ssl``
2317 ``push_ssl``
2312 Whether to require that inbound pushes be transported over SSL to
2318 Whether to require that inbound pushes be transported over SSL to
2313 prevent password sniffing. (default: True)
2319 prevent password sniffing. (default: True)
2314
2320
2315 ``refreshinterval``
2321 ``refreshinterval``
2316 How frequently directory listings re-scan the filesystem for new
2322 How frequently directory listings re-scan the filesystem for new
2317 repositories, in seconds. This is relevant when wildcards are used
2323 repositories, in seconds. This is relevant when wildcards are used
2318 to define paths. Depending on how much filesystem traversal is
2324 to define paths. Depending on how much filesystem traversal is
2319 required, refreshing may negatively impact performance.
2325 required, refreshing may negatively impact performance.
2320
2326
2321 Values less than or equal to 0 always refresh.
2327 Values less than or equal to 0 always refresh.
2322 (default: 20)
2328 (default: 20)
2323
2329
2324 ``staticurl``
2330 ``staticurl``
2325 Base URL to use for static files. If unset, static files (e.g. the
2331 Base URL to use for static files. If unset, static files (e.g. the
2326 hgicon.png favicon) will be served by the CGI script itself. Use
2332 hgicon.png favicon) will be served by the CGI script itself. Use
2327 this setting to serve them directly with the HTTP server.
2333 this setting to serve them directly with the HTTP server.
2328 Example: ``http://hgserver/static/``.
2334 Example: ``http://hgserver/static/``.
2329
2335
2330 ``stripes``
2336 ``stripes``
2331 How many lines a "zebra stripe" should span in multi-line output.
2337 How many lines a "zebra stripe" should span in multi-line output.
2332 Set to 0 to disable. (default: 1)
2338 Set to 0 to disable. (default: 1)
2333
2339
2334 ``style``
2340 ``style``
2335 Which template map style to use. The available options are the names of
2341 Which template map style to use. The available options are the names of
2336 subdirectories in the HTML templates path. (default: ``paper``)
2342 subdirectories in the HTML templates path. (default: ``paper``)
2337 Example: ``monoblue``.
2343 Example: ``monoblue``.
2338
2344
2339 ``templates``
2345 ``templates``
2340 Where to find the HTML templates. The default path to the HTML templates
2346 Where to find the HTML templates. The default path to the HTML templates
2341 can be obtained from ``hg debuginstall``.
2347 can be obtained from ``hg debuginstall``.
2342
2348
2343 ``websub``
2349 ``websub``
2344 ----------
2350 ----------
2345
2351
2346 Web substitution filter definition. You can use this section to
2352 Web substitution filter definition. You can use this section to
2347 define a set of regular expression substitution patterns which
2353 define a set of regular expression substitution patterns which
2348 let you automatically modify the hgweb server output.
2354 let you automatically modify the hgweb server output.
2349
2355
2350 The default hgweb templates only apply these substitution patterns
2356 The default hgweb templates only apply these substitution patterns
2351 on the revision description fields. You can apply them anywhere
2357 on the revision description fields. You can apply them anywhere
2352 you want when you create your own templates by adding calls to the
2358 you want when you create your own templates by adding calls to the
2353 "websub" filter (usually after calling the "escape" filter).
2359 "websub" filter (usually after calling the "escape" filter).
2354
2360
2355 This can be used, for example, to convert issue references to links
2361 This can be used, for example, to convert issue references to links
2356 to your issue tracker, or to convert "markdown-like" syntax into
2362 to your issue tracker, or to convert "markdown-like" syntax into
2357 HTML (see the examples below).
2363 HTML (see the examples below).
2358
2364
2359 Each entry in this section names a substitution filter.
2365 Each entry in this section names a substitution filter.
2360 The value of each entry defines the substitution expression itself.
2366 The value of each entry defines the substitution expression itself.
2361 The websub expressions follow the old interhg extension syntax,
2367 The websub expressions follow the old interhg extension syntax,
2362 which in turn imitates the Unix sed replacement syntax::
2368 which in turn imitates the Unix sed replacement syntax::
2363
2369
2364 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2370 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2365
2371
2366 You can use any separator other than "/". The final "i" is optional
2372 You can use any separator other than "/". The final "i" is optional
2367 and indicates that the search must be case insensitive.
2373 and indicates that the search must be case insensitive.
2368
2374
2369 Examples::
2375 Examples::
2370
2376
2371 [websub]
2377 [websub]
2372 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2378 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2373 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2379 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2374 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2380 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2375
2381
2376 ``worker``
2382 ``worker``
2377 ----------
2383 ----------
2378
2384
2379 Parallel master/worker configuration. We currently perform working
2385 Parallel master/worker configuration. We currently perform working
2380 directory updates in parallel on Unix-like systems, which greatly
2386 directory updates in parallel on Unix-like systems, which greatly
2381 helps performance.
2387 helps performance.
2382
2388
2383 ``numcpus``
2389 ``numcpus``
2384 Number of CPUs to use for parallel operations. A zero or
2390 Number of CPUs to use for parallel operations. A zero or
2385 negative value is treated as ``use the default``.
2391 negative value is treated as ``use the default``.
2386 (default: 4 or the number of CPUs on the system, whichever is larger)
2392 (default: 4 or the number of CPUs on the system, whichever is larger)
2387
2393
2388 ``backgroundclose``
2394 ``backgroundclose``
2389 Whether to enable closing file handles on background threads during certain
2395 Whether to enable closing file handles on background threads during certain
2390 operations. Some platforms aren't very efficient at closing file
2396 operations. Some platforms aren't very efficient at closing file
2391 handles that have been written or appended to. By performing file closing
2397 handles that have been written or appended to. By performing file closing
2392 on background threads, file write rate can increase substantially.
2398 on background threads, file write rate can increase substantially.
2393 (default: true on Windows, false elsewhere)
2399 (default: true on Windows, false elsewhere)
2394
2400
2395 ``backgroundcloseminfilecount``
2401 ``backgroundcloseminfilecount``
2396 Minimum number of files required to trigger background file closing.
2402 Minimum number of files required to trigger background file closing.
2397 Operations not writing this many files won't start background close
2403 Operations not writing this many files won't start background close
2398 threads.
2404 threads.
2399 (default: 2048)
2405 (default: 2048)
2400
2406
2401 ``backgroundclosemaxqueue``
2407 ``backgroundclosemaxqueue``
2402 The maximum number of opened file handles waiting to be closed in the
2408 The maximum number of opened file handles waiting to be closed in the
2403 background. This option only has an effect if ``backgroundclose`` is
2409 background. This option only has an effect if ``backgroundclose`` is
2404 enabled.
2410 enabled.
2405 (default: 384)
2411 (default: 384)
2406
2412
2407 ``backgroundclosethreadcount``
2413 ``backgroundclosethreadcount``
2408 Number of threads to process background file closes. Only relevant if
2414 Number of threads to process background file closes. Only relevant if
2409 ``backgroundclose`` is enabled.
2415 ``backgroundclose`` is enabled.
2410 (default: 4)
2416 (default: 4)
@@ -1,1050 +1,1062
1 # wireproto.py - generic wire protocol support functions
1 # wireproto.py - generic wire protocol support functions
2 #
2 #
3 # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import hashlib
10 import hashlib
11 import itertools
11 import itertools
12 import os
12 import os
13 import tempfile
13 import tempfile
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 bin,
17 bin,
18 hex,
18 hex,
19 nullid,
19 )
20 )
20
21
21 from . import (
22 from . import (
22 bundle2,
23 bundle2,
23 changegroup as changegroupmod,
24 changegroup as changegroupmod,
24 encoding,
25 encoding,
25 error,
26 error,
26 exchange,
27 exchange,
27 peer,
28 peer,
28 pushkey as pushkeymod,
29 pushkey as pushkeymod,
29 pycompat,
30 pycompat,
30 streamclone,
31 streamclone,
31 util,
32 util,
32 )
33 )
33
34
34 urlerr = util.urlerr
35 urlerr = util.urlerr
35 urlreq = util.urlreq
36 urlreq = util.urlreq
36
37
37 bundle2requiredmain = _('incompatible Mercurial client; bundle2 required')
38 bundle2requiredmain = _('incompatible Mercurial client; bundle2 required')
38 bundle2requiredhint = _('see https://www.mercurial-scm.org/wiki/'
39 bundle2requiredhint = _('see https://www.mercurial-scm.org/wiki/'
39 'IncompatibleClient')
40 'IncompatibleClient')
40 bundle2required = '%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
41 bundle2required = '%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
41
42
42 class abstractserverproto(object):
43 class abstractserverproto(object):
43 """abstract class that summarizes the protocol API
44 """abstract class that summarizes the protocol API
44
45
45 Used as reference and documentation.
46 Used as reference and documentation.
46 """
47 """
47
48
48 def getargs(self, args):
49 def getargs(self, args):
49 """return the value for arguments in <args>
50 """return the value for arguments in <args>
50
51
51 returns a list of values (same order as <args>)"""
52 returns a list of values (same order as <args>)"""
52 raise NotImplementedError()
53 raise NotImplementedError()
53
54
54 def getfile(self, fp):
55 def getfile(self, fp):
55 """write the whole content of a file into a file like object
56 """write the whole content of a file into a file like object
56
57
57 The file is in the form::
58 The file is in the form::
58
59
59 (<chunk-size>\n<chunk>)+0\n
60 (<chunk-size>\n<chunk>)+0\n
60
61
61 chunk size is the ascii version of the int.
62 chunk size is the ascii version of the int.
62 """
63 """
63 raise NotImplementedError()
64 raise NotImplementedError()
64
65
65 def redirect(self):
66 def redirect(self):
66 """may setup interception for stdout and stderr
67 """may setup interception for stdout and stderr
67
68
68 See also the `restore` method."""
69 See also the `restore` method."""
69 raise NotImplementedError()
70 raise NotImplementedError()
70
71
71 # If the `redirect` function does install interception, the `restore`
72 # If the `redirect` function does install interception, the `restore`
72 # function MUST be defined. If interception is not used, this function
73 # function MUST be defined. If interception is not used, this function
73 # MUST NOT be defined.
74 # MUST NOT be defined.
74 #
75 #
75 # left commented here on purpose
76 # left commented here on purpose
76 #
77 #
77 #def restore(self):
78 #def restore(self):
78 # """reinstall previous stdout and stderr and return intercepted stdout
79 # """reinstall previous stdout and stderr and return intercepted stdout
79 # """
80 # """
80 # raise NotImplementedError()
81 # raise NotImplementedError()
81
82
82 class remotebatch(peer.batcher):
83 class remotebatch(peer.batcher):
83 '''batches the queued calls; uses as few roundtrips as possible'''
84 '''batches the queued calls; uses as few roundtrips as possible'''
84 def __init__(self, remote):
85 def __init__(self, remote):
85 '''remote must support _submitbatch(encbatch) and
86 '''remote must support _submitbatch(encbatch) and
86 _submitone(op, encargs)'''
87 _submitone(op, encargs)'''
87 peer.batcher.__init__(self)
88 peer.batcher.__init__(self)
88 self.remote = remote
89 self.remote = remote
89 def submit(self):
90 def submit(self):
90 req, rsp = [], []
91 req, rsp = [], []
91 for name, args, opts, resref in self.calls:
92 for name, args, opts, resref in self.calls:
92 mtd = getattr(self.remote, name)
93 mtd = getattr(self.remote, name)
93 batchablefn = getattr(mtd, 'batchable', None)
94 batchablefn = getattr(mtd, 'batchable', None)
94 if batchablefn is not None:
95 if batchablefn is not None:
95 batchable = batchablefn(mtd.im_self, *args, **opts)
96 batchable = batchablefn(mtd.im_self, *args, **opts)
96 encargsorres, encresref = next(batchable)
97 encargsorres, encresref = next(batchable)
97 if encresref:
98 if encresref:
98 req.append((name, encargsorres,))
99 req.append((name, encargsorres,))
99 rsp.append((batchable, encresref, resref,))
100 rsp.append((batchable, encresref, resref,))
100 else:
101 else:
101 resref.set(encargsorres)
102 resref.set(encargsorres)
102 else:
103 else:
103 if req:
104 if req:
104 self._submitreq(req, rsp)
105 self._submitreq(req, rsp)
105 req, rsp = [], []
106 req, rsp = [], []
106 resref.set(mtd(*args, **opts))
107 resref.set(mtd(*args, **opts))
107 if req:
108 if req:
108 self._submitreq(req, rsp)
109 self._submitreq(req, rsp)
109 def _submitreq(self, req, rsp):
110 def _submitreq(self, req, rsp):
110 encresults = self.remote._submitbatch(req)
111 encresults = self.remote._submitbatch(req)
111 for encres, r in zip(encresults, rsp):
112 for encres, r in zip(encresults, rsp):
112 batchable, encresref, resref = r
113 batchable, encresref, resref = r
113 encresref.set(encres)
114 encresref.set(encres)
114 resref.set(next(batchable))
115 resref.set(next(batchable))
115
116
116 class remoteiterbatcher(peer.iterbatcher):
117 class remoteiterbatcher(peer.iterbatcher):
117 def __init__(self, remote):
118 def __init__(self, remote):
118 super(remoteiterbatcher, self).__init__()
119 super(remoteiterbatcher, self).__init__()
119 self._remote = remote
120 self._remote = remote
120
121
121 def __getattr__(self, name):
122 def __getattr__(self, name):
122 if not getattr(self._remote, name, False):
123 if not getattr(self._remote, name, False):
123 raise AttributeError(
124 raise AttributeError(
124 'Attempted to iterbatch non-batchable call to %r' % name)
125 'Attempted to iterbatch non-batchable call to %r' % name)
125 return super(remoteiterbatcher, self).__getattr__(name)
126 return super(remoteiterbatcher, self).__getattr__(name)
126
127
127 def submit(self):
128 def submit(self):
128 """Break the batch request into many patch calls and pipeline them.
129 """Break the batch request into many patch calls and pipeline them.
129
130
130 This is mostly valuable over http where request sizes can be
131 This is mostly valuable over http where request sizes can be
131 limited, but can be used in other places as well.
132 limited, but can be used in other places as well.
132 """
133 """
133 req, rsp = [], []
134 req, rsp = [], []
134 for name, args, opts, resref in self.calls:
135 for name, args, opts, resref in self.calls:
135 mtd = getattr(self._remote, name)
136 mtd = getattr(self._remote, name)
136 batchable = mtd.batchable(mtd.im_self, *args, **opts)
137 batchable = mtd.batchable(mtd.im_self, *args, **opts)
137 encargsorres, encresref = next(batchable)
138 encargsorres, encresref = next(batchable)
138 assert encresref
139 assert encresref
139 req.append((name, encargsorres))
140 req.append((name, encargsorres))
140 rsp.append((batchable, encresref))
141 rsp.append((batchable, encresref))
141 if req:
142 if req:
142 self._resultiter = self._remote._submitbatch(req)
143 self._resultiter = self._remote._submitbatch(req)
143 self._rsp = rsp
144 self._rsp = rsp
144
145
145 def results(self):
146 def results(self):
146 for (batchable, encresref), encres in itertools.izip(
147 for (batchable, encresref), encres in itertools.izip(
147 self._rsp, self._resultiter):
148 self._rsp, self._resultiter):
148 encresref.set(encres)
149 encresref.set(encres)
149 yield next(batchable)
150 yield next(batchable)
150
151
151 # Forward a couple of names from peer to make wireproto interactions
152 # Forward a couple of names from peer to make wireproto interactions
152 # slightly more sensible.
153 # slightly more sensible.
153 batchable = peer.batchable
154 batchable = peer.batchable
154 future = peer.future
155 future = peer.future
155
156
156 # list of nodes encoding / decoding
157 # list of nodes encoding / decoding
157
158
158 def decodelist(l, sep=' '):
159 def decodelist(l, sep=' '):
159 if l:
160 if l:
160 return map(bin, l.split(sep))
161 return map(bin, l.split(sep))
161 return []
162 return []
162
163
163 def encodelist(l, sep=' '):
164 def encodelist(l, sep=' '):
164 try:
165 try:
165 return sep.join(map(hex, l))
166 return sep.join(map(hex, l))
166 except TypeError:
167 except TypeError:
167 raise
168 raise
168
169
169 # batched call argument encoding
170 # batched call argument encoding
170
171
171 def escapearg(plain):
172 def escapearg(plain):
172 return (plain
173 return (plain
173 .replace(':', ':c')
174 .replace(':', ':c')
174 .replace(',', ':o')
175 .replace(',', ':o')
175 .replace(';', ':s')
176 .replace(';', ':s')
176 .replace('=', ':e'))
177 .replace('=', ':e'))
177
178
178 def unescapearg(escaped):
179 def unescapearg(escaped):
179 return (escaped
180 return (escaped
180 .replace(':e', '=')
181 .replace(':e', '=')
181 .replace(':s', ';')
182 .replace(':s', ';')
182 .replace(':o', ',')
183 .replace(':o', ',')
183 .replace(':c', ':'))
184 .replace(':c', ':'))
184
185
185 def encodebatchcmds(req):
186 def encodebatchcmds(req):
186 """Return a ``cmds`` argument value for the ``batch`` command."""
187 """Return a ``cmds`` argument value for the ``batch`` command."""
187 cmds = []
188 cmds = []
188 for op, argsdict in req:
189 for op, argsdict in req:
189 # Old servers didn't properly unescape argument names. So prevent
190 # Old servers didn't properly unescape argument names. So prevent
190 # the sending of argument names that may not be decoded properly by
191 # the sending of argument names that may not be decoded properly by
191 # servers.
192 # servers.
192 assert all(escapearg(k) == k for k in argsdict)
193 assert all(escapearg(k) == k for k in argsdict)
193
194
194 args = ','.join('%s=%s' % (escapearg(k), escapearg(v))
195 args = ','.join('%s=%s' % (escapearg(k), escapearg(v))
195 for k, v in argsdict.iteritems())
196 for k, v in argsdict.iteritems())
196 cmds.append('%s %s' % (op, args))
197 cmds.append('%s %s' % (op, args))
197
198
198 return ';'.join(cmds)
199 return ';'.join(cmds)
199
200
200 # mapping of options accepted by getbundle and their types
201 # mapping of options accepted by getbundle and their types
201 #
202 #
202 # Meant to be extended by extensions. It is extensions responsibility to ensure
203 # Meant to be extended by extensions. It is extensions responsibility to ensure
203 # such options are properly processed in exchange.getbundle.
204 # such options are properly processed in exchange.getbundle.
204 #
205 #
205 # supported types are:
206 # supported types are:
206 #
207 #
207 # :nodes: list of binary nodes
208 # :nodes: list of binary nodes
208 # :csv: list of comma-separated values
209 # :csv: list of comma-separated values
209 # :scsv: list of comma-separated values return as set
210 # :scsv: list of comma-separated values return as set
210 # :plain: string with no transformation needed.
211 # :plain: string with no transformation needed.
211 gboptsmap = {'heads': 'nodes',
212 gboptsmap = {'heads': 'nodes',
212 'common': 'nodes',
213 'common': 'nodes',
213 'obsmarkers': 'boolean',
214 'obsmarkers': 'boolean',
214 'bundlecaps': 'scsv',
215 'bundlecaps': 'scsv',
215 'listkeys': 'csv',
216 'listkeys': 'csv',
216 'cg': 'boolean',
217 'cg': 'boolean',
217 'cbattempted': 'boolean'}
218 'cbattempted': 'boolean'}
218
219
219 # client side
220 # client side
220
221
221 class wirepeer(peer.peerrepository):
222 class wirepeer(peer.peerrepository):
222 """Client-side interface for communicating with a peer repository.
223 """Client-side interface for communicating with a peer repository.
223
224
224 Methods commonly call wire protocol commands of the same name.
225 Methods commonly call wire protocol commands of the same name.
225
226
226 See also httppeer.py and sshpeer.py for protocol-specific
227 See also httppeer.py and sshpeer.py for protocol-specific
227 implementations of this interface.
228 implementations of this interface.
228 """
229 """
229 def batch(self):
230 def batch(self):
230 if self.capable('batch'):
231 if self.capable('batch'):
231 return remotebatch(self)
232 return remotebatch(self)
232 else:
233 else:
233 return peer.localbatch(self)
234 return peer.localbatch(self)
234 def _submitbatch(self, req):
235 def _submitbatch(self, req):
235 """run batch request <req> on the server
236 """run batch request <req> on the server
236
237
237 Returns an iterator of the raw responses from the server.
238 Returns an iterator of the raw responses from the server.
238 """
239 """
239 rsp = self._callstream("batch", cmds=encodebatchcmds(req))
240 rsp = self._callstream("batch", cmds=encodebatchcmds(req))
240 chunk = rsp.read(1024)
241 chunk = rsp.read(1024)
241 work = [chunk]
242 work = [chunk]
242 while chunk:
243 while chunk:
243 while ';' not in chunk and chunk:
244 while ';' not in chunk and chunk:
244 chunk = rsp.read(1024)
245 chunk = rsp.read(1024)
245 work.append(chunk)
246 work.append(chunk)
246 merged = ''.join(work)
247 merged = ''.join(work)
247 while ';' in merged:
248 while ';' in merged:
248 one, merged = merged.split(';', 1)
249 one, merged = merged.split(';', 1)
249 yield unescapearg(one)
250 yield unescapearg(one)
250 chunk = rsp.read(1024)
251 chunk = rsp.read(1024)
251 work = [merged, chunk]
252 work = [merged, chunk]
252 yield unescapearg(''.join(work))
253 yield unescapearg(''.join(work))
253
254
254 def _submitone(self, op, args):
255 def _submitone(self, op, args):
255 return self._call(op, **args)
256 return self._call(op, **args)
256
257
257 def iterbatch(self):
258 def iterbatch(self):
258 return remoteiterbatcher(self)
259 return remoteiterbatcher(self)
259
260
260 @batchable
261 @batchable
261 def lookup(self, key):
262 def lookup(self, key):
262 self.requirecap('lookup', _('look up remote revision'))
263 self.requirecap('lookup', _('look up remote revision'))
263 f = future()
264 f = future()
264 yield {'key': encoding.fromlocal(key)}, f
265 yield {'key': encoding.fromlocal(key)}, f
265 d = f.value
266 d = f.value
266 success, data = d[:-1].split(" ", 1)
267 success, data = d[:-1].split(" ", 1)
267 if int(success):
268 if int(success):
268 yield bin(data)
269 yield bin(data)
269 self._abort(error.RepoError(data))
270 self._abort(error.RepoError(data))
270
271
271 @batchable
272 @batchable
272 def heads(self):
273 def heads(self):
273 f = future()
274 f = future()
274 yield {}, f
275 yield {}, f
275 d = f.value
276 d = f.value
276 try:
277 try:
277 yield decodelist(d[:-1])
278 yield decodelist(d[:-1])
278 except ValueError:
279 except ValueError:
279 self._abort(error.ResponseError(_("unexpected response:"), d))
280 self._abort(error.ResponseError(_("unexpected response:"), d))
280
281
281 @batchable
282 @batchable
282 def known(self, nodes):
283 def known(self, nodes):
283 f = future()
284 f = future()
284 yield {'nodes': encodelist(nodes)}, f
285 yield {'nodes': encodelist(nodes)}, f
285 d = f.value
286 d = f.value
286 try:
287 try:
287 yield [bool(int(b)) for b in d]
288 yield [bool(int(b)) for b in d]
288 except ValueError:
289 except ValueError:
289 self._abort(error.ResponseError(_("unexpected response:"), d))
290 self._abort(error.ResponseError(_("unexpected response:"), d))
290
291
291 @batchable
292 @batchable
292 def branchmap(self):
293 def branchmap(self):
293 f = future()
294 f = future()
294 yield {}, f
295 yield {}, f
295 d = f.value
296 d = f.value
296 try:
297 try:
297 branchmap = {}
298 branchmap = {}
298 for branchpart in d.splitlines():
299 for branchpart in d.splitlines():
299 branchname, branchheads = branchpart.split(' ', 1)
300 branchname, branchheads = branchpart.split(' ', 1)
300 branchname = encoding.tolocal(urlreq.unquote(branchname))
301 branchname = encoding.tolocal(urlreq.unquote(branchname))
301 branchheads = decodelist(branchheads)
302 branchheads = decodelist(branchheads)
302 branchmap[branchname] = branchheads
303 branchmap[branchname] = branchheads
303 yield branchmap
304 yield branchmap
304 except TypeError:
305 except TypeError:
305 self._abort(error.ResponseError(_("unexpected response:"), d))
306 self._abort(error.ResponseError(_("unexpected response:"), d))
306
307
307 def branches(self, nodes):
308 def branches(self, nodes):
308 n = encodelist(nodes)
309 n = encodelist(nodes)
309 d = self._call("branches", nodes=n)
310 d = self._call("branches", nodes=n)
310 try:
311 try:
311 br = [tuple(decodelist(b)) for b in d.splitlines()]
312 br = [tuple(decodelist(b)) for b in d.splitlines()]
312 return br
313 return br
313 except ValueError:
314 except ValueError:
314 self._abort(error.ResponseError(_("unexpected response:"), d))
315 self._abort(error.ResponseError(_("unexpected response:"), d))
315
316
316 def between(self, pairs):
317 def between(self, pairs):
317 batch = 8 # avoid giant requests
318 batch = 8 # avoid giant requests
318 r = []
319 r = []
319 for i in xrange(0, len(pairs), batch):
320 for i in xrange(0, len(pairs), batch):
320 n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
321 n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
321 d = self._call("between", pairs=n)
322 d = self._call("between", pairs=n)
322 try:
323 try:
323 r.extend(l and decodelist(l) or [] for l in d.splitlines())
324 r.extend(l and decodelist(l) or [] for l in d.splitlines())
324 except ValueError:
325 except ValueError:
325 self._abort(error.ResponseError(_("unexpected response:"), d))
326 self._abort(error.ResponseError(_("unexpected response:"), d))
326 return r
327 return r
327
328
328 @batchable
329 @batchable
329 def pushkey(self, namespace, key, old, new):
330 def pushkey(self, namespace, key, old, new):
330 if not self.capable('pushkey'):
331 if not self.capable('pushkey'):
331 yield False, None
332 yield False, None
332 f = future()
333 f = future()
333 self.ui.debug('preparing pushkey for "%s:%s"\n' % (namespace, key))
334 self.ui.debug('preparing pushkey for "%s:%s"\n' % (namespace, key))
334 yield {'namespace': encoding.fromlocal(namespace),
335 yield {'namespace': encoding.fromlocal(namespace),
335 'key': encoding.fromlocal(key),
336 'key': encoding.fromlocal(key),
336 'old': encoding.fromlocal(old),
337 'old': encoding.fromlocal(old),
337 'new': encoding.fromlocal(new)}, f
338 'new': encoding.fromlocal(new)}, f
338 d = f.value
339 d = f.value
339 d, output = d.split('\n', 1)
340 d, output = d.split('\n', 1)
340 try:
341 try:
341 d = bool(int(d))
342 d = bool(int(d))
342 except ValueError:
343 except ValueError:
343 raise error.ResponseError(
344 raise error.ResponseError(
344 _('push failed (unexpected response):'), d)
345 _('push failed (unexpected response):'), d)
345 for l in output.splitlines(True):
346 for l in output.splitlines(True):
346 self.ui.status(_('remote: '), l)
347 self.ui.status(_('remote: '), l)
347 yield d
348 yield d
348
349
349 @batchable
350 @batchable
350 def listkeys(self, namespace):
351 def listkeys(self, namespace):
351 if not self.capable('pushkey'):
352 if not self.capable('pushkey'):
352 yield {}, None
353 yield {}, None
353 f = future()
354 f = future()
354 self.ui.debug('preparing listkeys for "%s"\n' % namespace)
355 self.ui.debug('preparing listkeys for "%s"\n' % namespace)
355 yield {'namespace': encoding.fromlocal(namespace)}, f
356 yield {'namespace': encoding.fromlocal(namespace)}, f
356 d = f.value
357 d = f.value
357 self.ui.debug('received listkey for "%s": %i bytes\n'
358 self.ui.debug('received listkey for "%s": %i bytes\n'
358 % (namespace, len(d)))
359 % (namespace, len(d)))
359 yield pushkeymod.decodekeys(d)
360 yield pushkeymod.decodekeys(d)
360
361
361 def stream_out(self):
362 def stream_out(self):
362 return self._callstream('stream_out')
363 return self._callstream('stream_out')
363
364
364 def changegroup(self, nodes, kind):
365 def changegroup(self, nodes, kind):
365 n = encodelist(nodes)
366 n = encodelist(nodes)
366 f = self._callcompressable("changegroup", roots=n)
367 f = self._callcompressable("changegroup", roots=n)
367 return changegroupmod.cg1unpacker(f, 'UN')
368 return changegroupmod.cg1unpacker(f, 'UN')
368
369
369 def changegroupsubset(self, bases, heads, kind):
370 def changegroupsubset(self, bases, heads, kind):
370 self.requirecap('changegroupsubset', _('look up remote changes'))
371 self.requirecap('changegroupsubset', _('look up remote changes'))
371 bases = encodelist(bases)
372 bases = encodelist(bases)
372 heads = encodelist(heads)
373 heads = encodelist(heads)
373 f = self._callcompressable("changegroupsubset",
374 f = self._callcompressable("changegroupsubset",
374 bases=bases, heads=heads)
375 bases=bases, heads=heads)
375 return changegroupmod.cg1unpacker(f, 'UN')
376 return changegroupmod.cg1unpacker(f, 'UN')
376
377
377 def getbundle(self, source, **kwargs):
378 def getbundle(self, source, **kwargs):
378 self.requirecap('getbundle', _('look up remote changes'))
379 self.requirecap('getbundle', _('look up remote changes'))
379 opts = {}
380 opts = {}
380 bundlecaps = kwargs.get('bundlecaps')
381 bundlecaps = kwargs.get('bundlecaps')
381 if bundlecaps is not None:
382 if bundlecaps is not None:
382 kwargs['bundlecaps'] = sorted(bundlecaps)
383 kwargs['bundlecaps'] = sorted(bundlecaps)
383 else:
384 else:
384 bundlecaps = () # kwargs could have it to None
385 bundlecaps = () # kwargs could have it to None
385 for key, value in kwargs.iteritems():
386 for key, value in kwargs.iteritems():
386 if value is None:
387 if value is None:
387 continue
388 continue
388 keytype = gboptsmap.get(key)
389 keytype = gboptsmap.get(key)
389 if keytype is None:
390 if keytype is None:
390 assert False, 'unexpected'
391 assert False, 'unexpected'
391 elif keytype == 'nodes':
392 elif keytype == 'nodes':
392 value = encodelist(value)
393 value = encodelist(value)
393 elif keytype in ('csv', 'scsv'):
394 elif keytype in ('csv', 'scsv'):
394 value = ','.join(value)
395 value = ','.join(value)
395 elif keytype == 'boolean':
396 elif keytype == 'boolean':
396 value = '%i' % bool(value)
397 value = '%i' % bool(value)
397 elif keytype != 'plain':
398 elif keytype != 'plain':
398 raise KeyError('unknown getbundle option type %s'
399 raise KeyError('unknown getbundle option type %s'
399 % keytype)
400 % keytype)
400 opts[key] = value
401 opts[key] = value
401 f = self._callcompressable("getbundle", **opts)
402 f = self._callcompressable("getbundle", **opts)
402 if any((cap.startswith('HG2') for cap in bundlecaps)):
403 if any((cap.startswith('HG2') for cap in bundlecaps)):
403 return bundle2.getunbundler(self.ui, f)
404 return bundle2.getunbundler(self.ui, f)
404 else:
405 else:
405 return changegroupmod.cg1unpacker(f, 'UN')
406 return changegroupmod.cg1unpacker(f, 'UN')
406
407
407 def unbundle(self, cg, heads, url):
408 def unbundle(self, cg, heads, url):
408 '''Send cg (a readable file-like object representing the
409 '''Send cg (a readable file-like object representing the
409 changegroup to push, typically a chunkbuffer object) to the
410 changegroup to push, typically a chunkbuffer object) to the
410 remote server as a bundle.
411 remote server as a bundle.
411
412
412 When pushing a bundle10 stream, return an integer indicating the
413 When pushing a bundle10 stream, return an integer indicating the
413 result of the push (see localrepository.addchangegroup()).
414 result of the push (see localrepository.addchangegroup()).
414
415
415 When pushing a bundle20 stream, return a bundle20 stream.
416 When pushing a bundle20 stream, return a bundle20 stream.
416
417
417 `url` is the url the client thinks it's pushing to, which is
418 `url` is the url the client thinks it's pushing to, which is
418 visible to hooks.
419 visible to hooks.
419 '''
420 '''
420
421
421 if heads != ['force'] and self.capable('unbundlehash'):
422 if heads != ['force'] and self.capable('unbundlehash'):
422 heads = encodelist(['hashed',
423 heads = encodelist(['hashed',
423 hashlib.sha1(''.join(sorted(heads))).digest()])
424 hashlib.sha1(''.join(sorted(heads))).digest()])
424 else:
425 else:
425 heads = encodelist(heads)
426 heads = encodelist(heads)
426
427
427 if util.safehasattr(cg, 'deltaheader'):
428 if util.safehasattr(cg, 'deltaheader'):
428 # this a bundle10, do the old style call sequence
429 # this a bundle10, do the old style call sequence
429 ret, output = self._callpush("unbundle", cg, heads=heads)
430 ret, output = self._callpush("unbundle", cg, heads=heads)
430 if ret == "":
431 if ret == "":
431 raise error.ResponseError(
432 raise error.ResponseError(
432 _('push failed:'), output)
433 _('push failed:'), output)
433 try:
434 try:
434 ret = int(ret)
435 ret = int(ret)
435 except ValueError:
436 except ValueError:
436 raise error.ResponseError(
437 raise error.ResponseError(
437 _('push failed (unexpected response):'), ret)
438 _('push failed (unexpected response):'), ret)
438
439
439 for l in output.splitlines(True):
440 for l in output.splitlines(True):
440 self.ui.status(_('remote: '), l)
441 self.ui.status(_('remote: '), l)
441 else:
442 else:
442 # bundle2 push. Send a stream, fetch a stream.
443 # bundle2 push. Send a stream, fetch a stream.
443 stream = self._calltwowaystream('unbundle', cg, heads=heads)
444 stream = self._calltwowaystream('unbundle', cg, heads=heads)
444 ret = bundle2.getunbundler(self.ui, stream)
445 ret = bundle2.getunbundler(self.ui, stream)
445 return ret
446 return ret
446
447
447 def debugwireargs(self, one, two, three=None, four=None, five=None):
448 def debugwireargs(self, one, two, three=None, four=None, five=None):
448 # don't pass optional arguments left at their default value
449 # don't pass optional arguments left at their default value
449 opts = {}
450 opts = {}
450 if three is not None:
451 if three is not None:
451 opts['three'] = three
452 opts['three'] = three
452 if four is not None:
453 if four is not None:
453 opts['four'] = four
454 opts['four'] = four
454 return self._call('debugwireargs', one=one, two=two, **opts)
455 return self._call('debugwireargs', one=one, two=two, **opts)
455
456
456 def _call(self, cmd, **args):
457 def _call(self, cmd, **args):
457 """execute <cmd> on the server
458 """execute <cmd> on the server
458
459
459 The command is expected to return a simple string.
460 The command is expected to return a simple string.
460
461
461 returns the server reply as a string."""
462 returns the server reply as a string."""
462 raise NotImplementedError()
463 raise NotImplementedError()
463
464
464 def _callstream(self, cmd, **args):
465 def _callstream(self, cmd, **args):
465 """execute <cmd> on the server
466 """execute <cmd> on the server
466
467
467 The command is expected to return a stream. Note that if the
468 The command is expected to return a stream. Note that if the
468 command doesn't return a stream, _callstream behaves
469 command doesn't return a stream, _callstream behaves
469 differently for ssh and http peers.
470 differently for ssh and http peers.
470
471
471 returns the server reply as a file like object.
472 returns the server reply as a file like object.
472 """
473 """
473 raise NotImplementedError()
474 raise NotImplementedError()
474
475
475 def _callcompressable(self, cmd, **args):
476 def _callcompressable(self, cmd, **args):
476 """execute <cmd> on the server
477 """execute <cmd> on the server
477
478
478 The command is expected to return a stream.
479 The command is expected to return a stream.
479
480
480 The stream may have been compressed in some implementations. This
481 The stream may have been compressed in some implementations. This
481 function takes care of the decompression. This is the only difference
482 function takes care of the decompression. This is the only difference
482 with _callstream.
483 with _callstream.
483
484
484 returns the server reply as a file like object.
485 returns the server reply as a file like object.
485 """
486 """
486 raise NotImplementedError()
487 raise NotImplementedError()
487
488
488 def _callpush(self, cmd, fp, **args):
489 def _callpush(self, cmd, fp, **args):
489 """execute a <cmd> on server
490 """execute a <cmd> on server
490
491
491 The command is expected to be related to a push. Push has a special
492 The command is expected to be related to a push. Push has a special
492 return method.
493 return method.
493
494
494 returns the server reply as a (ret, output) tuple. ret is either
495 returns the server reply as a (ret, output) tuple. ret is either
495 empty (error) or a stringified int.
496 empty (error) or a stringified int.
496 """
497 """
497 raise NotImplementedError()
498 raise NotImplementedError()
498
499
499 def _calltwowaystream(self, cmd, fp, **args):
500 def _calltwowaystream(self, cmd, fp, **args):
500 """execute <cmd> on server
501 """execute <cmd> on server
501
502
502 The command will send a stream to the server and get a stream in reply.
503 The command will send a stream to the server and get a stream in reply.
503 """
504 """
504 raise NotImplementedError()
505 raise NotImplementedError()
505
506
506 def _abort(self, exception):
507 def _abort(self, exception):
507 """clearly abort the wire protocol connection and raise the exception
508 """clearly abort the wire protocol connection and raise the exception
508 """
509 """
509 raise NotImplementedError()
510 raise NotImplementedError()
510
511
511 # server side
512 # server side
512
513
513 # wire protocol command can either return a string or one of these classes.
514 # wire protocol command can either return a string or one of these classes.
514 class streamres(object):
515 class streamres(object):
515 """wireproto reply: binary stream
516 """wireproto reply: binary stream
516
517
517 The call was successful and the result is a stream.
518 The call was successful and the result is a stream.
518
519
519 Accepts either a generator or an object with a ``read(size)`` method.
520 Accepts either a generator or an object with a ``read(size)`` method.
520
521
521 ``v1compressible`` indicates whether this data can be compressed to
522 ``v1compressible`` indicates whether this data can be compressed to
522 "version 1" clients (technically: HTTP peers using
523 "version 1" clients (technically: HTTP peers using
523 application/mercurial-0.1 media type). This flag should NOT be used on
524 application/mercurial-0.1 media type). This flag should NOT be used on
524 new commands because new clients should support a more modern compression
525 new commands because new clients should support a more modern compression
525 mechanism.
526 mechanism.
526 """
527 """
527 def __init__(self, gen=None, reader=None, v1compressible=False):
528 def __init__(self, gen=None, reader=None, v1compressible=False):
528 self.gen = gen
529 self.gen = gen
529 self.reader = reader
530 self.reader = reader
530 self.v1compressible = v1compressible
531 self.v1compressible = v1compressible
531
532
532 class pushres(object):
533 class pushres(object):
533 """wireproto reply: success with simple integer return
534 """wireproto reply: success with simple integer return
534
535
535 The call was successful and returned an integer contained in `self.res`.
536 The call was successful and returned an integer contained in `self.res`.
536 """
537 """
537 def __init__(self, res):
538 def __init__(self, res):
538 self.res = res
539 self.res = res
539
540
540 class pusherr(object):
541 class pusherr(object):
541 """wireproto reply: failure
542 """wireproto reply: failure
542
543
543 The call failed. The `self.res` attribute contains the error message.
544 The call failed. The `self.res` attribute contains the error message.
544 """
545 """
545 def __init__(self, res):
546 def __init__(self, res):
546 self.res = res
547 self.res = res
547
548
548 class ooberror(object):
549 class ooberror(object):
549 """wireproto reply: failure of a batch of operation
550 """wireproto reply: failure of a batch of operation
550
551
551 Something failed during a batch call. The error message is stored in
552 Something failed during a batch call. The error message is stored in
552 `self.message`.
553 `self.message`.
553 """
554 """
554 def __init__(self, message):
555 def __init__(self, message):
555 self.message = message
556 self.message = message
556
557
557 def getdispatchrepo(repo, proto, command):
558 def getdispatchrepo(repo, proto, command):
558 """Obtain the repo used for processing wire protocol commands.
559 """Obtain the repo used for processing wire protocol commands.
559
560
560 The intent of this function is to serve as a monkeypatch point for
561 The intent of this function is to serve as a monkeypatch point for
561 extensions that need commands to operate on different repo views under
562 extensions that need commands to operate on different repo views under
562 specialized circumstances.
563 specialized circumstances.
563 """
564 """
564 return repo.filtered('served')
565 return repo.filtered('served')
565
566
566 def dispatch(repo, proto, command):
567 def dispatch(repo, proto, command):
567 repo = getdispatchrepo(repo, proto, command)
568 repo = getdispatchrepo(repo, proto, command)
568 func, spec = commands[command]
569 func, spec = commands[command]
569 args = proto.getargs(spec)
570 args = proto.getargs(spec)
570 return func(repo, proto, *args)
571 return func(repo, proto, *args)
571
572
572 def options(cmd, keys, others):
573 def options(cmd, keys, others):
573 opts = {}
574 opts = {}
574 for k in keys:
575 for k in keys:
575 if k in others:
576 if k in others:
576 opts[k] = others[k]
577 opts[k] = others[k]
577 del others[k]
578 del others[k]
578 if others:
579 if others:
579 util.stderr.write("warning: %s ignored unexpected arguments %s\n"
580 util.stderr.write("warning: %s ignored unexpected arguments %s\n"
580 % (cmd, ",".join(others)))
581 % (cmd, ",".join(others)))
581 return opts
582 return opts
582
583
583 def bundle1allowed(repo, action):
584 def bundle1allowed(repo, action):
584 """Whether a bundle1 operation is allowed from the server.
585 """Whether a bundle1 operation is allowed from the server.
585
586
586 Priority is:
587 Priority is:
587
588
588 1. server.bundle1gd.<action> (if generaldelta active)
589 1. server.bundle1gd.<action> (if generaldelta active)
589 2. server.bundle1.<action>
590 2. server.bundle1.<action>
590 3. server.bundle1gd (if generaldelta active)
591 3. server.bundle1gd (if generaldelta active)
591 4. server.bundle1
592 4. server.bundle1
592 """
593 """
593 ui = repo.ui
594 ui = repo.ui
594 gd = 'generaldelta' in repo.requirements
595 gd = 'generaldelta' in repo.requirements
595
596
596 if gd:
597 if gd:
597 v = ui.configbool('server', 'bundle1gd.%s' % action, None)
598 v = ui.configbool('server', 'bundle1gd.%s' % action, None)
598 if v is not None:
599 if v is not None:
599 return v
600 return v
600
601
601 v = ui.configbool('server', 'bundle1.%s' % action, None)
602 v = ui.configbool('server', 'bundle1.%s' % action, None)
602 if v is not None:
603 if v is not None:
603 return v
604 return v
604
605
605 if gd:
606 if gd:
606 v = ui.configbool('server', 'bundle1gd', None)
607 v = ui.configbool('server', 'bundle1gd', None)
607 if v is not None:
608 if v is not None:
608 return v
609 return v
609
610
610 return ui.configbool('server', 'bundle1', True)
611 return ui.configbool('server', 'bundle1', True)
611
612
612 def supportedcompengines(ui, proto, role):
613 def supportedcompengines(ui, proto, role):
613 """Obtain the list of supported compression engines for a request."""
614 """Obtain the list of supported compression engines for a request."""
614 assert role in (util.CLIENTROLE, util.SERVERROLE)
615 assert role in (util.CLIENTROLE, util.SERVERROLE)
615
616
616 compengines = util.compengines.supportedwireengines(role)
617 compengines = util.compengines.supportedwireengines(role)
617
618
618 # Allow config to override default list and ordering.
619 # Allow config to override default list and ordering.
619 if role == util.SERVERROLE:
620 if role == util.SERVERROLE:
620 configengines = ui.configlist('server', 'compressionengines')
621 configengines = ui.configlist('server', 'compressionengines')
621 config = 'server.compressionengines'
622 config = 'server.compressionengines'
622 else:
623 else:
623 # This is currently implemented mainly to facilitate testing. In most
624 # This is currently implemented mainly to facilitate testing. In most
624 # cases, the server should be in charge of choosing a compression engine
625 # cases, the server should be in charge of choosing a compression engine
625 # because a server has the most to lose from a sub-optimal choice. (e.g.
626 # because a server has the most to lose from a sub-optimal choice. (e.g.
626 # CPU DoS due to an expensive engine or a network DoS due to poor
627 # CPU DoS due to an expensive engine or a network DoS due to poor
627 # compression ratio).
628 # compression ratio).
628 configengines = ui.configlist('experimental',
629 configengines = ui.configlist('experimental',
629 'clientcompressionengines')
630 'clientcompressionengines')
630 config = 'experimental.clientcompressionengines'
631 config = 'experimental.clientcompressionengines'
631
632
632 # No explicit config. Filter out the ones that aren't supposed to be
633 # No explicit config. Filter out the ones that aren't supposed to be
633 # advertised and return default ordering.
634 # advertised and return default ordering.
634 if not configengines:
635 if not configengines:
635 attr = 'serverpriority' if role == util.SERVERROLE else 'clientpriority'
636 attr = 'serverpriority' if role == util.SERVERROLE else 'clientpriority'
636 return [e for e in compengines
637 return [e for e in compengines
637 if getattr(e.wireprotosupport(), attr) > 0]
638 if getattr(e.wireprotosupport(), attr) > 0]
638
639
639 # If compression engines are listed in the config, assume there is a good
640 # If compression engines are listed in the config, assume there is a good
640 # reason for it (like server operators wanting to achieve specific
641 # reason for it (like server operators wanting to achieve specific
641 # performance characteristics). So fail fast if the config references
642 # performance characteristics). So fail fast if the config references
642 # unusable compression engines.
643 # unusable compression engines.
643 validnames = set(e.name() for e in compengines)
644 validnames = set(e.name() for e in compengines)
644 invalidnames = set(e for e in configengines if e not in validnames)
645 invalidnames = set(e for e in configengines if e not in validnames)
645 if invalidnames:
646 if invalidnames:
646 raise error.Abort(_('invalid compression engine defined in %s: %s') %
647 raise error.Abort(_('invalid compression engine defined in %s: %s') %
647 (config, ', '.join(sorted(invalidnames))))
648 (config, ', '.join(sorted(invalidnames))))
648
649
649 compengines = [e for e in compengines if e.name() in configengines]
650 compengines = [e for e in compengines if e.name() in configengines]
650 compengines = sorted(compengines,
651 compengines = sorted(compengines,
651 key=lambda e: configengines.index(e.name()))
652 key=lambda e: configengines.index(e.name()))
652
653
653 if not compengines:
654 if not compengines:
654 raise error.Abort(_('%s config option does not specify any known '
655 raise error.Abort(_('%s config option does not specify any known '
655 'compression engines') % config,
656 'compression engines') % config,
656 hint=_('usable compression engines: %s') %
657 hint=_('usable compression engines: %s') %
657 ', '.sorted(validnames))
658 ', '.sorted(validnames))
658
659
659 return compengines
660 return compengines
660
661
661 # list of commands
662 # list of commands
662 commands = {}
663 commands = {}
663
664
664 def wireprotocommand(name, args=''):
665 def wireprotocommand(name, args=''):
665 """decorator for wire protocol command"""
666 """decorator for wire protocol command"""
666 def register(func):
667 def register(func):
667 commands[name] = (func, args)
668 commands[name] = (func, args)
668 return func
669 return func
669 return register
670 return register
670
671
671 @wireprotocommand('batch', 'cmds *')
672 @wireprotocommand('batch', 'cmds *')
672 def batch(repo, proto, cmds, others):
673 def batch(repo, proto, cmds, others):
673 repo = repo.filtered("served")
674 repo = repo.filtered("served")
674 res = []
675 res = []
675 for pair in cmds.split(';'):
676 for pair in cmds.split(';'):
676 op, args = pair.split(' ', 1)
677 op, args = pair.split(' ', 1)
677 vals = {}
678 vals = {}
678 for a in args.split(','):
679 for a in args.split(','):
679 if a:
680 if a:
680 n, v = a.split('=')
681 n, v = a.split('=')
681 vals[unescapearg(n)] = unescapearg(v)
682 vals[unescapearg(n)] = unescapearg(v)
682 func, spec = commands[op]
683 func, spec = commands[op]
683 if spec:
684 if spec:
684 keys = spec.split()
685 keys = spec.split()
685 data = {}
686 data = {}
686 for k in keys:
687 for k in keys:
687 if k == '*':
688 if k == '*':
688 star = {}
689 star = {}
689 for key in vals.keys():
690 for key in vals.keys():
690 if key not in keys:
691 if key not in keys:
691 star[key] = vals[key]
692 star[key] = vals[key]
692 data['*'] = star
693 data['*'] = star
693 else:
694 else:
694 data[k] = vals[k]
695 data[k] = vals[k]
695 result = func(repo, proto, *[data[k] for k in keys])
696 result = func(repo, proto, *[data[k] for k in keys])
696 else:
697 else:
697 result = func(repo, proto)
698 result = func(repo, proto)
698 if isinstance(result, ooberror):
699 if isinstance(result, ooberror):
699 return result
700 return result
700 res.append(escapearg(result))
701 res.append(escapearg(result))
701 return ';'.join(res)
702 return ';'.join(res)
702
703
703 @wireprotocommand('between', 'pairs')
704 @wireprotocommand('between', 'pairs')
704 def between(repo, proto, pairs):
705 def between(repo, proto, pairs):
705 pairs = [decodelist(p, '-') for p in pairs.split(" ")]
706 pairs = [decodelist(p, '-') for p in pairs.split(" ")]
706 r = []
707 r = []
707 for b in repo.between(pairs):
708 for b in repo.between(pairs):
708 r.append(encodelist(b) + "\n")
709 r.append(encodelist(b) + "\n")
709 return "".join(r)
710 return "".join(r)
710
711
711 @wireprotocommand('branchmap')
712 @wireprotocommand('branchmap')
712 def branchmap(repo, proto):
713 def branchmap(repo, proto):
713 branchmap = repo.branchmap()
714 branchmap = repo.branchmap()
714 heads = []
715 heads = []
715 for branch, nodes in branchmap.iteritems():
716 for branch, nodes in branchmap.iteritems():
716 branchname = urlreq.quote(encoding.fromlocal(branch))
717 branchname = urlreq.quote(encoding.fromlocal(branch))
717 branchnodes = encodelist(nodes)
718 branchnodes = encodelist(nodes)
718 heads.append('%s %s' % (branchname, branchnodes))
719 heads.append('%s %s' % (branchname, branchnodes))
719 return '\n'.join(heads)
720 return '\n'.join(heads)
720
721
721 @wireprotocommand('branches', 'nodes')
722 @wireprotocommand('branches', 'nodes')
722 def branches(repo, proto, nodes):
723 def branches(repo, proto, nodes):
723 nodes = decodelist(nodes)
724 nodes = decodelist(nodes)
724 r = []
725 r = []
725 for b in repo.branches(nodes):
726 for b in repo.branches(nodes):
726 r.append(encodelist(b) + "\n")
727 r.append(encodelist(b) + "\n")
727 return "".join(r)
728 return "".join(r)
728
729
729 @wireprotocommand('clonebundles', '')
730 @wireprotocommand('clonebundles', '')
730 def clonebundles(repo, proto):
731 def clonebundles(repo, proto):
731 """Server command for returning info for available bundles to seed clones.
732 """Server command for returning info for available bundles to seed clones.
732
733
733 Clients will parse this response and determine what bundle to fetch.
734 Clients will parse this response and determine what bundle to fetch.
734
735
735 Extensions may wrap this command to filter or dynamically emit data
736 Extensions may wrap this command to filter or dynamically emit data
736 depending on the request. e.g. you could advertise URLs for the closest
737 depending on the request. e.g. you could advertise URLs for the closest
737 data center given the client's IP address.
738 data center given the client's IP address.
738 """
739 """
739 return repo.vfs.tryread('clonebundles.manifest')
740 return repo.vfs.tryread('clonebundles.manifest')
740
741
741 wireprotocaps = ['lookup', 'changegroupsubset', 'branchmap', 'pushkey',
742 wireprotocaps = ['lookup', 'changegroupsubset', 'branchmap', 'pushkey',
742 'known', 'getbundle', 'unbundlehash', 'batch']
743 'known', 'getbundle', 'unbundlehash', 'batch']
743
744
744 def _capabilities(repo, proto):
745 def _capabilities(repo, proto):
745 """return a list of capabilities for a repo
746 """return a list of capabilities for a repo
746
747
747 This function exists to allow extensions to easily wrap capabilities
748 This function exists to allow extensions to easily wrap capabilities
748 computation
749 computation
749
750
750 - returns a lists: easy to alter
751 - returns a lists: easy to alter
751 - change done here will be propagated to both `capabilities` and `hello`
752 - change done here will be propagated to both `capabilities` and `hello`
752 command without any other action needed.
753 command without any other action needed.
753 """
754 """
754 # copy to prevent modification of the global list
755 # copy to prevent modification of the global list
755 caps = list(wireprotocaps)
756 caps = list(wireprotocaps)
756 if streamclone.allowservergeneration(repo.ui):
757 if streamclone.allowservergeneration(repo.ui):
757 if repo.ui.configbool('server', 'preferuncompressed', False):
758 if repo.ui.configbool('server', 'preferuncompressed', False):
758 caps.append('stream-preferred')
759 caps.append('stream-preferred')
759 requiredformats = repo.requirements & repo.supportedformats
760 requiredformats = repo.requirements & repo.supportedformats
760 # if our local revlogs are just revlogv1, add 'stream' cap
761 # if our local revlogs are just revlogv1, add 'stream' cap
761 if not requiredformats - set(('revlogv1',)):
762 if not requiredformats - set(('revlogv1',)):
762 caps.append('stream')
763 caps.append('stream')
763 # otherwise, add 'streamreqs' detailing our local revlog format
764 # otherwise, add 'streamreqs' detailing our local revlog format
764 else:
765 else:
765 caps.append('streamreqs=%s' % ','.join(sorted(requiredformats)))
766 caps.append('streamreqs=%s' % ','.join(sorted(requiredformats)))
766 if repo.ui.configbool('experimental', 'bundle2-advertise', True):
767 if repo.ui.configbool('experimental', 'bundle2-advertise', True):
767 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
768 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
768 caps.append('bundle2=' + urlreq.quote(capsblob))
769 caps.append('bundle2=' + urlreq.quote(capsblob))
769 caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority))
770 caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority))
770
771
771 if proto.name == 'http':
772 if proto.name == 'http':
772 caps.append('httpheader=%d' %
773 caps.append('httpheader=%d' %
773 repo.ui.configint('server', 'maxhttpheaderlen', 1024))
774 repo.ui.configint('server', 'maxhttpheaderlen', 1024))
774 if repo.ui.configbool('experimental', 'httppostargs', False):
775 if repo.ui.configbool('experimental', 'httppostargs', False):
775 caps.append('httppostargs')
776 caps.append('httppostargs')
776
777
777 # FUTURE advertise 0.2rx once support is implemented
778 # FUTURE advertise 0.2rx once support is implemented
778 # FUTURE advertise minrx and mintx after consulting config option
779 # FUTURE advertise minrx and mintx after consulting config option
779 caps.append('httpmediatype=0.1rx,0.1tx,0.2tx')
780 caps.append('httpmediatype=0.1rx,0.1tx,0.2tx')
780
781
781 compengines = supportedcompengines(repo.ui, proto, util.SERVERROLE)
782 compengines = supportedcompengines(repo.ui, proto, util.SERVERROLE)
782 if compengines:
783 if compengines:
783 comptypes = ','.join(urlreq.quote(e.wireprotosupport().name)
784 comptypes = ','.join(urlreq.quote(e.wireprotosupport().name)
784 for e in compengines)
785 for e in compengines)
785 caps.append('compression=%s' % comptypes)
786 caps.append('compression=%s' % comptypes)
786
787
787 return caps
788 return caps
788
789
789 # If you are writing an extension and consider wrapping this function. Wrap
790 # If you are writing an extension and consider wrapping this function. Wrap
790 # `_capabilities` instead.
791 # `_capabilities` instead.
791 @wireprotocommand('capabilities')
792 @wireprotocommand('capabilities')
792 def capabilities(repo, proto):
793 def capabilities(repo, proto):
793 return ' '.join(_capabilities(repo, proto))
794 return ' '.join(_capabilities(repo, proto))
794
795
795 @wireprotocommand('changegroup', 'roots')
796 @wireprotocommand('changegroup', 'roots')
796 def changegroup(repo, proto, roots):
797 def changegroup(repo, proto, roots):
797 nodes = decodelist(roots)
798 nodes = decodelist(roots)
798 cg = changegroupmod.changegroup(repo, nodes, 'serve')
799 cg = changegroupmod.changegroup(repo, nodes, 'serve')
799 return streamres(reader=cg, v1compressible=True)
800 return streamres(reader=cg, v1compressible=True)
800
801
801 @wireprotocommand('changegroupsubset', 'bases heads')
802 @wireprotocommand('changegroupsubset', 'bases heads')
802 def changegroupsubset(repo, proto, bases, heads):
803 def changegroupsubset(repo, proto, bases, heads):
803 bases = decodelist(bases)
804 bases = decodelist(bases)
804 heads = decodelist(heads)
805 heads = decodelist(heads)
805 cg = changegroupmod.changegroupsubset(repo, bases, heads, 'serve')
806 cg = changegroupmod.changegroupsubset(repo, bases, heads, 'serve')
806 return streamres(reader=cg, v1compressible=True)
807 return streamres(reader=cg, v1compressible=True)
807
808
808 @wireprotocommand('debugwireargs', 'one two *')
809 @wireprotocommand('debugwireargs', 'one two *')
809 def debugwireargs(repo, proto, one, two, others):
810 def debugwireargs(repo, proto, one, two, others):
810 # only accept optional args from the known set
811 # only accept optional args from the known set
811 opts = options('debugwireargs', ['three', 'four'], others)
812 opts = options('debugwireargs', ['three', 'four'], others)
812 return repo.debugwireargs(one, two, **opts)
813 return repo.debugwireargs(one, two, **opts)
813
814
814 @wireprotocommand('getbundle', '*')
815 @wireprotocommand('getbundle', '*')
815 def getbundle(repo, proto, others):
816 def getbundle(repo, proto, others):
816 opts = options('getbundle', gboptsmap.keys(), others)
817 opts = options('getbundle', gboptsmap.keys(), others)
817 for k, v in opts.iteritems():
818 for k, v in opts.iteritems():
818 keytype = gboptsmap[k]
819 keytype = gboptsmap[k]
819 if keytype == 'nodes':
820 if keytype == 'nodes':
820 opts[k] = decodelist(v)
821 opts[k] = decodelist(v)
821 elif keytype == 'csv':
822 elif keytype == 'csv':
822 opts[k] = list(v.split(','))
823 opts[k] = list(v.split(','))
823 elif keytype == 'scsv':
824 elif keytype == 'scsv':
824 opts[k] = set(v.split(','))
825 opts[k] = set(v.split(','))
825 elif keytype == 'boolean':
826 elif keytype == 'boolean':
826 # Client should serialize False as '0', which is a non-empty string
827 # Client should serialize False as '0', which is a non-empty string
827 # so it evaluates as a True bool.
828 # so it evaluates as a True bool.
828 if v == '0':
829 if v == '0':
829 opts[k] = False
830 opts[k] = False
830 else:
831 else:
831 opts[k] = bool(v)
832 opts[k] = bool(v)
832 elif keytype != 'plain':
833 elif keytype != 'plain':
833 raise KeyError('unknown getbundle option type %s'
834 raise KeyError('unknown getbundle option type %s'
834 % keytype)
835 % keytype)
835
836
836 if not bundle1allowed(repo, 'pull'):
837 if not bundle1allowed(repo, 'pull'):
837 if not exchange.bundle2requested(opts.get('bundlecaps')):
838 if not exchange.bundle2requested(opts.get('bundlecaps')):
838 if proto.name == 'http':
839 if proto.name == 'http':
839 return ooberror(bundle2required)
840 return ooberror(bundle2required)
840 raise error.Abort(bundle2requiredmain,
841 raise error.Abort(bundle2requiredmain,
841 hint=bundle2requiredhint)
842 hint=bundle2requiredhint)
842
843
843 try:
844 try:
845 if repo.ui.configbool('server', 'disablefullbundle', False):
846 # Check to see if this is a full clone.
847 clheads = set(repo.changelog.heads())
848 heads = set(opts.get('heads', set()))
849 common = set(opts.get('common', set()))
850 common.discard(nullid)
851 if not common and clheads == heads:
852 raise error.Abort(
853 _('server has pull-based clones disabled'),
854 hint=_('remove --pull if specified or upgrade Mercurial'))
855
844 chunks = exchange.getbundlechunks(repo, 'serve', **opts)
856 chunks = exchange.getbundlechunks(repo, 'serve', **opts)
845 except error.Abort as exc:
857 except error.Abort as exc:
846 # cleanly forward Abort error to the client
858 # cleanly forward Abort error to the client
847 if not exchange.bundle2requested(opts.get('bundlecaps')):
859 if not exchange.bundle2requested(opts.get('bundlecaps')):
848 if proto.name == 'http':
860 if proto.name == 'http':
849 return ooberror(str(exc) + '\n')
861 return ooberror(str(exc) + '\n')
850 raise # cannot do better for bundle1 + ssh
862 raise # cannot do better for bundle1 + ssh
851 # bundle2 request expect a bundle2 reply
863 # bundle2 request expect a bundle2 reply
852 bundler = bundle2.bundle20(repo.ui)
864 bundler = bundle2.bundle20(repo.ui)
853 manargs = [('message', str(exc))]
865 manargs = [('message', str(exc))]
854 advargs = []
866 advargs = []
855 if exc.hint is not None:
867 if exc.hint is not None:
856 advargs.append(('hint', exc.hint))
868 advargs.append(('hint', exc.hint))
857 bundler.addpart(bundle2.bundlepart('error:abort',
869 bundler.addpart(bundle2.bundlepart('error:abort',
858 manargs, advargs))
870 manargs, advargs))
859 return streamres(gen=bundler.getchunks(), v1compressible=True)
871 return streamres(gen=bundler.getchunks(), v1compressible=True)
860 return streamres(gen=chunks, v1compressible=True)
872 return streamres(gen=chunks, v1compressible=True)
861
873
862 @wireprotocommand('heads')
874 @wireprotocommand('heads')
863 def heads(repo, proto):
875 def heads(repo, proto):
864 h = repo.heads()
876 h = repo.heads()
865 return encodelist(h) + "\n"
877 return encodelist(h) + "\n"
866
878
867 @wireprotocommand('hello')
879 @wireprotocommand('hello')
868 def hello(repo, proto):
880 def hello(repo, proto):
869 '''the hello command returns a set of lines describing various
881 '''the hello command returns a set of lines describing various
870 interesting things about the server, in an RFC822-like format.
882 interesting things about the server, in an RFC822-like format.
871 Currently the only one defined is "capabilities", which
883 Currently the only one defined is "capabilities", which
872 consists of a line in the form:
884 consists of a line in the form:
873
885
874 capabilities: space separated list of tokens
886 capabilities: space separated list of tokens
875 '''
887 '''
876 return "capabilities: %s\n" % (capabilities(repo, proto))
888 return "capabilities: %s\n" % (capabilities(repo, proto))
877
889
878 @wireprotocommand('listkeys', 'namespace')
890 @wireprotocommand('listkeys', 'namespace')
879 def listkeys(repo, proto, namespace):
891 def listkeys(repo, proto, namespace):
880 d = repo.listkeys(encoding.tolocal(namespace)).items()
892 d = repo.listkeys(encoding.tolocal(namespace)).items()
881 return pushkeymod.encodekeys(d)
893 return pushkeymod.encodekeys(d)
882
894
883 @wireprotocommand('lookup', 'key')
895 @wireprotocommand('lookup', 'key')
884 def lookup(repo, proto, key):
896 def lookup(repo, proto, key):
885 try:
897 try:
886 k = encoding.tolocal(key)
898 k = encoding.tolocal(key)
887 c = repo[k]
899 c = repo[k]
888 r = c.hex()
900 r = c.hex()
889 success = 1
901 success = 1
890 except Exception as inst:
902 except Exception as inst:
891 r = str(inst)
903 r = str(inst)
892 success = 0
904 success = 0
893 return "%s %s\n" % (success, r)
905 return "%s %s\n" % (success, r)
894
906
895 @wireprotocommand('known', 'nodes *')
907 @wireprotocommand('known', 'nodes *')
896 def known(repo, proto, nodes, others):
908 def known(repo, proto, nodes, others):
897 return ''.join(b and "1" or "0" for b in repo.known(decodelist(nodes)))
909 return ''.join(b and "1" or "0" for b in repo.known(decodelist(nodes)))
898
910
899 @wireprotocommand('pushkey', 'namespace key old new')
911 @wireprotocommand('pushkey', 'namespace key old new')
900 def pushkey(repo, proto, namespace, key, old, new):
912 def pushkey(repo, proto, namespace, key, old, new):
901 # compatibility with pre-1.8 clients which were accidentally
913 # compatibility with pre-1.8 clients which were accidentally
902 # sending raw binary nodes rather than utf-8-encoded hex
914 # sending raw binary nodes rather than utf-8-encoded hex
903 if len(new) == 20 and util.escapestr(new) != new:
915 if len(new) == 20 and util.escapestr(new) != new:
904 # looks like it could be a binary node
916 # looks like it could be a binary node
905 try:
917 try:
906 new.decode('utf-8')
918 new.decode('utf-8')
907 new = encoding.tolocal(new) # but cleanly decodes as UTF-8
919 new = encoding.tolocal(new) # but cleanly decodes as UTF-8
908 except UnicodeDecodeError:
920 except UnicodeDecodeError:
909 pass # binary, leave unmodified
921 pass # binary, leave unmodified
910 else:
922 else:
911 new = encoding.tolocal(new) # normal path
923 new = encoding.tolocal(new) # normal path
912
924
913 if util.safehasattr(proto, 'restore'):
925 if util.safehasattr(proto, 'restore'):
914
926
915 proto.redirect()
927 proto.redirect()
916
928
917 try:
929 try:
918 r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
930 r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
919 encoding.tolocal(old), new) or False
931 encoding.tolocal(old), new) or False
920 except error.Abort:
932 except error.Abort:
921 r = False
933 r = False
922
934
923 output = proto.restore()
935 output = proto.restore()
924
936
925 return '%s\n%s' % (int(r), output)
937 return '%s\n%s' % (int(r), output)
926
938
927 r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
939 r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
928 encoding.tolocal(old), new)
940 encoding.tolocal(old), new)
929 return '%s\n' % int(r)
941 return '%s\n' % int(r)
930
942
931 @wireprotocommand('stream_out')
943 @wireprotocommand('stream_out')
932 def stream(repo, proto):
944 def stream(repo, proto):
933 '''If the server supports streaming clone, it advertises the "stream"
945 '''If the server supports streaming clone, it advertises the "stream"
934 capability with a value representing the version and flags of the repo
946 capability with a value representing the version and flags of the repo
935 it is serving. Client checks to see if it understands the format.
947 it is serving. Client checks to see if it understands the format.
936 '''
948 '''
937 if not streamclone.allowservergeneration(repo.ui):
949 if not streamclone.allowservergeneration(repo.ui):
938 return '1\n'
950 return '1\n'
939
951
940 def getstream(it):
952 def getstream(it):
941 yield '0\n'
953 yield '0\n'
942 for chunk in it:
954 for chunk in it:
943 yield chunk
955 yield chunk
944
956
945 try:
957 try:
946 # LockError may be raised before the first result is yielded. Don't
958 # LockError may be raised before the first result is yielded. Don't
947 # emit output until we're sure we got the lock successfully.
959 # emit output until we're sure we got the lock successfully.
948 it = streamclone.generatev1wireproto(repo)
960 it = streamclone.generatev1wireproto(repo)
949 return streamres(gen=getstream(it))
961 return streamres(gen=getstream(it))
950 except error.LockError:
962 except error.LockError:
951 return '2\n'
963 return '2\n'
952
964
953 @wireprotocommand('unbundle', 'heads')
965 @wireprotocommand('unbundle', 'heads')
954 def unbundle(repo, proto, heads):
966 def unbundle(repo, proto, heads):
955 their_heads = decodelist(heads)
967 their_heads = decodelist(heads)
956
968
957 try:
969 try:
958 proto.redirect()
970 proto.redirect()
959
971
960 exchange.check_heads(repo, their_heads, 'preparing changes')
972 exchange.check_heads(repo, their_heads, 'preparing changes')
961
973
962 # write bundle data to temporary file because it can be big
974 # write bundle data to temporary file because it can be big
963 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
975 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
964 fp = os.fdopen(fd, pycompat.sysstr('wb+'))
976 fp = os.fdopen(fd, pycompat.sysstr('wb+'))
965 r = 0
977 r = 0
966 try:
978 try:
967 proto.getfile(fp)
979 proto.getfile(fp)
968 fp.seek(0)
980 fp.seek(0)
969 gen = exchange.readbundle(repo.ui, fp, None)
981 gen = exchange.readbundle(repo.ui, fp, None)
970 if (isinstance(gen, changegroupmod.cg1unpacker)
982 if (isinstance(gen, changegroupmod.cg1unpacker)
971 and not bundle1allowed(repo, 'push')):
983 and not bundle1allowed(repo, 'push')):
972 if proto.name == 'http':
984 if proto.name == 'http':
973 # need to special case http because stderr do not get to
985 # need to special case http because stderr do not get to
974 # the http client on failed push so we need to abuse some
986 # the http client on failed push so we need to abuse some
975 # other error type to make sure the message get to the
987 # other error type to make sure the message get to the
976 # user.
988 # user.
977 return ooberror(bundle2required)
989 return ooberror(bundle2required)
978 raise error.Abort(bundle2requiredmain,
990 raise error.Abort(bundle2requiredmain,
979 hint=bundle2requiredhint)
991 hint=bundle2requiredhint)
980
992
981 r = exchange.unbundle(repo, gen, their_heads, 'serve',
993 r = exchange.unbundle(repo, gen, their_heads, 'serve',
982 proto._client())
994 proto._client())
983 if util.safehasattr(r, 'addpart'):
995 if util.safehasattr(r, 'addpart'):
984 # The return looks streamable, we are in the bundle2 case and
996 # The return looks streamable, we are in the bundle2 case and
985 # should return a stream.
997 # should return a stream.
986 return streamres(gen=r.getchunks())
998 return streamres(gen=r.getchunks())
987 return pushres(r)
999 return pushres(r)
988
1000
989 finally:
1001 finally:
990 fp.close()
1002 fp.close()
991 os.unlink(tempname)
1003 os.unlink(tempname)
992
1004
993 except (error.BundleValueError, error.Abort, error.PushRaced) as exc:
1005 except (error.BundleValueError, error.Abort, error.PushRaced) as exc:
994 # handle non-bundle2 case first
1006 # handle non-bundle2 case first
995 if not getattr(exc, 'duringunbundle2', False):
1007 if not getattr(exc, 'duringunbundle2', False):
996 try:
1008 try:
997 raise
1009 raise
998 except error.Abort:
1010 except error.Abort:
999 # The old code we moved used util.stderr directly.
1011 # The old code we moved used util.stderr directly.
1000 # We did not change it to minimise code change.
1012 # We did not change it to minimise code change.
1001 # This need to be moved to something proper.
1013 # This need to be moved to something proper.
1002 # Feel free to do it.
1014 # Feel free to do it.
1003 util.stderr.write("abort: %s\n" % exc)
1015 util.stderr.write("abort: %s\n" % exc)
1004 if exc.hint is not None:
1016 if exc.hint is not None:
1005 util.stderr.write("(%s)\n" % exc.hint)
1017 util.stderr.write("(%s)\n" % exc.hint)
1006 return pushres(0)
1018 return pushres(0)
1007 except error.PushRaced:
1019 except error.PushRaced:
1008 return pusherr(str(exc))
1020 return pusherr(str(exc))
1009
1021
1010 bundler = bundle2.bundle20(repo.ui)
1022 bundler = bundle2.bundle20(repo.ui)
1011 for out in getattr(exc, '_bundle2salvagedoutput', ()):
1023 for out in getattr(exc, '_bundle2salvagedoutput', ()):
1012 bundler.addpart(out)
1024 bundler.addpart(out)
1013 try:
1025 try:
1014 try:
1026 try:
1015 raise
1027 raise
1016 except error.PushkeyFailed as exc:
1028 except error.PushkeyFailed as exc:
1017 # check client caps
1029 # check client caps
1018 remotecaps = getattr(exc, '_replycaps', None)
1030 remotecaps = getattr(exc, '_replycaps', None)
1019 if (remotecaps is not None
1031 if (remotecaps is not None
1020 and 'pushkey' not in remotecaps.get('error', ())):
1032 and 'pushkey' not in remotecaps.get('error', ())):
1021 # no support remote side, fallback to Abort handler.
1033 # no support remote side, fallback to Abort handler.
1022 raise
1034 raise
1023 part = bundler.newpart('error:pushkey')
1035 part = bundler.newpart('error:pushkey')
1024 part.addparam('in-reply-to', exc.partid)
1036 part.addparam('in-reply-to', exc.partid)
1025 if exc.namespace is not None:
1037 if exc.namespace is not None:
1026 part.addparam('namespace', exc.namespace, mandatory=False)
1038 part.addparam('namespace', exc.namespace, mandatory=False)
1027 if exc.key is not None:
1039 if exc.key is not None:
1028 part.addparam('key', exc.key, mandatory=False)
1040 part.addparam('key', exc.key, mandatory=False)
1029 if exc.new is not None:
1041 if exc.new is not None:
1030 part.addparam('new', exc.new, mandatory=False)
1042 part.addparam('new', exc.new, mandatory=False)
1031 if exc.old is not None:
1043 if exc.old is not None:
1032 part.addparam('old', exc.old, mandatory=False)
1044 part.addparam('old', exc.old, mandatory=False)
1033 if exc.ret is not None:
1045 if exc.ret is not None:
1034 part.addparam('ret', exc.ret, mandatory=False)
1046 part.addparam('ret', exc.ret, mandatory=False)
1035 except error.BundleValueError as exc:
1047 except error.BundleValueError as exc:
1036 errpart = bundler.newpart('error:unsupportedcontent')
1048 errpart = bundler.newpart('error:unsupportedcontent')
1037 if exc.parttype is not None:
1049 if exc.parttype is not None:
1038 errpart.addparam('parttype', exc.parttype)
1050 errpart.addparam('parttype', exc.parttype)
1039 if exc.params:
1051 if exc.params:
1040 errpart.addparam('params', '\0'.join(exc.params))
1052 errpart.addparam('params', '\0'.join(exc.params))
1041 except error.Abort as exc:
1053 except error.Abort as exc:
1042 manargs = [('message', str(exc))]
1054 manargs = [('message', str(exc))]
1043 advargs = []
1055 advargs = []
1044 if exc.hint is not None:
1056 if exc.hint is not None:
1045 advargs.append(('hint', exc.hint))
1057 advargs.append(('hint', exc.hint))
1046 bundler.addpart(bundle2.bundlepart('error:abort',
1058 bundler.addpart(bundle2.bundlepart('error:abort',
1047 manargs, advargs))
1059 manargs, advargs))
1048 except error.PushRaced as exc:
1060 except error.PushRaced as exc:
1049 bundler.newpart('error:pushraced', [('message', str(exc))])
1061 bundler.newpart('error:pushraced', [('message', str(exc))])
1050 return streamres(gen=bundler.getchunks())
1062 return streamres(gen=bundler.getchunks())
@@ -1,367 +1,405
1 #require serve
1 #require serve
2
2
3 This test is a duplicate of 'test-http.t', feel free to factor out
3 This test is a duplicate of 'test-http.t', feel free to factor out
4 parts that are not bundle1/bundle2 specific.
4 parts that are not bundle1/bundle2 specific.
5
5
6 $ cat << EOF >> $HGRCPATH
6 $ cat << EOF >> $HGRCPATH
7 > [devel]
7 > [devel]
8 > # This test is dedicated to interaction through old bundle
8 > # This test is dedicated to interaction through old bundle
9 > legacy.exchange = bundle1
9 > legacy.exchange = bundle1
10 > EOF
10 > EOF
11
11
12 $ hg init test
12 $ hg init test
13 $ cd test
13 $ cd test
14 $ echo foo>foo
14 $ echo foo>foo
15 $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
15 $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
16 $ echo foo>foo.d/foo
16 $ echo foo>foo.d/foo
17 $ echo bar>foo.d/bAr.hg.d/BaR
17 $ echo bar>foo.d/bAr.hg.d/BaR
18 $ echo bar>foo.d/baR.d.hg/bAR
18 $ echo bar>foo.d/baR.d.hg/bAR
19 $ hg commit -A -m 1
19 $ hg commit -A -m 1
20 adding foo
20 adding foo
21 adding foo.d/bAr.hg.d/BaR
21 adding foo.d/bAr.hg.d/BaR
22 adding foo.d/baR.d.hg/bAR
22 adding foo.d/baR.d.hg/bAR
23 adding foo.d/foo
23 adding foo.d/foo
24 $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
24 $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
25 $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
25 $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
26
26
27 Test server address cannot be reused
27 Test server address cannot be reused
28
28
29 #if windows
29 #if windows
30 $ hg serve -p $HGPORT1 2>&1
30 $ hg serve -p $HGPORT1 2>&1
31 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
31 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
32 [255]
32 [255]
33 #else
33 #else
34 $ hg serve -p $HGPORT1 2>&1
34 $ hg serve -p $HGPORT1 2>&1
35 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
35 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
36 [255]
36 [255]
37 #endif
37 #endif
38 $ cd ..
38 $ cd ..
39 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
39 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
40
40
41 clone via stream
41 clone via stream
42
42
43 $ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1
43 $ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1
44 streaming all changes
44 streaming all changes
45 6 files to transfer, 606 bytes of data
45 6 files to transfer, 606 bytes of data
46 transferred * bytes in * seconds (*/sec) (glob)
46 transferred * bytes in * seconds (*/sec) (glob)
47 searching for changes
47 searching for changes
48 no changes found
48 no changes found
49 updating to branch default
49 updating to branch default
50 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 $ hg verify -R copy
51 $ hg verify -R copy
52 checking changesets
52 checking changesets
53 checking manifests
53 checking manifests
54 crosschecking files in changesets and manifests
54 crosschecking files in changesets and manifests
55 checking files
55 checking files
56 4 files, 1 changesets, 4 total revisions
56 4 files, 1 changesets, 4 total revisions
57
57
58 try to clone via stream, should use pull instead
58 try to clone via stream, should use pull instead
59
59
60 $ hg clone --uncompressed http://localhost:$HGPORT1/ copy2
60 $ hg clone --uncompressed http://localhost:$HGPORT1/ copy2
61 warning: stream clone requested but server has them disabled
61 warning: stream clone requested but server has them disabled
62 requesting all changes
62 requesting all changes
63 adding changesets
63 adding changesets
64 adding manifests
64 adding manifests
65 adding file changes
65 adding file changes
66 added 1 changesets with 4 changes to 4 files
66 added 1 changesets with 4 changes to 4 files
67 updating to branch default
67 updating to branch default
68 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
68 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
69
69
70 try to clone via stream but missing requirements, so should use pull instead
70 try to clone via stream but missing requirements, so should use pull instead
71
71
72 $ cat > $TESTTMP/removesupportedformat.py << EOF
72 $ cat > $TESTTMP/removesupportedformat.py << EOF
73 > from mercurial import localrepo
73 > from mercurial import localrepo
74 > def extsetup(ui):
74 > def extsetup(ui):
75 > localrepo.localrepository.supportedformats.remove('generaldelta')
75 > localrepo.localrepository.supportedformats.remove('generaldelta')
76 > EOF
76 > EOF
77
77
78 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3
78 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3
79 warning: stream clone requested but client is missing requirements: generaldelta
79 warning: stream clone requested but client is missing requirements: generaldelta
80 (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
80 (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
81 requesting all changes
81 requesting all changes
82 adding changesets
82 adding changesets
83 adding manifests
83 adding manifests
84 adding file changes
84 adding file changes
85 added 1 changesets with 4 changes to 4 files
85 added 1 changesets with 4 changes to 4 files
86 updating to branch default
86 updating to branch default
87 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
88
88
89 clone via pull
89 clone via pull
90
90
91 $ hg clone http://localhost:$HGPORT1/ copy-pull
91 $ hg clone http://localhost:$HGPORT1/ copy-pull
92 requesting all changes
92 requesting all changes
93 adding changesets
93 adding changesets
94 adding manifests
94 adding manifests
95 adding file changes
95 adding file changes
96 added 1 changesets with 4 changes to 4 files
96 added 1 changesets with 4 changes to 4 files
97 updating to branch default
97 updating to branch default
98 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
98 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
99 $ hg verify -R copy-pull
99 $ hg verify -R copy-pull
100 checking changesets
100 checking changesets
101 checking manifests
101 checking manifests
102 crosschecking files in changesets and manifests
102 crosschecking files in changesets and manifests
103 checking files
103 checking files
104 4 files, 1 changesets, 4 total revisions
104 4 files, 1 changesets, 4 total revisions
105 $ cd test
105 $ cd test
106 $ echo bar > bar
106 $ echo bar > bar
107 $ hg commit -A -d '1 0' -m 2
107 $ hg commit -A -d '1 0' -m 2
108 adding bar
108 adding bar
109 $ cd ..
109 $ cd ..
110
110
111 clone over http with --update
111 clone over http with --update
112
112
113 $ hg clone http://localhost:$HGPORT1/ updated --update 0
113 $ hg clone http://localhost:$HGPORT1/ updated --update 0
114 requesting all changes
114 requesting all changes
115 adding changesets
115 adding changesets
116 adding manifests
116 adding manifests
117 adding file changes
117 adding file changes
118 added 2 changesets with 5 changes to 5 files
118 added 2 changesets with 5 changes to 5 files
119 updating to branch default
119 updating to branch default
120 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
120 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
121 $ hg log -r . -R updated
121 $ hg log -r . -R updated
122 changeset: 0:8b6053c928fe
122 changeset: 0:8b6053c928fe
123 user: test
123 user: test
124 date: Thu Jan 01 00:00:00 1970 +0000
124 date: Thu Jan 01 00:00:00 1970 +0000
125 summary: 1
125 summary: 1
126
126
127 $ rm -rf updated
127 $ rm -rf updated
128
128
129 incoming via HTTP
129 incoming via HTTP
130
130
131 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
131 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
132 adding changesets
132 adding changesets
133 adding manifests
133 adding manifests
134 adding file changes
134 adding file changes
135 added 1 changesets with 4 changes to 4 files
135 added 1 changesets with 4 changes to 4 files
136 updating to branch default
136 updating to branch default
137 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
137 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
138 $ cd partial
138 $ cd partial
139 $ touch LOCAL
139 $ touch LOCAL
140 $ hg ci -qAm LOCAL
140 $ hg ci -qAm LOCAL
141 $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
141 $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
142 comparing with http://localhost:$HGPORT1/
142 comparing with http://localhost:$HGPORT1/
143 searching for changes
143 searching for changes
144 2
144 2
145 $ cd ..
145 $ cd ..
146
146
147 pull
147 pull
148
148
149 $ cd copy-pull
149 $ cd copy-pull
150 $ cat >> .hg/hgrc <<EOF
150 $ cat >> .hg/hgrc <<EOF
151 > [hooks]
151 > [hooks]
152 > changegroup = sh -c "printenv.py changegroup"
152 > changegroup = sh -c "printenv.py changegroup"
153 > EOF
153 > EOF
154 $ hg pull
154 $ hg pull
155 pulling from http://localhost:$HGPORT1/
155 pulling from http://localhost:$HGPORT1/
156 searching for changes
156 searching for changes
157 adding changesets
157 adding changesets
158 adding manifests
158 adding manifests
159 adding file changes
159 adding file changes
160 added 1 changesets with 1 changes to 1 files
160 added 1 changesets with 1 changes to 1 files
161 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
161 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
162 (run 'hg update' to get a working copy)
162 (run 'hg update' to get a working copy)
163 $ cd ..
163 $ cd ..
164
164
165 clone from invalid URL
165 clone from invalid URL
166
166
167 $ hg clone http://localhost:$HGPORT/bad
167 $ hg clone http://localhost:$HGPORT/bad
168 abort: HTTP Error 404: Not Found
168 abort: HTTP Error 404: Not Found
169 [255]
169 [255]
170
170
171 test http authentication
171 test http authentication
172 + use the same server to test server side streaming preference
172 + use the same server to test server side streaming preference
173
173
174 $ cd test
174 $ cd test
175 $ cat << EOT > userpass.py
175 $ cat << EOT > userpass.py
176 > import base64
176 > import base64
177 > from mercurial.hgweb import common
177 > from mercurial.hgweb import common
178 > def perform_authentication(hgweb, req, op):
178 > def perform_authentication(hgweb, req, op):
179 > auth = req.env.get('HTTP_AUTHORIZATION')
179 > auth = req.env.get('HTTP_AUTHORIZATION')
180 > if not auth:
180 > if not auth:
181 > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who',
181 > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who',
182 > [('WWW-Authenticate', 'Basic Realm="mercurial"')])
182 > [('WWW-Authenticate', 'Basic Realm="mercurial"')])
183 > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']:
183 > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']:
184 > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no')
184 > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no')
185 > def extsetup():
185 > def extsetup():
186 > common.permhooks.insert(0, perform_authentication)
186 > common.permhooks.insert(0, perform_authentication)
187 > EOT
187 > EOT
188 $ hg serve --config extensions.x=userpass.py -p $HGPORT2 -d --pid-file=pid \
188 $ hg serve --config extensions.x=userpass.py -p $HGPORT2 -d --pid-file=pid \
189 > --config server.preferuncompressed=True \
189 > --config server.preferuncompressed=True \
190 > --config web.push_ssl=False --config web.allow_push=* -A ../access.log
190 > --config web.push_ssl=False --config web.allow_push=* -A ../access.log
191 $ cat pid >> $DAEMON_PIDS
191 $ cat pid >> $DAEMON_PIDS
192
192
193 $ cat << EOF > get_pass.py
193 $ cat << EOF > get_pass.py
194 > import getpass
194 > import getpass
195 > def newgetpass(arg):
195 > def newgetpass(arg):
196 > return "pass"
196 > return "pass"
197 > getpass.getpass = newgetpass
197 > getpass.getpass = newgetpass
198 > EOF
198 > EOF
199
199
200 $ hg id http://localhost:$HGPORT2/
200 $ hg id http://localhost:$HGPORT2/
201 abort: http authorization required for http://localhost:$HGPORT2/
201 abort: http authorization required for http://localhost:$HGPORT2/
202 [255]
202 [255]
203 $ hg id http://localhost:$HGPORT2/
203 $ hg id http://localhost:$HGPORT2/
204 abort: http authorization required for http://localhost:$HGPORT2/
204 abort: http authorization required for http://localhost:$HGPORT2/
205 [255]
205 [255]
206 $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
206 $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
207 http authorization required for http://localhost:$HGPORT2/
207 http authorization required for http://localhost:$HGPORT2/
208 realm: mercurial
208 realm: mercurial
209 user: user
209 user: user
210 password: 5fed3813f7f5
210 password: 5fed3813f7f5
211 $ hg id http://user:pass@localhost:$HGPORT2/
211 $ hg id http://user:pass@localhost:$HGPORT2/
212 5fed3813f7f5
212 5fed3813f7f5
213 $ echo '[auth]' >> .hg/hgrc
213 $ echo '[auth]' >> .hg/hgrc
214 $ echo 'l.schemes=http' >> .hg/hgrc
214 $ echo 'l.schemes=http' >> .hg/hgrc
215 $ echo 'l.prefix=lo' >> .hg/hgrc
215 $ echo 'l.prefix=lo' >> .hg/hgrc
216 $ echo 'l.username=user' >> .hg/hgrc
216 $ echo 'l.username=user' >> .hg/hgrc
217 $ echo 'l.password=pass' >> .hg/hgrc
217 $ echo 'l.password=pass' >> .hg/hgrc
218 $ hg id http://localhost:$HGPORT2/
218 $ hg id http://localhost:$HGPORT2/
219 5fed3813f7f5
219 5fed3813f7f5
220 $ hg id http://localhost:$HGPORT2/
220 $ hg id http://localhost:$HGPORT2/
221 5fed3813f7f5
221 5fed3813f7f5
222 $ hg id http://user@localhost:$HGPORT2/
222 $ hg id http://user@localhost:$HGPORT2/
223 5fed3813f7f5
223 5fed3813f7f5
224 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
224 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
225 streaming all changes
225 streaming all changes
226 7 files to transfer, 916 bytes of data
226 7 files to transfer, 916 bytes of data
227 transferred * bytes in * seconds (*/sec) (glob)
227 transferred * bytes in * seconds (*/sec) (glob)
228 searching for changes
228 searching for changes
229 no changes found
229 no changes found
230 updating to branch default
230 updating to branch default
231 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
231 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
232 --pull should override server's preferuncompressed
232 --pull should override server's preferuncompressed
233 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
233 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
234 requesting all changes
234 requesting all changes
235 adding changesets
235 adding changesets
236 adding manifests
236 adding manifests
237 adding file changes
237 adding file changes
238 added 2 changesets with 5 changes to 5 files
238 added 2 changesets with 5 changes to 5 files
239 updating to branch default
239 updating to branch default
240 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
240 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
241
241
242 $ hg id http://user2@localhost:$HGPORT2/
242 $ hg id http://user2@localhost:$HGPORT2/
243 abort: http authorization required for http://localhost:$HGPORT2/
243 abort: http authorization required for http://localhost:$HGPORT2/
244 [255]
244 [255]
245 $ hg id http://user:pass2@localhost:$HGPORT2/
245 $ hg id http://user:pass2@localhost:$HGPORT2/
246 abort: HTTP Error 403: no
246 abort: HTTP Error 403: no
247 [255]
247 [255]
248
248
249 $ hg -R dest tag -r tip top
249 $ hg -R dest tag -r tip top
250 $ hg -R dest push http://user:pass@localhost:$HGPORT2/
250 $ hg -R dest push http://user:pass@localhost:$HGPORT2/
251 pushing to http://user:***@localhost:$HGPORT2/
251 pushing to http://user:***@localhost:$HGPORT2/
252 searching for changes
252 searching for changes
253 remote: adding changesets
253 remote: adding changesets
254 remote: adding manifests
254 remote: adding manifests
255 remote: adding file changes
255 remote: adding file changes
256 remote: added 1 changesets with 1 changes to 1 files
256 remote: added 1 changesets with 1 changes to 1 files
257 $ hg rollback -q
257 $ hg rollback -q
258
258
259 $ sed 's/.*] "/"/' < ../access.log
259 $ sed 's/.*] "/"/' < ../access.log
260 "GET /?cmd=capabilities HTTP/1.1" 200 -
260 "GET /?cmd=capabilities HTTP/1.1" 200 -
261 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
261 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
262 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
262 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
263 "GET /?cmd=capabilities HTTP/1.1" 200 -
263 "GET /?cmd=capabilities HTTP/1.1" 200 -
264 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
264 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
265 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
265 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
266 "GET /?cmd=capabilities HTTP/1.1" 200 -
266 "GET /?cmd=capabilities HTTP/1.1" 200 -
267 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
267 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
268 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
268 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
269 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
269 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
270 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
270 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
271 "GET /?cmd=capabilities HTTP/1.1" 200 -
271 "GET /?cmd=capabilities HTTP/1.1" 200 -
272 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
272 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
273 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
273 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
274 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
274 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
275 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
275 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
276 "GET /?cmd=capabilities HTTP/1.1" 200 -
276 "GET /?cmd=capabilities HTTP/1.1" 200 -
277 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
277 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
278 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
278 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
279 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
279 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
280 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
280 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
281 "GET /?cmd=capabilities HTTP/1.1" 200 -
281 "GET /?cmd=capabilities HTTP/1.1" 200 -
282 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
282 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
283 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
283 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
284 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
284 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
285 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
285 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
286 "GET /?cmd=capabilities HTTP/1.1" 200 -
286 "GET /?cmd=capabilities HTTP/1.1" 200 -
287 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
287 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
288 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
288 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
289 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
289 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
290 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
290 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
291 "GET /?cmd=capabilities HTTP/1.1" 200 -
291 "GET /?cmd=capabilities HTTP/1.1" 200 -
292 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
292 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
293 "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
293 "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
294 "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
294 "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
295 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
295 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
296 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
296 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
297 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
297 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
298 "GET /?cmd=capabilities HTTP/1.1" 200 -
298 "GET /?cmd=capabilities HTTP/1.1" 200 -
299 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
299 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
300 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
300 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
301 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
301 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
302 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
302 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
303 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
303 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
304 "GET /?cmd=capabilities HTTP/1.1" 200 -
304 "GET /?cmd=capabilities HTTP/1.1" 200 -
305 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
305 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
306 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
306 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
307 "GET /?cmd=capabilities HTTP/1.1" 200 -
307 "GET /?cmd=capabilities HTTP/1.1" 200 -
308 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
308 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
309 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
309 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
310 "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
310 "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
311 "GET /?cmd=capabilities HTTP/1.1" 200 -
311 "GET /?cmd=capabilities HTTP/1.1" 200 -
312 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
312 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
313 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
313 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
314 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
314 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
315 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
315 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
316 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
316 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
317 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
317 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
318 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
318 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
319 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)
319 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)
320 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
320 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
321
321
322 $ cd ..
322 $ cd ..
323
323
324 clone of serve with repo in root and unserved subrepo (issue2970)
324 clone of serve with repo in root and unserved subrepo (issue2970)
325
325
326 $ hg --cwd test init sub
326 $ hg --cwd test init sub
327 $ echo empty > test/sub/empty
327 $ echo empty > test/sub/empty
328 $ hg --cwd test/sub add empty
328 $ hg --cwd test/sub add empty
329 $ hg --cwd test/sub commit -qm 'add empty'
329 $ hg --cwd test/sub commit -qm 'add empty'
330 $ hg --cwd test/sub tag -r 0 something
330 $ hg --cwd test/sub tag -r 0 something
331 $ echo sub = sub > test/.hgsub
331 $ echo sub = sub > test/.hgsub
332 $ hg --cwd test add .hgsub
332 $ hg --cwd test add .hgsub
333 $ hg --cwd test commit -qm 'add subrepo'
333 $ hg --cwd test commit -qm 'add subrepo'
334 $ hg clone http://localhost:$HGPORT noslash-clone
334 $ hg clone http://localhost:$HGPORT noslash-clone
335 requesting all changes
335 requesting all changes
336 adding changesets
336 adding changesets
337 adding manifests
337 adding manifests
338 adding file changes
338 adding file changes
339 added 3 changesets with 7 changes to 7 files
339 added 3 changesets with 7 changes to 7 files
340 updating to branch default
340 updating to branch default
341 abort: HTTP Error 404: Not Found
341 abort: HTTP Error 404: Not Found
342 [255]
342 [255]
343 $ hg clone http://localhost:$HGPORT/ slash-clone
343 $ hg clone http://localhost:$HGPORT/ slash-clone
344 requesting all changes
344 requesting all changes
345 adding changesets
345 adding changesets
346 adding manifests
346 adding manifests
347 adding file changes
347 adding file changes
348 added 3 changesets with 7 changes to 7 files
348 added 3 changesets with 7 changes to 7 files
349 updating to branch default
349 updating to branch default
350 abort: HTTP Error 404: Not Found
350 abort: HTTP Error 404: Not Found
351 [255]
351 [255]
352
352
353 check error log
353 check error log
354
354
355 $ cat error.log
355 $ cat error.log
356
356
357 Check error reporting while pulling/cloning
357 Check error reporting while pulling/cloning
358
358
359 $ $RUNTESTDIR/killdaemons.py
359 $ $RUNTESTDIR/killdaemons.py
360 $ hg -R test serve -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
360 $ hg -R test serve -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
361 $ cat hg3.pid >> $DAEMON_PIDS
361 $ cat hg3.pid >> $DAEMON_PIDS
362 $ hg clone http://localhost:$HGPORT/ abort-clone
362 $ hg clone http://localhost:$HGPORT/ abort-clone
363 requesting all changes
363 requesting all changes
364 abort: remote error:
364 abort: remote error:
365 this is an exercise
365 this is an exercise
366 [255]
366 [255]
367 $ cat error.log
367 $ cat error.log
368
369 disable pull-based clones
370
371 $ hg -R test serve -p $HGPORT1 -d --pid-file=hg4.pid -E error.log --config server.disablefullbundle=True
372 $ cat hg4.pid >> $DAEMON_PIDS
373 $ hg clone http://localhost:$HGPORT1/ disable-pull-clone
374 requesting all changes
375 abort: remote error:
376 server has pull-based clones disabled
377 [255]
378
379 ... but keep stream clones working
380
381 $ hg clone --uncompressed --noupdate http://localhost:$HGPORT1/ test-stream-clone
382 streaming all changes
383 * files to transfer, * of data (glob)
384 transferred * in * seconds (* KB/sec) (glob)
385 searching for changes
386 no changes found
387
388 ... and also keep partial clones and pulls working
389 $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone
390 adding changesets
391 adding manifests
392 adding file changes
393 added 1 changesets with 4 changes to 4 files
394 updating to branch default
395 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
396 $ hg pull -R test-partial-clone
397 pulling from http://localhost:$HGPORT1/
398 searching for changes
399 adding changesets
400 adding manifests
401 adding file changes
402 added 2 changesets with 3 changes to 3 files
403 (run 'hg update' to get a working copy)
404
405 $ cat error.log
@@ -1,416 +1,454
1 #require killdaemons serve
1 #require killdaemons serve
2
2
3 $ hg init test
3 $ hg init test
4 $ cd test
4 $ cd test
5 $ echo foo>foo
5 $ echo foo>foo
6 $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
6 $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
7 $ echo foo>foo.d/foo
7 $ echo foo>foo.d/foo
8 $ echo bar>foo.d/bAr.hg.d/BaR
8 $ echo bar>foo.d/bAr.hg.d/BaR
9 $ echo bar>foo.d/baR.d.hg/bAR
9 $ echo bar>foo.d/baR.d.hg/bAR
10 $ hg commit -A -m 1
10 $ hg commit -A -m 1
11 adding foo
11 adding foo
12 adding foo.d/bAr.hg.d/BaR
12 adding foo.d/bAr.hg.d/BaR
13 adding foo.d/baR.d.hg/bAR
13 adding foo.d/baR.d.hg/bAR
14 adding foo.d/foo
14 adding foo.d/foo
15 $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
15 $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
16 $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
16 $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
17
17
18 Test server address cannot be reused
18 Test server address cannot be reused
19
19
20 #if windows
20 #if windows
21 $ hg serve -p $HGPORT1 2>&1
21 $ hg serve -p $HGPORT1 2>&1
22 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
22 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
23 [255]
23 [255]
24 #else
24 #else
25 $ hg serve -p $HGPORT1 2>&1
25 $ hg serve -p $HGPORT1 2>&1
26 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
26 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
27 [255]
27 [255]
28 #endif
28 #endif
29 $ cd ..
29 $ cd ..
30 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
30 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
31
31
32 clone via stream
32 clone via stream
33
33
34 $ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1
34 $ hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1
35 streaming all changes
35 streaming all changes
36 6 files to transfer, 606 bytes of data
36 6 files to transfer, 606 bytes of data
37 transferred * bytes in * seconds (*/sec) (glob)
37 transferred * bytes in * seconds (*/sec) (glob)
38 searching for changes
38 searching for changes
39 no changes found
39 no changes found
40 updating to branch default
40 updating to branch default
41 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 $ hg verify -R copy
42 $ hg verify -R copy
43 checking changesets
43 checking changesets
44 checking manifests
44 checking manifests
45 crosschecking files in changesets and manifests
45 crosschecking files in changesets and manifests
46 checking files
46 checking files
47 4 files, 1 changesets, 4 total revisions
47 4 files, 1 changesets, 4 total revisions
48
48
49 try to clone via stream, should use pull instead
49 try to clone via stream, should use pull instead
50
50
51 $ hg clone --uncompressed http://localhost:$HGPORT1/ copy2
51 $ hg clone --uncompressed http://localhost:$HGPORT1/ copy2
52 warning: stream clone requested but server has them disabled
52 warning: stream clone requested but server has them disabled
53 requesting all changes
53 requesting all changes
54 adding changesets
54 adding changesets
55 adding manifests
55 adding manifests
56 adding file changes
56 adding file changes
57 added 1 changesets with 4 changes to 4 files
57 added 1 changesets with 4 changes to 4 files
58 updating to branch default
58 updating to branch default
59 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
60
60
61 try to clone via stream but missing requirements, so should use pull instead
61 try to clone via stream but missing requirements, so should use pull instead
62
62
63 $ cat > $TESTTMP/removesupportedformat.py << EOF
63 $ cat > $TESTTMP/removesupportedformat.py << EOF
64 > from mercurial import localrepo
64 > from mercurial import localrepo
65 > def extsetup(ui):
65 > def extsetup(ui):
66 > localrepo.localrepository.supportedformats.remove('generaldelta')
66 > localrepo.localrepository.supportedformats.remove('generaldelta')
67 > EOF
67 > EOF
68
68
69 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3
69 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --uncompressed http://localhost:$HGPORT/ copy3
70 warning: stream clone requested but client is missing requirements: generaldelta
70 warning: stream clone requested but client is missing requirements: generaldelta
71 (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
71 (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
72 requesting all changes
72 requesting all changes
73 adding changesets
73 adding changesets
74 adding manifests
74 adding manifests
75 adding file changes
75 adding file changes
76 added 1 changesets with 4 changes to 4 files
76 added 1 changesets with 4 changes to 4 files
77 updating to branch default
77 updating to branch default
78 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
79
79
80 clone via pull
80 clone via pull
81
81
82 $ hg clone http://localhost:$HGPORT1/ copy-pull
82 $ hg clone http://localhost:$HGPORT1/ copy-pull
83 requesting all changes
83 requesting all changes
84 adding changesets
84 adding changesets
85 adding manifests
85 adding manifests
86 adding file changes
86 adding file changes
87 added 1 changesets with 4 changes to 4 files
87 added 1 changesets with 4 changes to 4 files
88 updating to branch default
88 updating to branch default
89 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 $ hg verify -R copy-pull
90 $ hg verify -R copy-pull
91 checking changesets
91 checking changesets
92 checking manifests
92 checking manifests
93 crosschecking files in changesets and manifests
93 crosschecking files in changesets and manifests
94 checking files
94 checking files
95 4 files, 1 changesets, 4 total revisions
95 4 files, 1 changesets, 4 total revisions
96 $ cd test
96 $ cd test
97 $ echo bar > bar
97 $ echo bar > bar
98 $ hg commit -A -d '1 0' -m 2
98 $ hg commit -A -d '1 0' -m 2
99 adding bar
99 adding bar
100 $ cd ..
100 $ cd ..
101
101
102 clone over http with --update
102 clone over http with --update
103
103
104 $ hg clone http://localhost:$HGPORT1/ updated --update 0
104 $ hg clone http://localhost:$HGPORT1/ updated --update 0
105 requesting all changes
105 requesting all changes
106 adding changesets
106 adding changesets
107 adding manifests
107 adding manifests
108 adding file changes
108 adding file changes
109 added 2 changesets with 5 changes to 5 files
109 added 2 changesets with 5 changes to 5 files
110 updating to branch default
110 updating to branch default
111 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
111 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
112 $ hg log -r . -R updated
112 $ hg log -r . -R updated
113 changeset: 0:8b6053c928fe
113 changeset: 0:8b6053c928fe
114 user: test
114 user: test
115 date: Thu Jan 01 00:00:00 1970 +0000
115 date: Thu Jan 01 00:00:00 1970 +0000
116 summary: 1
116 summary: 1
117
117
118 $ rm -rf updated
118 $ rm -rf updated
119
119
120 incoming via HTTP
120 incoming via HTTP
121
121
122 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
122 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
123 adding changesets
123 adding changesets
124 adding manifests
124 adding manifests
125 adding file changes
125 adding file changes
126 added 1 changesets with 4 changes to 4 files
126 added 1 changesets with 4 changes to 4 files
127 updating to branch default
127 updating to branch default
128 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
128 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
129 $ cd partial
129 $ cd partial
130 $ touch LOCAL
130 $ touch LOCAL
131 $ hg ci -qAm LOCAL
131 $ hg ci -qAm LOCAL
132 $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
132 $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
133 comparing with http://localhost:$HGPORT1/
133 comparing with http://localhost:$HGPORT1/
134 searching for changes
134 searching for changes
135 2
135 2
136 $ cd ..
136 $ cd ..
137
137
138 pull
138 pull
139
139
140 $ cd copy-pull
140 $ cd copy-pull
141 $ cat >> .hg/hgrc <<EOF
141 $ cat >> .hg/hgrc <<EOF
142 > [hooks]
142 > [hooks]
143 > changegroup = sh -c "printenv.py changegroup"
143 > changegroup = sh -c "printenv.py changegroup"
144 > EOF
144 > EOF
145 $ hg pull
145 $ hg pull
146 pulling from http://localhost:$HGPORT1/
146 pulling from http://localhost:$HGPORT1/
147 searching for changes
147 searching for changes
148 adding changesets
148 adding changesets
149 adding manifests
149 adding manifests
150 adding file changes
150 adding file changes
151 added 1 changesets with 1 changes to 1 files
151 added 1 changesets with 1 changes to 1 files
152 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
152 changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
153 (run 'hg update' to get a working copy)
153 (run 'hg update' to get a working copy)
154 $ cd ..
154 $ cd ..
155
155
156 clone from invalid URL
156 clone from invalid URL
157
157
158 $ hg clone http://localhost:$HGPORT/bad
158 $ hg clone http://localhost:$HGPORT/bad
159 abort: HTTP Error 404: Not Found
159 abort: HTTP Error 404: Not Found
160 [255]
160 [255]
161
161
162 test http authentication
162 test http authentication
163 + use the same server to test server side streaming preference
163 + use the same server to test server side streaming preference
164
164
165 $ cd test
165 $ cd test
166 $ cat << EOT > userpass.py
166 $ cat << EOT > userpass.py
167 > import base64
167 > import base64
168 > from mercurial.hgweb import common
168 > from mercurial.hgweb import common
169 > def perform_authentication(hgweb, req, op):
169 > def perform_authentication(hgweb, req, op):
170 > auth = req.env.get('HTTP_AUTHORIZATION')
170 > auth = req.env.get('HTTP_AUTHORIZATION')
171 > if not auth:
171 > if not auth:
172 > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who',
172 > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who',
173 > [('WWW-Authenticate', 'Basic Realm="mercurial"')])
173 > [('WWW-Authenticate', 'Basic Realm="mercurial"')])
174 > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']:
174 > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']:
175 > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no')
175 > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no')
176 > def extsetup():
176 > def extsetup():
177 > common.permhooks.insert(0, perform_authentication)
177 > common.permhooks.insert(0, perform_authentication)
178 > EOT
178 > EOT
179 $ hg serve --config extensions.x=userpass.py -p $HGPORT2 -d --pid-file=pid \
179 $ hg serve --config extensions.x=userpass.py -p $HGPORT2 -d --pid-file=pid \
180 > --config server.preferuncompressed=True \
180 > --config server.preferuncompressed=True \
181 > --config web.push_ssl=False --config web.allow_push=* -A ../access.log
181 > --config web.push_ssl=False --config web.allow_push=* -A ../access.log
182 $ cat pid >> $DAEMON_PIDS
182 $ cat pid >> $DAEMON_PIDS
183
183
184 $ cat << EOF > get_pass.py
184 $ cat << EOF > get_pass.py
185 > import getpass
185 > import getpass
186 > def newgetpass(arg):
186 > def newgetpass(arg):
187 > return "pass"
187 > return "pass"
188 > getpass.getpass = newgetpass
188 > getpass.getpass = newgetpass
189 > EOF
189 > EOF
190
190
191 $ hg id http://localhost:$HGPORT2/
191 $ hg id http://localhost:$HGPORT2/
192 abort: http authorization required for http://localhost:$HGPORT2/
192 abort: http authorization required for http://localhost:$HGPORT2/
193 [255]
193 [255]
194 $ hg id http://localhost:$HGPORT2/
194 $ hg id http://localhost:$HGPORT2/
195 abort: http authorization required for http://localhost:$HGPORT2/
195 abort: http authorization required for http://localhost:$HGPORT2/
196 [255]
196 [255]
197 $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
197 $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
198 http authorization required for http://localhost:$HGPORT2/
198 http authorization required for http://localhost:$HGPORT2/
199 realm: mercurial
199 realm: mercurial
200 user: user
200 user: user
201 password: 5fed3813f7f5
201 password: 5fed3813f7f5
202 $ hg id http://user:pass@localhost:$HGPORT2/
202 $ hg id http://user:pass@localhost:$HGPORT2/
203 5fed3813f7f5
203 5fed3813f7f5
204 $ echo '[auth]' >> .hg/hgrc
204 $ echo '[auth]' >> .hg/hgrc
205 $ echo 'l.schemes=http' >> .hg/hgrc
205 $ echo 'l.schemes=http' >> .hg/hgrc
206 $ echo 'l.prefix=lo' >> .hg/hgrc
206 $ echo 'l.prefix=lo' >> .hg/hgrc
207 $ echo 'l.username=user' >> .hg/hgrc
207 $ echo 'l.username=user' >> .hg/hgrc
208 $ echo 'l.password=pass' >> .hg/hgrc
208 $ echo 'l.password=pass' >> .hg/hgrc
209 $ hg id http://localhost:$HGPORT2/
209 $ hg id http://localhost:$HGPORT2/
210 5fed3813f7f5
210 5fed3813f7f5
211 $ hg id http://localhost:$HGPORT2/
211 $ hg id http://localhost:$HGPORT2/
212 5fed3813f7f5
212 5fed3813f7f5
213 $ hg id http://user@localhost:$HGPORT2/
213 $ hg id http://user@localhost:$HGPORT2/
214 5fed3813f7f5
214 5fed3813f7f5
215 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
215 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
216 streaming all changes
216 streaming all changes
217 7 files to transfer, 916 bytes of data
217 7 files to transfer, 916 bytes of data
218 transferred * bytes in * seconds (*/sec) (glob)
218 transferred * bytes in * seconds (*/sec) (glob)
219 searching for changes
219 searching for changes
220 no changes found
220 no changes found
221 updating to branch default
221 updating to branch default
222 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
222 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
223 --pull should override server's preferuncompressed
223 --pull should override server's preferuncompressed
224 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
224 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
225 requesting all changes
225 requesting all changes
226 adding changesets
226 adding changesets
227 adding manifests
227 adding manifests
228 adding file changes
228 adding file changes
229 added 2 changesets with 5 changes to 5 files
229 added 2 changesets with 5 changes to 5 files
230 updating to branch default
230 updating to branch default
231 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
231 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
232
232
233 $ hg id http://user2@localhost:$HGPORT2/
233 $ hg id http://user2@localhost:$HGPORT2/
234 abort: http authorization required for http://localhost:$HGPORT2/
234 abort: http authorization required for http://localhost:$HGPORT2/
235 [255]
235 [255]
236 $ hg id http://user:pass2@localhost:$HGPORT2/
236 $ hg id http://user:pass2@localhost:$HGPORT2/
237 abort: HTTP Error 403: no
237 abort: HTTP Error 403: no
238 [255]
238 [255]
239
239
240 $ hg -R dest tag -r tip top
240 $ hg -R dest tag -r tip top
241 $ hg -R dest push http://user:pass@localhost:$HGPORT2/
241 $ hg -R dest push http://user:pass@localhost:$HGPORT2/
242 pushing to http://user:***@localhost:$HGPORT2/
242 pushing to http://user:***@localhost:$HGPORT2/
243 searching for changes
243 searching for changes
244 remote: adding changesets
244 remote: adding changesets
245 remote: adding manifests
245 remote: adding manifests
246 remote: adding file changes
246 remote: adding file changes
247 remote: added 1 changesets with 1 changes to 1 files
247 remote: added 1 changesets with 1 changes to 1 files
248 $ hg rollback -q
248 $ hg rollback -q
249
249
250 $ sed 's/.*] "/"/' < ../access.log
250 $ sed 's/.*] "/"/' < ../access.log
251 "GET /?cmd=capabilities HTTP/1.1" 200 -
251 "GET /?cmd=capabilities HTTP/1.1" 200 -
252 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
252 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
253 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
253 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
254 "GET /?cmd=capabilities HTTP/1.1" 200 -
254 "GET /?cmd=capabilities HTTP/1.1" 200 -
255 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
255 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
256 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
256 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
257 "GET /?cmd=capabilities HTTP/1.1" 200 -
257 "GET /?cmd=capabilities HTTP/1.1" 200 -
258 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
258 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
259 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
259 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
260 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
260 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
261 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
261 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
262 "GET /?cmd=capabilities HTTP/1.1" 200 -
262 "GET /?cmd=capabilities HTTP/1.1" 200 -
263 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
263 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
264 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
264 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
265 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
265 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
266 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
266 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
267 "GET /?cmd=capabilities HTTP/1.1" 200 -
267 "GET /?cmd=capabilities HTTP/1.1" 200 -
268 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
268 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
269 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
269 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
270 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
270 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
271 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
271 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
272 "GET /?cmd=capabilities HTTP/1.1" 200 -
272 "GET /?cmd=capabilities HTTP/1.1" 200 -
273 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
273 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
274 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
274 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
275 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
275 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
276 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
276 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
277 "GET /?cmd=capabilities HTTP/1.1" 200 -
277 "GET /?cmd=capabilities HTTP/1.1" 200 -
278 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
278 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
279 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
279 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
280 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
280 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
281 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
281 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
282 "GET /?cmd=capabilities HTTP/1.1" 200 -
282 "GET /?cmd=capabilities HTTP/1.1" 200 -
283 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
283 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
284 "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
284 "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
285 "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
285 "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
286 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
286 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
287 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
287 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
288 "GET /?cmd=capabilities HTTP/1.1" 200 -
288 "GET /?cmd=capabilities HTTP/1.1" 200 -
289 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
289 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
290 "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
290 "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
291 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
291 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
292 "GET /?cmd=capabilities HTTP/1.1" 200 -
292 "GET /?cmd=capabilities HTTP/1.1" 200 -
293 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
293 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
294 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
294 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
295 "GET /?cmd=capabilities HTTP/1.1" 200 -
295 "GET /?cmd=capabilities HTTP/1.1" 200 -
296 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
296 "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
297 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
297 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
298 "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
298 "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
299 "GET /?cmd=capabilities HTTP/1.1" 200 -
299 "GET /?cmd=capabilities HTTP/1.1" 200 -
300 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
300 "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
301 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
301 "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
302 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
302 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
303 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
303 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
304 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
304 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
305 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
305 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
306 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
306 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
307 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)
307 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)
308 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
308 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
309
309
310 $ cd ..
310 $ cd ..
311
311
312 clone of serve with repo in root and unserved subrepo (issue2970)
312 clone of serve with repo in root and unserved subrepo (issue2970)
313
313
314 $ hg --cwd test init sub
314 $ hg --cwd test init sub
315 $ echo empty > test/sub/empty
315 $ echo empty > test/sub/empty
316 $ hg --cwd test/sub add empty
316 $ hg --cwd test/sub add empty
317 $ hg --cwd test/sub commit -qm 'add empty'
317 $ hg --cwd test/sub commit -qm 'add empty'
318 $ hg --cwd test/sub tag -r 0 something
318 $ hg --cwd test/sub tag -r 0 something
319 $ echo sub = sub > test/.hgsub
319 $ echo sub = sub > test/.hgsub
320 $ hg --cwd test add .hgsub
320 $ hg --cwd test add .hgsub
321 $ hg --cwd test commit -qm 'add subrepo'
321 $ hg --cwd test commit -qm 'add subrepo'
322 $ hg clone http://localhost:$HGPORT noslash-clone
322 $ hg clone http://localhost:$HGPORT noslash-clone
323 requesting all changes
323 requesting all changes
324 adding changesets
324 adding changesets
325 adding manifests
325 adding manifests
326 adding file changes
326 adding file changes
327 added 3 changesets with 7 changes to 7 files
327 added 3 changesets with 7 changes to 7 files
328 updating to branch default
328 updating to branch default
329 abort: HTTP Error 404: Not Found
329 abort: HTTP Error 404: Not Found
330 [255]
330 [255]
331 $ hg clone http://localhost:$HGPORT/ slash-clone
331 $ hg clone http://localhost:$HGPORT/ slash-clone
332 requesting all changes
332 requesting all changes
333 adding changesets
333 adding changesets
334 adding manifests
334 adding manifests
335 adding file changes
335 adding file changes
336 added 3 changesets with 7 changes to 7 files
336 added 3 changesets with 7 changes to 7 files
337 updating to branch default
337 updating to branch default
338 abort: HTTP Error 404: Not Found
338 abort: HTTP Error 404: Not Found
339 [255]
339 [255]
340
340
341 check error log
341 check error log
342
342
343 $ cat error.log
343 $ cat error.log
344
344
345 check abort error reporting while pulling/cloning
345 check abort error reporting while pulling/cloning
346
346
347 $ $RUNTESTDIR/killdaemons.py
347 $ $RUNTESTDIR/killdaemons.py
348 $ hg -R test serve -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
348 $ hg -R test serve -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
349 $ cat hg3.pid >> $DAEMON_PIDS
349 $ cat hg3.pid >> $DAEMON_PIDS
350 $ hg clone http://localhost:$HGPORT/ abort-clone
350 $ hg clone http://localhost:$HGPORT/ abort-clone
351 requesting all changes
351 requesting all changes
352 remote: abort: this is an exercise
352 remote: abort: this is an exercise
353 abort: pull failed on remote
353 abort: pull failed on remote
354 [255]
354 [255]
355 $ cat error.log
355 $ cat error.log
356
356
357 disable pull-based clones
358
359 $ hg -R test serve -p $HGPORT1 -d --pid-file=hg4.pid -E error.log --config server.disablefullbundle=True
360 $ cat hg4.pid >> $DAEMON_PIDS
361 $ hg clone http://localhost:$HGPORT1/ disable-pull-clone
362 requesting all changes
363 remote: abort: server has pull-based clones disabled
364 abort: pull failed on remote
365 (remove --pull if specified or upgrade Mercurial)
366 [255]
367
368 ... but keep stream clones working
369
370 $ hg clone --uncompressed --noupdate http://localhost:$HGPORT1/ test-stream-clone
371 streaming all changes
372 * files to transfer, * of data (glob)
373 transferred * in * seconds (*/sec) (glob)
374 searching for changes
375 no changes found
376 $ cat error.log
377
378 ... and also keep partial clones and pulls working
379 $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone
380 adding changesets
381 adding manifests
382 adding file changes
383 added 1 changesets with 4 changes to 4 files
384 updating to branch default
385 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
386 $ hg pull -R test-partial-clone
387 pulling from http://localhost:$HGPORT1/
388 searching for changes
389 adding changesets
390 adding manifests
391 adding file changes
392 added 2 changesets with 3 changes to 3 files
393 (run 'hg update' to get a working copy)
394
357 corrupt cookies file should yield a warning
395 corrupt cookies file should yield a warning
358
396
359 $ cat > $TESTTMP/cookies.txt << EOF
397 $ cat > $TESTTMP/cookies.txt << EOF
360 > bad format
398 > bad format
361 > EOF
399 > EOF
362
400
363 $ hg --config auth.cookiefile=$TESTTMP/cookies.txt id http://localhost:$HGPORT/
401 $ hg --config auth.cookiefile=$TESTTMP/cookies.txt id http://localhost:$HGPORT/
364 (error loading cookie file $TESTTMP/cookies.txt: '*/cookies.txt' does not look like a Netscape format cookies file; continuing without cookies) (glob)
402 (error loading cookie file $TESTTMP/cookies.txt: '*/cookies.txt' does not look like a Netscape format cookies file; continuing without cookies) (glob)
365 56f9bc90cce6
403 56f9bc90cce6
366
404
367 $ killdaemons.py
405 $ killdaemons.py
368
406
369 Create dummy authentication handler that looks for cookies. It doesn't do anything
407 Create dummy authentication handler that looks for cookies. It doesn't do anything
370 useful. It just raises an HTTP 500 with details about the Cookie request header.
408 useful. It just raises an HTTP 500 with details about the Cookie request header.
371 We raise HTTP 500 because its message is printed in the abort message.
409 We raise HTTP 500 because its message is printed in the abort message.
372
410
373 $ cat > cookieauth.py << EOF
411 $ cat > cookieauth.py << EOF
374 > from mercurial import util
412 > from mercurial import util
375 > from mercurial.hgweb import common
413 > from mercurial.hgweb import common
376 > def perform_authentication(hgweb, req, op):
414 > def perform_authentication(hgweb, req, op):
377 > cookie = req.env.get('HTTP_COOKIE')
415 > cookie = req.env.get('HTTP_COOKIE')
378 > if not cookie:
416 > if not cookie:
379 > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'no-cookie')
417 > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'no-cookie')
380 > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'Cookie: %s' % cookie)
418 > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'Cookie: %s' % cookie)
381 > def extsetup():
419 > def extsetup():
382 > common.permhooks.insert(0, perform_authentication)
420 > common.permhooks.insert(0, perform_authentication)
383 > EOF
421 > EOF
384
422
385 $ hg serve --config extensions.cookieauth=cookieauth.py -R test -p $HGPORT -d --pid-file=pid
423 $ hg serve --config extensions.cookieauth=cookieauth.py -R test -p $HGPORT -d --pid-file=pid
386 $ cat pid > $DAEMON_PIDS
424 $ cat pid > $DAEMON_PIDS
387
425
388 Request without cookie sent should fail due to lack of cookie
426 Request without cookie sent should fail due to lack of cookie
389
427
390 $ hg id http://localhost:$HGPORT
428 $ hg id http://localhost:$HGPORT
391 abort: HTTP Error 500: no-cookie
429 abort: HTTP Error 500: no-cookie
392 [255]
430 [255]
393
431
394 Populate a cookies file
432 Populate a cookies file
395
433
396 $ cat > cookies.txt << EOF
434 $ cat > cookies.txt << EOF
397 > # HTTP Cookie File
435 > # HTTP Cookie File
398 > # Expiration is 2030-01-01 at midnight
436 > # Expiration is 2030-01-01 at midnight
399 > .example.com TRUE / FALSE 1893456000 hgkey examplevalue
437 > .example.com TRUE / FALSE 1893456000 hgkey examplevalue
400 > EOF
438 > EOF
401
439
402 Should not send a cookie for another domain
440 Should not send a cookie for another domain
403
441
404 $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
442 $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
405 abort: HTTP Error 500: no-cookie
443 abort: HTTP Error 500: no-cookie
406 [255]
444 [255]
407
445
408 Add a cookie entry for our test server and verify it is sent
446 Add a cookie entry for our test server and verify it is sent
409
447
410 $ cat >> cookies.txt << EOF
448 $ cat >> cookies.txt << EOF
411 > localhost.local FALSE / FALSE 1893456000 hgkey localhostvalue
449 > localhost.local FALSE / FALSE 1893456000 hgkey localhostvalue
412 > EOF
450 > EOF
413
451
414 $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
452 $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
415 abort: HTTP Error 500: Cookie: hgkey=localhostvalue
453 abort: HTTP Error 500: Cookie: hgkey=localhostvalue
416 [255]
454 [255]
General Comments 0
You need to be logged in to leave comments. Login now