Show More
@@ -0,0 +1,129 b'' | |||||
|
1 | #require serve | |||
|
2 | ||||
|
3 | $ cat > web.conf << EOF | |||
|
4 | > [paths] | |||
|
5 | > / = $TESTTMP/* | |||
|
6 | > EOF | |||
|
7 | ||||
|
8 | $ hg init repo1 | |||
|
9 | $ cd repo1 | |||
|
10 | $ touch foo | |||
|
11 | $ hg -q commit -A -m initial | |||
|
12 | $ cd .. | |||
|
13 | ||||
|
14 | $ hg serve -p $HGPORT -d --pid-file=hg.pid --web-conf web.conf | |||
|
15 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
16 | ||||
|
17 | repo index should not send Content-Security-Policy header by default | |||
|
18 | ||||
|
19 | $ get-with-headers.py --headeronly localhost:$HGPORT '' content-security-policy etag | |||
|
20 | 200 Script output follows | |||
|
21 | ||||
|
22 | static page should not send CSP by default | |||
|
23 | ||||
|
24 | $ get-with-headers.py --headeronly localhost:$HGPORT static/mercurial.js content-security-policy etag | |||
|
25 | 200 Script output follows | |||
|
26 | ||||
|
27 | repo page should not send CSP by default, should send ETag | |||
|
28 | ||||
|
29 | $ get-with-headers.py --headeronly localhost:$HGPORT repo1 content-security-policy etag | |||
|
30 | 200 Script output follows | |||
|
31 | etag: W/"*" (glob) | |||
|
32 | ||||
|
33 | $ killdaemons.py | |||
|
34 | ||||
|
35 | Configure CSP without nonce | |||
|
36 | ||||
|
37 | $ cat >> web.conf << EOF | |||
|
38 | > [web] | |||
|
39 | > csp = script-src https://example.com/ 'unsafe-inline' | |||
|
40 | > EOF | |||
|
41 | ||||
|
42 | $ hg serve -p $HGPORT -d --pid-file=hg.pid --web-conf web.conf | |||
|
43 | $ cat hg.pid > $DAEMON_PIDS | |||
|
44 | ||||
|
45 | repo index should send Content-Security-Policy header when enabled | |||
|
46 | ||||
|
47 | $ get-with-headers.py --headeronly localhost:$HGPORT '' content-security-policy etag | |||
|
48 | 200 Script output follows | |||
|
49 | content-security-policy: script-src https://example.com/ 'unsafe-inline' | |||
|
50 | ||||
|
51 | static page should send CSP when enabled | |||
|
52 | ||||
|
53 | $ get-with-headers.py --headeronly localhost:$HGPORT static/mercurial.js content-security-policy etag | |||
|
54 | 200 Script output follows | |||
|
55 | content-security-policy: script-src https://example.com/ 'unsafe-inline' | |||
|
56 | ||||
|
57 | repo page should send CSP by default, include etag w/o nonce | |||
|
58 | ||||
|
59 | $ get-with-headers.py --headeronly localhost:$HGPORT repo1 content-security-policy etag | |||
|
60 | 200 Script output follows | |||
|
61 | content-security-policy: script-src https://example.com/ 'unsafe-inline' | |||
|
62 | etag: W/"*" (glob) | |||
|
63 | ||||
|
64 | nonce should not be added to html if CSP doesn't use it | |||
|
65 | ||||
|
66 | $ get-with-headers.py localhost:$HGPORT repo1/graph/tip | egrep 'content-security-policy|<script' | |||
|
67 | <script type="text/javascript" src="/repo1/static/mercurial.js"></script> | |||
|
68 | <!--[if IE]><script type="text/javascript" src="/repo1/static/excanvas.js"></script><![endif]--> | |||
|
69 | <script type="text/javascript"> | |||
|
70 | <script type="text/javascript"> | |||
|
71 | ||||
|
72 | Configure CSP with nonce | |||
|
73 | ||||
|
74 | $ killdaemons.py | |||
|
75 | $ cat >> web.conf << EOF | |||
|
76 | > csp = image-src 'self'; script-src https://example.com/ 'nonce-%nonce%' | |||
|
77 | > EOF | |||
|
78 | ||||
|
79 | $ hg serve -p $HGPORT -d --pid-file=hg.pid --web-conf web.conf | |||
|
80 | $ cat hg.pid > $DAEMON_PIDS | |||
|
81 | ||||
|
82 | nonce should be substituted in CSP header | |||
|
83 | ||||
|
84 | $ get-with-headers.py --headeronly localhost:$HGPORT '' content-security-policy etag | |||
|
85 | 200 Script output follows | |||
|
86 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
87 | ||||
|
88 | nonce should be included in CSP for static pages | |||
|
89 | ||||
|
90 | $ get-with-headers.py --headeronly localhost:$HGPORT static/mercurial.js content-security-policy etag | |||
|
91 | 200 Script output follows | |||
|
92 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
93 | ||||
|
94 | repo page should have nonce, no ETag | |||
|
95 | ||||
|
96 | $ get-with-headers.py --headeronly localhost:$HGPORT repo1 content-security-policy etag | |||
|
97 | 200 Script output follows | |||
|
98 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
99 | ||||
|
100 | nonce should be added to html when used | |||
|
101 | ||||
|
102 | $ get-with-headers.py localhost:$HGPORT repo1/graph/tip content-security-policy | egrep 'content-security-policy|<script' | |||
|
103 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
104 | <script type="text/javascript" src="/repo1/static/mercurial.js"></script> | |||
|
105 | <!--[if IE]><script type="text/javascript" src="/repo1/static/excanvas.js"></script><![endif]--> | |||
|
106 | <script type="text/javascript" nonce="*"> (glob) | |||
|
107 | <script type="text/javascript" nonce="*"> (glob) | |||
|
108 | ||||
|
109 | hgweb_mod w/o hgwebdir works as expected | |||
|
110 | ||||
|
111 | $ killdaemons.py | |||
|
112 | ||||
|
113 | $ hg -R repo1 serve -p $HGPORT -d --pid-file=hg.pid --config "web.csp=image-src 'self'; script-src https://example.com/ 'nonce-%nonce%'" | |||
|
114 | $ cat hg.pid > $DAEMON_PIDS | |||
|
115 | ||||
|
116 | static page sends CSP | |||
|
117 | ||||
|
118 | $ get-with-headers.py --headeronly localhost:$HGPORT static/mercurial.js content-security-policy etag | |||
|
119 | 200 Script output follows | |||
|
120 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
121 | ||||
|
122 | nonce included in <script> and headers | |||
|
123 | ||||
|
124 | $ get-with-headers.py localhost:$HGPORT graph/tip content-security-policy | egrep 'content-security-policy|<script' | |||
|
125 | content-security-policy: image-src 'self'; script-src https://example.com/ 'nonce-*' (glob) | |||
|
126 | <script type="text/javascript" src="/static/mercurial.js"></script> | |||
|
127 | <!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]--> | |||
|
128 | <script type="text/javascript" nonce="*"> (glob) | |||
|
129 | <script type="text/javascript" nonce="*"> (glob) |
@@ -1,2303 +1,2317 b'' | |||||
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 | - ``<install-root>/etc/mercurial/hgrc`` (per-installation) |
|
59 | - ``<install-root>/etc/mercurial/hgrc`` (per-installation) | |
60 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) |
|
60 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) | |
61 | - ``/etc/mercurial/hgrc`` (per-system) |
|
61 | - ``/etc/mercurial/hgrc`` (per-system) | |
62 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
|
62 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) | |
63 | - ``<internal>/default.d/*.rc`` (defaults) |
|
63 | - ``<internal>/default.d/*.rc`` (defaults) | |
64 |
|
64 | |||
65 | .. container:: verbose.windows |
|
65 | .. container:: verbose.windows | |
66 |
|
66 | |||
67 | On Windows, the following files are consulted: |
|
67 | On Windows, the following files are consulted: | |
68 |
|
68 | |||
69 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
69 | - ``<repo>/.hg/hgrc`` (per-repository) | |
70 | - ``%USERPROFILE%\.hgrc`` (per-user) |
|
70 | - ``%USERPROFILE%\.hgrc`` (per-user) | |
71 | - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
|
71 | - ``%USERPROFILE%\Mercurial.ini`` (per-user) | |
72 | - ``%HOME%\.hgrc`` (per-user) |
|
72 | - ``%HOME%\.hgrc`` (per-user) | |
73 | - ``%HOME%\Mercurial.ini`` (per-user) |
|
73 | - ``%HOME%\Mercurial.ini`` (per-user) | |
74 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
74 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) | |
75 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
|
75 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) | |
76 | - ``<install-dir>\Mercurial.ini`` (per-installation) |
|
76 | - ``<install-dir>\Mercurial.ini`` (per-installation) | |
77 | - ``<internal>/default.d/*.rc`` (defaults) |
|
77 | - ``<internal>/default.d/*.rc`` (defaults) | |
78 |
|
78 | |||
79 | .. note:: |
|
79 | .. note:: | |
80 |
|
80 | |||
81 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
|
81 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` | |
82 | is used when running 32-bit Python on 64-bit Windows. |
|
82 | is used when running 32-bit Python on 64-bit Windows. | |
83 |
|
83 | |||
84 | .. container:: windows |
|
84 | .. container:: windows | |
85 |
|
85 | |||
86 | On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. |
|
86 | On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. | |
87 |
|
87 | |||
88 | .. container:: verbose.plan9 |
|
88 | .. container:: verbose.plan9 | |
89 |
|
89 | |||
90 | On Plan9, the following files are consulted: |
|
90 | On Plan9, the following files are consulted: | |
91 |
|
91 | |||
92 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
92 | - ``<repo>/.hg/hgrc`` (per-repository) | |
93 | - ``$home/lib/hgrc`` (per-user) |
|
93 | - ``$home/lib/hgrc`` (per-user) | |
94 | - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
|
94 | - ``<install-root>/lib/mercurial/hgrc`` (per-installation) | |
95 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
|
95 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) | |
96 | - ``/lib/mercurial/hgrc`` (per-system) |
|
96 | - ``/lib/mercurial/hgrc`` (per-system) | |
97 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
|
97 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) | |
98 | - ``<internal>/default.d/*.rc`` (defaults) |
|
98 | - ``<internal>/default.d/*.rc`` (defaults) | |
99 |
|
99 | |||
100 | Per-repository configuration options only apply in a |
|
100 | Per-repository configuration options only apply in a | |
101 | particular repository. This file is not version-controlled, and |
|
101 | particular repository. This file is not version-controlled, and | |
102 | will not get transferred during a "clone" operation. Options in |
|
102 | will not get transferred during a "clone" operation. Options in | |
103 | this file override options in all other configuration files. |
|
103 | this file override options in all other configuration files. | |
104 |
|
104 | |||
105 | .. container:: unix.plan9 |
|
105 | .. container:: unix.plan9 | |
106 |
|
106 | |||
107 | On Plan 9 and Unix, most of this file will be ignored if it doesn't |
|
107 | On Plan 9 and Unix, most of this file will be ignored if it doesn't | |
108 | belong to a trusted user or to a trusted group. See |
|
108 | belong to a trusted user or to a trusted group. See | |
109 | :hg:`help config.trusted` for more details. |
|
109 | :hg:`help config.trusted` for more details. | |
110 |
|
110 | |||
111 | Per-user configuration file(s) are for the user running Mercurial. Options |
|
111 | Per-user configuration file(s) are for the user running Mercurial. Options | |
112 | in these files apply to all Mercurial commands executed by this user in any |
|
112 | in these files apply to all Mercurial commands executed by this user in any | |
113 | directory. Options in these files override per-system and per-installation |
|
113 | directory. Options in these files override per-system and per-installation | |
114 | options. |
|
114 | options. | |
115 |
|
115 | |||
116 | Per-installation configuration files are searched for in the |
|
116 | Per-installation configuration files are searched for in the | |
117 | directory where Mercurial is installed. ``<install-root>`` is the |
|
117 | directory where Mercurial is installed. ``<install-root>`` is the | |
118 | parent directory of the **hg** executable (or symlink) being run. |
|
118 | parent directory of the **hg** executable (or symlink) being run. | |
119 |
|
119 | |||
120 | .. container:: unix.plan9 |
|
120 | .. container:: unix.plan9 | |
121 |
|
121 | |||
122 | For example, if installed in ``/shared/tools/bin/hg``, Mercurial |
|
122 | For example, if installed in ``/shared/tools/bin/hg``, Mercurial | |
123 | will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these |
|
123 | will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these | |
124 | files apply to all Mercurial commands executed by any user in any |
|
124 | files apply to all Mercurial commands executed by any user in any | |
125 | directory. |
|
125 | directory. | |
126 |
|
126 | |||
127 | Per-installation configuration files are for the system on |
|
127 | Per-installation configuration files are for the system on | |
128 | which Mercurial is running. Options in these files apply to all |
|
128 | which Mercurial is running. Options in these files apply to all | |
129 | Mercurial commands executed by any user in any directory. Registry |
|
129 | Mercurial commands executed by any user in any directory. Registry | |
130 | keys contain PATH-like strings, every part of which must reference |
|
130 | keys contain PATH-like strings, every part of which must reference | |
131 | a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will |
|
131 | a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will | |
132 | be read. Mercurial checks each of these locations in the specified |
|
132 | be read. Mercurial checks each of these locations in the specified | |
133 | order until one or more configuration files are detected. |
|
133 | order until one or more configuration files are detected. | |
134 |
|
134 | |||
135 | Per-system configuration files are for the system on which Mercurial |
|
135 | Per-system configuration files are for the system on which Mercurial | |
136 | is running. Options in these files apply to all Mercurial commands |
|
136 | is running. Options in these files apply to all Mercurial commands | |
137 | executed by any user in any directory. Options in these files |
|
137 | executed by any user in any directory. Options in these files | |
138 | override per-installation options. |
|
138 | override per-installation options. | |
139 |
|
139 | |||
140 | Mercurial comes with some default configuration. The default configuration |
|
140 | Mercurial comes with some default configuration. The default configuration | |
141 | files are installed with Mercurial and will be overwritten on upgrades. Default |
|
141 | files are installed with Mercurial and will be overwritten on upgrades. Default | |
142 | configuration files should never be edited by users or administrators but can |
|
142 | configuration files should never be edited by users or administrators but can | |
143 | be overridden in other configuration files. So far the directory only contains |
|
143 | be overridden in other configuration files. So far the directory only contains | |
144 | merge tool configuration but packagers can also put other default configuration |
|
144 | merge tool configuration but packagers can also put other default configuration | |
145 | there. |
|
145 | there. | |
146 |
|
146 | |||
147 | Syntax |
|
147 | Syntax | |
148 | ====== |
|
148 | ====== | |
149 |
|
149 | |||
150 | A configuration file consists of sections, led by a ``[section]`` header |
|
150 | A configuration file consists of sections, led by a ``[section]`` header | |
151 | and followed by ``name = value`` entries (sometimes called |
|
151 | and followed by ``name = value`` entries (sometimes called | |
152 | ``configuration keys``):: |
|
152 | ``configuration keys``):: | |
153 |
|
153 | |||
154 | [spam] |
|
154 | [spam] | |
155 | eggs=ham |
|
155 | eggs=ham | |
156 | green= |
|
156 | green= | |
157 | eggs |
|
157 | eggs | |
158 |
|
158 | |||
159 | Each line contains one entry. If the lines that follow are indented, |
|
159 | Each line contains one entry. If the lines that follow are indented, | |
160 | they are treated as continuations of that entry. Leading whitespace is |
|
160 | they are treated as continuations of that entry. Leading whitespace is | |
161 | removed from values. Empty lines are skipped. Lines beginning with |
|
161 | removed from values. Empty lines are skipped. Lines beginning with | |
162 | ``#`` or ``;`` are ignored and may be used to provide comments. |
|
162 | ``#`` or ``;`` are ignored and may be used to provide comments. | |
163 |
|
163 | |||
164 | Configuration keys can be set multiple times, in which case Mercurial |
|
164 | Configuration keys can be set multiple times, in which case Mercurial | |
165 | will use the value that was configured last. As an example:: |
|
165 | will use the value that was configured last. As an example:: | |
166 |
|
166 | |||
167 | [spam] |
|
167 | [spam] | |
168 | eggs=large |
|
168 | eggs=large | |
169 | ham=serrano |
|
169 | ham=serrano | |
170 | eggs=small |
|
170 | eggs=small | |
171 |
|
171 | |||
172 | This would set the configuration key named ``eggs`` to ``small``. |
|
172 | This would set the configuration key named ``eggs`` to ``small``. | |
173 |
|
173 | |||
174 | It is also possible to define a section multiple times. A section can |
|
174 | It is also possible to define a section multiple times. A section can | |
175 | be redefined on the same and/or on different configuration files. For |
|
175 | be redefined on the same and/or on different configuration files. For | |
176 | example:: |
|
176 | example:: | |
177 |
|
177 | |||
178 | [foo] |
|
178 | [foo] | |
179 | eggs=large |
|
179 | eggs=large | |
180 | ham=serrano |
|
180 | ham=serrano | |
181 | eggs=small |
|
181 | eggs=small | |
182 |
|
182 | |||
183 | [bar] |
|
183 | [bar] | |
184 | eggs=ham |
|
184 | eggs=ham | |
185 | green= |
|
185 | green= | |
186 | eggs |
|
186 | eggs | |
187 |
|
187 | |||
188 | [foo] |
|
188 | [foo] | |
189 | ham=prosciutto |
|
189 | ham=prosciutto | |
190 | eggs=medium |
|
190 | eggs=medium | |
191 | bread=toasted |
|
191 | bread=toasted | |
192 |
|
192 | |||
193 | This would set the ``eggs``, ``ham``, and ``bread`` configuration keys |
|
193 | This would set the ``eggs``, ``ham``, and ``bread`` configuration keys | |
194 | of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``, |
|
194 | of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``, | |
195 | respectively. As you can see there only thing that matters is the last |
|
195 | respectively. As you can see there only thing that matters is the last | |
196 | value that was set for each of the configuration keys. |
|
196 | value that was set for each of the configuration keys. | |
197 |
|
197 | |||
198 | If a configuration key is set multiple times in different |
|
198 | If a configuration key is set multiple times in different | |
199 | configuration files the final value will depend on the order in which |
|
199 | configuration files the final value will depend on the order in which | |
200 | the different configuration files are read, with settings from earlier |
|
200 | the different configuration files are read, with settings from earlier | |
201 | paths overriding later ones as described on the ``Files`` section |
|
201 | paths overriding later ones as described on the ``Files`` section | |
202 | above. |
|
202 | above. | |
203 |
|
203 | |||
204 | A line of the form ``%include file`` will include ``file`` into the |
|
204 | A line of the form ``%include file`` will include ``file`` into the | |
205 | current configuration file. The inclusion is recursive, which means |
|
205 | current configuration file. The inclusion is recursive, which means | |
206 | that included files can include other files. Filenames are relative to |
|
206 | that included files can include other files. Filenames are relative to | |
207 | the configuration file in which the ``%include`` directive is found. |
|
207 | the configuration file in which the ``%include`` directive is found. | |
208 | Environment variables and ``~user`` constructs are expanded in |
|
208 | Environment variables and ``~user`` constructs are expanded in | |
209 | ``file``. This lets you do something like:: |
|
209 | ``file``. This lets you do something like:: | |
210 |
|
210 | |||
211 | %include ~/.hgrc.d/$HOST.rc |
|
211 | %include ~/.hgrc.d/$HOST.rc | |
212 |
|
212 | |||
213 | to include a different configuration file on each computer you use. |
|
213 | to include a different configuration file on each computer you use. | |
214 |
|
214 | |||
215 | A line with ``%unset name`` will remove ``name`` from the current |
|
215 | A line with ``%unset name`` will remove ``name`` from the current | |
216 | section, if it has been set previously. |
|
216 | section, if it has been set previously. | |
217 |
|
217 | |||
218 | The values are either free-form text strings, lists of text strings, |
|
218 | The values are either free-form text strings, lists of text strings, | |
219 | or Boolean values. Boolean values can be set to true using any of "1", |
|
219 | or Boolean values. Boolean values can be set to true using any of "1", | |
220 | "yes", "true", or "on" and to false using "0", "no", "false", or "off" |
|
220 | "yes", "true", or "on" and to false using "0", "no", "false", or "off" | |
221 | (all case insensitive). |
|
221 | (all case insensitive). | |
222 |
|
222 | |||
223 | List values are separated by whitespace or comma, except when values are |
|
223 | List values are separated by whitespace or comma, except when values are | |
224 | placed in double quotation marks:: |
|
224 | placed in double quotation marks:: | |
225 |
|
225 | |||
226 | allow_read = "John Doe, PhD", brian, betty |
|
226 | allow_read = "John Doe, PhD", brian, betty | |
227 |
|
227 | |||
228 | Quotation marks can be escaped by prefixing them with a backslash. Only |
|
228 | Quotation marks can be escaped by prefixing them with a backslash. Only | |
229 | quotation marks at the beginning of a word is counted as a quotation |
|
229 | quotation marks at the beginning of a word is counted as a quotation | |
230 | (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``). |
|
230 | (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``). | |
231 |
|
231 | |||
232 | Sections |
|
232 | Sections | |
233 | ======== |
|
233 | ======== | |
234 |
|
234 | |||
235 | This section describes the different sections that may appear in a |
|
235 | This section describes the different sections that may appear in a | |
236 | Mercurial configuration file, the purpose of each section, its possible |
|
236 | Mercurial configuration file, the purpose of each section, its possible | |
237 | keys, and their possible values. |
|
237 | keys, and their possible values. | |
238 |
|
238 | |||
239 | ``alias`` |
|
239 | ``alias`` | |
240 | --------- |
|
240 | --------- | |
241 |
|
241 | |||
242 | Defines command aliases. |
|
242 | Defines command aliases. | |
243 |
|
243 | |||
244 | Aliases allow you to define your own commands in terms of other |
|
244 | Aliases allow you to define your own commands in terms of other | |
245 | commands (or aliases), optionally including arguments. Positional |
|
245 | commands (or aliases), optionally including arguments. Positional | |
246 | arguments in the form of ``$1``, ``$2``, etc. in the alias definition |
|
246 | arguments in the form of ``$1``, ``$2``, etc. in the alias definition | |
247 | are expanded by Mercurial before execution. Positional arguments not |
|
247 | are expanded by Mercurial before execution. Positional arguments not | |
248 | already used by ``$N`` in the definition are put at the end of the |
|
248 | already used by ``$N`` in the definition are put at the end of the | |
249 | command to be executed. |
|
249 | command to be executed. | |
250 |
|
250 | |||
251 | Alias definitions consist of lines of the form:: |
|
251 | Alias definitions consist of lines of the form:: | |
252 |
|
252 | |||
253 | <alias> = <command> [<argument>]... |
|
253 | <alias> = <command> [<argument>]... | |
254 |
|
254 | |||
255 | For example, this definition:: |
|
255 | For example, this definition:: | |
256 |
|
256 | |||
257 | latest = log --limit 5 |
|
257 | latest = log --limit 5 | |
258 |
|
258 | |||
259 | creates a new command ``latest`` that shows only the five most recent |
|
259 | creates a new command ``latest`` that shows only the five most recent | |
260 | changesets. You can define subsequent aliases using earlier ones:: |
|
260 | changesets. You can define subsequent aliases using earlier ones:: | |
261 |
|
261 | |||
262 | stable5 = latest -b stable |
|
262 | stable5 = latest -b stable | |
263 |
|
263 | |||
264 | .. note:: |
|
264 | .. note:: | |
265 |
|
265 | |||
266 | It is possible to create aliases with the same names as |
|
266 | It is possible to create aliases with the same names as | |
267 | existing commands, which will then override the original |
|
267 | existing commands, which will then override the original | |
268 | definitions. This is almost always a bad idea! |
|
268 | definitions. This is almost always a bad idea! | |
269 |
|
269 | |||
270 | An alias can start with an exclamation point (``!``) to make it a |
|
270 | An alias can start with an exclamation point (``!``) to make it a | |
271 | shell alias. A shell alias is executed with the shell and will let you |
|
271 | shell alias. A shell alias is executed with the shell and will let you | |
272 | run arbitrary commands. As an example, :: |
|
272 | run arbitrary commands. As an example, :: | |
273 |
|
273 | |||
274 | echo = !echo $@ |
|
274 | echo = !echo $@ | |
275 |
|
275 | |||
276 | will let you do ``hg echo foo`` to have ``foo`` printed in your |
|
276 | will let you do ``hg echo foo`` to have ``foo`` printed in your | |
277 | terminal. A better example might be:: |
|
277 | terminal. A better example might be:: | |
278 |
|
278 | |||
279 | purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm |
|
279 | purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm | |
280 |
|
280 | |||
281 | which will make ``hg purge`` delete all unknown files in the |
|
281 | which will make ``hg purge`` delete all unknown files in the | |
282 | repository in the same manner as the purge extension. |
|
282 | repository in the same manner as the purge extension. | |
283 |
|
283 | |||
284 | Positional arguments like ``$1``, ``$2``, etc. in the alias definition |
|
284 | Positional arguments like ``$1``, ``$2``, etc. in the alias definition | |
285 | expand to the command arguments. Unmatched arguments are |
|
285 | expand to the command arguments. Unmatched arguments are | |
286 | removed. ``$0`` expands to the alias name and ``$@`` expands to all |
|
286 | removed. ``$0`` expands to the alias name and ``$@`` expands to all | |
287 | arguments separated by a space. ``"$@"`` (with quotes) expands to all |
|
287 | arguments separated by a space. ``"$@"`` (with quotes) expands to all | |
288 | arguments quoted individually and separated by a space. These expansions |
|
288 | arguments quoted individually and separated by a space. These expansions | |
289 | happen before the command is passed to the shell. |
|
289 | happen before the command is passed to the shell. | |
290 |
|
290 | |||
291 | Shell aliases are executed in an environment where ``$HG`` expands to |
|
291 | Shell aliases are executed in an environment where ``$HG`` expands to | |
292 | the path of the Mercurial that was used to execute the alias. This is |
|
292 | the path of the Mercurial that was used to execute the alias. This is | |
293 | useful when you want to call further Mercurial commands in a shell |
|
293 | useful when you want to call further Mercurial commands in a shell | |
294 | alias, as was done above for the purge alias. In addition, |
|
294 | alias, as was done above for the purge alias. In addition, | |
295 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg |
|
295 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg | |
296 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. |
|
296 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. | |
297 |
|
297 | |||
298 | .. note:: |
|
298 | .. note:: | |
299 |
|
299 | |||
300 | Some global configuration options such as ``-R`` are |
|
300 | Some global configuration options such as ``-R`` are | |
301 | processed before shell aliases and will thus not be passed to |
|
301 | processed before shell aliases and will thus not be passed to | |
302 | aliases. |
|
302 | aliases. | |
303 |
|
303 | |||
304 |
|
304 | |||
305 | ``annotate`` |
|
305 | ``annotate`` | |
306 | ------------ |
|
306 | ------------ | |
307 |
|
307 | |||
308 | Settings used when displaying file annotations. All values are |
|
308 | Settings used when displaying file annotations. All values are | |
309 | Booleans and default to False. See :hg:`help config.diff` for |
|
309 | Booleans and default to False. See :hg:`help config.diff` for | |
310 | related options for the diff command. |
|
310 | related options for the diff command. | |
311 |
|
311 | |||
312 | ``ignorews`` |
|
312 | ``ignorews`` | |
313 | Ignore white space when comparing lines. |
|
313 | Ignore white space when comparing lines. | |
314 |
|
314 | |||
315 | ``ignorewsamount`` |
|
315 | ``ignorewsamount`` | |
316 | Ignore changes in the amount of white space. |
|
316 | Ignore changes in the amount of white space. | |
317 |
|
317 | |||
318 | ``ignoreblanklines`` |
|
318 | ``ignoreblanklines`` | |
319 | Ignore changes whose lines are all blank. |
|
319 | Ignore changes whose lines are all blank. | |
320 |
|
320 | |||
321 |
|
321 | |||
322 | ``auth`` |
|
322 | ``auth`` | |
323 | -------- |
|
323 | -------- | |
324 |
|
324 | |||
325 | Authentication credentials for HTTP authentication. This section |
|
325 | Authentication credentials for HTTP authentication. This section | |
326 | allows you to store usernames and passwords for use when logging |
|
326 | allows you to store usernames and passwords for use when logging | |
327 | *into* HTTP servers. See :hg:`help config.web` if |
|
327 | *into* HTTP servers. See :hg:`help config.web` if | |
328 | you want to configure *who* can login to your HTTP server. |
|
328 | you want to configure *who* can login to your HTTP server. | |
329 |
|
329 | |||
330 | Each line has the following format:: |
|
330 | Each line has the following format:: | |
331 |
|
331 | |||
332 | <name>.<argument> = <value> |
|
332 | <name>.<argument> = <value> | |
333 |
|
333 | |||
334 | where ``<name>`` is used to group arguments into authentication |
|
334 | where ``<name>`` is used to group arguments into authentication | |
335 | entries. Example:: |
|
335 | entries. Example:: | |
336 |
|
336 | |||
337 | foo.prefix = hg.intevation.de/mercurial |
|
337 | foo.prefix = hg.intevation.de/mercurial | |
338 | foo.username = foo |
|
338 | foo.username = foo | |
339 | foo.password = bar |
|
339 | foo.password = bar | |
340 | foo.schemes = http https |
|
340 | foo.schemes = http https | |
341 |
|
341 | |||
342 | bar.prefix = secure.example.org |
|
342 | bar.prefix = secure.example.org | |
343 | bar.key = path/to/file.key |
|
343 | bar.key = path/to/file.key | |
344 | bar.cert = path/to/file.cert |
|
344 | bar.cert = path/to/file.cert | |
345 | bar.schemes = https |
|
345 | bar.schemes = https | |
346 |
|
346 | |||
347 | Supported arguments: |
|
347 | Supported arguments: | |
348 |
|
348 | |||
349 | ``prefix`` |
|
349 | ``prefix`` | |
350 | Either ``*`` or a URI prefix with or without the scheme part. |
|
350 | Either ``*`` or a URI prefix with or without the scheme part. | |
351 | The authentication entry with the longest matching prefix is used |
|
351 | The authentication entry with the longest matching prefix is used | |
352 | (where ``*`` matches everything and counts as a match of length |
|
352 | (where ``*`` matches everything and counts as a match of length | |
353 | 1). If the prefix doesn't include a scheme, the match is performed |
|
353 | 1). If the prefix doesn't include a scheme, the match is performed | |
354 | against the URI with its scheme stripped as well, and the schemes |
|
354 | against the URI with its scheme stripped as well, and the schemes | |
355 | argument, q.v., is then subsequently consulted. |
|
355 | argument, q.v., is then subsequently consulted. | |
356 |
|
356 | |||
357 | ``username`` |
|
357 | ``username`` | |
358 | Optional. Username to authenticate with. If not given, and the |
|
358 | Optional. Username to authenticate with. If not given, and the | |
359 | remote site requires basic or digest authentication, the user will |
|
359 | remote site requires basic or digest authentication, the user will | |
360 | be prompted for it. Environment variables are expanded in the |
|
360 | be prompted for it. Environment variables are expanded in the | |
361 | username letting you do ``foo.username = $USER``. If the URI |
|
361 | username letting you do ``foo.username = $USER``. If the URI | |
362 | includes a username, only ``[auth]`` entries with a matching |
|
362 | includes a username, only ``[auth]`` entries with a matching | |
363 | username or without a username will be considered. |
|
363 | username or without a username will be considered. | |
364 |
|
364 | |||
365 | ``password`` |
|
365 | ``password`` | |
366 | Optional. Password to authenticate with. If not given, and the |
|
366 | Optional. Password to authenticate with. If not given, and the | |
367 | remote site requires basic or digest authentication, the user |
|
367 | remote site requires basic or digest authentication, the user | |
368 | will be prompted for it. |
|
368 | will be prompted for it. | |
369 |
|
369 | |||
370 | ``key`` |
|
370 | ``key`` | |
371 | Optional. PEM encoded client certificate key file. Environment |
|
371 | Optional. PEM encoded client certificate key file. Environment | |
372 | variables are expanded in the filename. |
|
372 | variables are expanded in the filename. | |
373 |
|
373 | |||
374 | ``cert`` |
|
374 | ``cert`` | |
375 | Optional. PEM encoded client certificate chain file. Environment |
|
375 | Optional. PEM encoded client certificate chain file. Environment | |
376 | variables are expanded in the filename. |
|
376 | variables are expanded in the filename. | |
377 |
|
377 | |||
378 | ``schemes`` |
|
378 | ``schemes`` | |
379 | Optional. Space separated list of URI schemes to use this |
|
379 | Optional. Space separated list of URI schemes to use this | |
380 | authentication entry with. Only used if the prefix doesn't include |
|
380 | authentication entry with. Only used if the prefix doesn't include | |
381 | a scheme. Supported schemes are http and https. They will match |
|
381 | a scheme. Supported schemes are http and https. They will match | |
382 | static-http and static-https respectively, as well. |
|
382 | static-http and static-https respectively, as well. | |
383 | (default: https) |
|
383 | (default: https) | |
384 |
|
384 | |||
385 | If no suitable authentication entry is found, the user is prompted |
|
385 | If no suitable authentication entry is found, the user is prompted | |
386 | for credentials as usual if required by the remote. |
|
386 | for credentials as usual if required by the remote. | |
387 |
|
387 | |||
388 |
|
388 | |||
389 | ``committemplate`` |
|
389 | ``committemplate`` | |
390 | ------------------ |
|
390 | ------------------ | |
391 |
|
391 | |||
392 | ``changeset`` |
|
392 | ``changeset`` | |
393 | String: configuration in this section is used as the template to |
|
393 | String: configuration in this section is used as the template to | |
394 | customize the text shown in the editor when committing. |
|
394 | customize the text shown in the editor when committing. | |
395 |
|
395 | |||
396 | In addition to pre-defined template keywords, commit log specific one |
|
396 | In addition to pre-defined template keywords, commit log specific one | |
397 | below can be used for customization: |
|
397 | below can be used for customization: | |
398 |
|
398 | |||
399 | ``extramsg`` |
|
399 | ``extramsg`` | |
400 | String: Extra message (typically 'Leave message empty to abort |
|
400 | String: Extra message (typically 'Leave message empty to abort | |
401 | commit.'). This may be changed by some commands or extensions. |
|
401 | commit.'). This may be changed by some commands or extensions. | |
402 |
|
402 | |||
403 | For example, the template configuration below shows as same text as |
|
403 | For example, the template configuration below shows as same text as | |
404 | one shown by default:: |
|
404 | one shown by default:: | |
405 |
|
405 | |||
406 | [committemplate] |
|
406 | [committemplate] | |
407 | changeset = {desc}\n\n |
|
407 | changeset = {desc}\n\n | |
408 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
408 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
409 | HG: {extramsg} |
|
409 | HG: {extramsg} | |
410 | HG: -- |
|
410 | HG: -- | |
411 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
|
411 | HG: user: {author}\n{ifeq(p2rev, "-1", "", | |
412 | "HG: branch merge\n") |
|
412 | "HG: branch merge\n") | |
413 | }HG: branch '{branch}'\n{if(activebookmark, |
|
413 | }HG: branch '{branch}'\n{if(activebookmark, | |
414 | "HG: bookmark '{activebookmark}'\n") }{subrepos % |
|
414 | "HG: bookmark '{activebookmark}'\n") }{subrepos % | |
415 | "HG: subrepo {subrepo}\n" }{file_adds % |
|
415 | "HG: subrepo {subrepo}\n" }{file_adds % | |
416 | "HG: added {file}\n" }{file_mods % |
|
416 | "HG: added {file}\n" }{file_mods % | |
417 | "HG: changed {file}\n" }{file_dels % |
|
417 | "HG: changed {file}\n" }{file_dels % | |
418 | "HG: removed {file}\n" }{if(files, "", |
|
418 | "HG: removed {file}\n" }{if(files, "", | |
419 | "HG: no files changed\n")} |
|
419 | "HG: no files changed\n")} | |
420 |
|
420 | |||
421 | ``diff()`` |
|
421 | ``diff()`` | |
422 | String: show the diff (see :hg:`help templates` for detail) |
|
422 | String: show the diff (see :hg:`help templates` for detail) | |
423 |
|
423 | |||
424 | Sometimes it is helpful to show the diff of the changeset in the editor without |
|
424 | Sometimes it is helpful to show the diff of the changeset in the editor without | |
425 | having to prefix 'HG: ' to each line so that highlighting works correctly. For |
|
425 | having to prefix 'HG: ' to each line so that highlighting works correctly. For | |
426 | this, Mercurial provides a special string which will ignore everything below |
|
426 | this, Mercurial provides a special string which will ignore everything below | |
427 | it:: |
|
427 | it:: | |
428 |
|
428 | |||
429 | HG: ------------------------ >8 ------------------------ |
|
429 | HG: ------------------------ >8 ------------------------ | |
430 |
|
430 | |||
431 | For example, the template configuration below will show the diff below the |
|
431 | For example, the template configuration below will show the diff below the | |
432 | extra message:: |
|
432 | extra message:: | |
433 |
|
433 | |||
434 | [committemplate] |
|
434 | [committemplate] | |
435 | changeset = {desc}\n\n |
|
435 | changeset = {desc}\n\n | |
436 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
436 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
437 | HG: {extramsg} |
|
437 | HG: {extramsg} | |
438 | HG: ------------------------ >8 ------------------------ |
|
438 | HG: ------------------------ >8 ------------------------ | |
439 | HG: Do not touch the line above. |
|
439 | HG: Do not touch the line above. | |
440 | HG: Everything below will be removed. |
|
440 | HG: Everything below will be removed. | |
441 | {diff()} |
|
441 | {diff()} | |
442 |
|
442 | |||
443 | .. note:: |
|
443 | .. note:: | |
444 |
|
444 | |||
445 | For some problematic encodings (see :hg:`help win32mbcs` for |
|
445 | For some problematic encodings (see :hg:`help win32mbcs` for | |
446 | detail), this customization should be configured carefully, to |
|
446 | detail), this customization should be configured carefully, to | |
447 | avoid showing broken characters. |
|
447 | avoid showing broken characters. | |
448 |
|
448 | |||
449 | For example, if a multibyte character ending with backslash (0x5c) is |
|
449 | For example, if a multibyte character ending with backslash (0x5c) is | |
450 | followed by the ASCII character 'n' in the customized template, |
|
450 | followed by the ASCII character 'n' in the customized template, | |
451 | the sequence of backslash and 'n' is treated as line-feed unexpectedly |
|
451 | the sequence of backslash and 'n' is treated as line-feed unexpectedly | |
452 | (and the multibyte character is broken, too). |
|
452 | (and the multibyte character is broken, too). | |
453 |
|
453 | |||
454 | Customized template is used for commands below (``--edit`` may be |
|
454 | Customized template is used for commands below (``--edit`` may be | |
455 | required): |
|
455 | required): | |
456 |
|
456 | |||
457 | - :hg:`backout` |
|
457 | - :hg:`backout` | |
458 | - :hg:`commit` |
|
458 | - :hg:`commit` | |
459 | - :hg:`fetch` (for merge commit only) |
|
459 | - :hg:`fetch` (for merge commit only) | |
460 | - :hg:`graft` |
|
460 | - :hg:`graft` | |
461 | - :hg:`histedit` |
|
461 | - :hg:`histedit` | |
462 | - :hg:`import` |
|
462 | - :hg:`import` | |
463 | - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh` |
|
463 | - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh` | |
464 | - :hg:`rebase` |
|
464 | - :hg:`rebase` | |
465 | - :hg:`shelve` |
|
465 | - :hg:`shelve` | |
466 | - :hg:`sign` |
|
466 | - :hg:`sign` | |
467 | - :hg:`tag` |
|
467 | - :hg:`tag` | |
468 | - :hg:`transplant` |
|
468 | - :hg:`transplant` | |
469 |
|
469 | |||
470 | Configuring items below instead of ``changeset`` allows showing |
|
470 | Configuring items below instead of ``changeset`` allows showing | |
471 | customized message only for specific actions, or showing different |
|
471 | customized message only for specific actions, or showing different | |
472 | messages for each action. |
|
472 | messages for each action. | |
473 |
|
473 | |||
474 | - ``changeset.backout`` for :hg:`backout` |
|
474 | - ``changeset.backout`` for :hg:`backout` | |
475 | - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges |
|
475 | - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges | |
476 | - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other |
|
476 | - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other | |
477 | - ``changeset.commit.normal.merge`` for :hg:`commit` on merges |
|
477 | - ``changeset.commit.normal.merge`` for :hg:`commit` on merges | |
478 | - ``changeset.commit.normal.normal`` for :hg:`commit` on other |
|
478 | - ``changeset.commit.normal.normal`` for :hg:`commit` on other | |
479 | - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) |
|
479 | - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) | |
480 | - ``changeset.gpg.sign`` for :hg:`sign` |
|
480 | - ``changeset.gpg.sign`` for :hg:`sign` | |
481 | - ``changeset.graft`` for :hg:`graft` |
|
481 | - ``changeset.graft`` for :hg:`graft` | |
482 | - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit` |
|
482 | - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit` | |
483 | - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit` |
|
483 | - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit` | |
484 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` |
|
484 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` | |
485 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` |
|
485 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` | |
486 | - ``changeset.import.bypass`` for :hg:`import --bypass` |
|
486 | - ``changeset.import.bypass`` for :hg:`import --bypass` | |
487 | - ``changeset.import.normal.merge`` for :hg:`import` on merges |
|
487 | - ``changeset.import.normal.merge`` for :hg:`import` on merges | |
488 | - ``changeset.import.normal.normal`` for :hg:`import` on other |
|
488 | - ``changeset.import.normal.normal`` for :hg:`import` on other | |
489 | - ``changeset.mq.qnew`` for :hg:`qnew` |
|
489 | - ``changeset.mq.qnew`` for :hg:`qnew` | |
490 | - ``changeset.mq.qfold`` for :hg:`qfold` |
|
490 | - ``changeset.mq.qfold`` for :hg:`qfold` | |
491 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` |
|
491 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` | |
492 | - ``changeset.rebase.collapse`` for :hg:`rebase --collapse` |
|
492 | - ``changeset.rebase.collapse`` for :hg:`rebase --collapse` | |
493 | - ``changeset.rebase.merge`` for :hg:`rebase` on merges |
|
493 | - ``changeset.rebase.merge`` for :hg:`rebase` on merges | |
494 | - ``changeset.rebase.normal`` for :hg:`rebase` on other |
|
494 | - ``changeset.rebase.normal`` for :hg:`rebase` on other | |
495 | - ``changeset.shelve.shelve`` for :hg:`shelve` |
|
495 | - ``changeset.shelve.shelve`` for :hg:`shelve` | |
496 | - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` |
|
496 | - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` | |
497 | - ``changeset.tag.remove`` for :hg:`tag --remove` |
|
497 | - ``changeset.tag.remove`` for :hg:`tag --remove` | |
498 | - ``changeset.transplant.merge`` for :hg:`transplant` on merges |
|
498 | - ``changeset.transplant.merge`` for :hg:`transplant` on merges | |
499 | - ``changeset.transplant.normal`` for :hg:`transplant` on other |
|
499 | - ``changeset.transplant.normal`` for :hg:`transplant` on other | |
500 |
|
500 | |||
501 | These dot-separated lists of names are treated as hierarchical ones. |
|
501 | These dot-separated lists of names are treated as hierarchical ones. | |
502 | For example, ``changeset.tag.remove`` customizes the commit message |
|
502 | For example, ``changeset.tag.remove`` customizes the commit message | |
503 | only for :hg:`tag --remove`, but ``changeset.tag`` customizes the |
|
503 | only for :hg:`tag --remove`, but ``changeset.tag`` customizes the | |
504 | commit message for :hg:`tag` regardless of ``--remove`` option. |
|
504 | commit message for :hg:`tag` regardless of ``--remove`` option. | |
505 |
|
505 | |||
506 | When the external editor is invoked for a commit, the corresponding |
|
506 | When the external editor is invoked for a commit, the corresponding | |
507 | dot-separated list of names without the ``changeset.`` prefix |
|
507 | dot-separated list of names without the ``changeset.`` prefix | |
508 | (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment |
|
508 | (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment | |
509 | variable. |
|
509 | variable. | |
510 |
|
510 | |||
511 | In this section, items other than ``changeset`` can be referred from |
|
511 | In this section, items other than ``changeset`` can be referred from | |
512 | others. For example, the configuration to list committed files up |
|
512 | others. For example, the configuration to list committed files up | |
513 | below can be referred as ``{listupfiles}``:: |
|
513 | below can be referred as ``{listupfiles}``:: | |
514 |
|
514 | |||
515 | [committemplate] |
|
515 | [committemplate] | |
516 | listupfiles = {file_adds % |
|
516 | listupfiles = {file_adds % | |
517 | "HG: added {file}\n" }{file_mods % |
|
517 | "HG: added {file}\n" }{file_mods % | |
518 | "HG: changed {file}\n" }{file_dels % |
|
518 | "HG: changed {file}\n" }{file_dels % | |
519 | "HG: removed {file}\n" }{if(files, "", |
|
519 | "HG: removed {file}\n" }{if(files, "", | |
520 | "HG: no files changed\n")} |
|
520 | "HG: no files changed\n")} | |
521 |
|
521 | |||
522 | ``decode/encode`` |
|
522 | ``decode/encode`` | |
523 | ----------------- |
|
523 | ----------------- | |
524 |
|
524 | |||
525 | Filters for transforming files on checkout/checkin. This would |
|
525 | Filters for transforming files on checkout/checkin. This would | |
526 | typically be used for newline processing or other |
|
526 | typically be used for newline processing or other | |
527 | localization/canonicalization of files. |
|
527 | localization/canonicalization of files. | |
528 |
|
528 | |||
529 | Filters consist of a filter pattern followed by a filter command. |
|
529 | Filters consist of a filter pattern followed by a filter command. | |
530 | Filter patterns are globs by default, rooted at the repository root. |
|
530 | Filter patterns are globs by default, rooted at the repository root. | |
531 | For example, to match any file ending in ``.txt`` in the root |
|
531 | For example, to match any file ending in ``.txt`` in the root | |
532 | directory only, use the pattern ``*.txt``. To match any file ending |
|
532 | directory only, use the pattern ``*.txt``. To match any file ending | |
533 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. |
|
533 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. | |
534 | For each file only the first matching filter applies. |
|
534 | For each file only the first matching filter applies. | |
535 |
|
535 | |||
536 | The filter command can start with a specifier, either ``pipe:`` or |
|
536 | The filter command can start with a specifier, either ``pipe:`` or | |
537 | ``tempfile:``. If no specifier is given, ``pipe:`` is used by default. |
|
537 | ``tempfile:``. If no specifier is given, ``pipe:`` is used by default. | |
538 |
|
538 | |||
539 | A ``pipe:`` command must accept data on stdin and return the transformed |
|
539 | A ``pipe:`` command must accept data on stdin and return the transformed | |
540 | data on stdout. |
|
540 | data on stdout. | |
541 |
|
541 | |||
542 | Pipe example:: |
|
542 | Pipe example:: | |
543 |
|
543 | |||
544 | [encode] |
|
544 | [encode] | |
545 | # uncompress gzip files on checkin to improve delta compression |
|
545 | # uncompress gzip files on checkin to improve delta compression | |
546 | # note: not necessarily a good idea, just an example |
|
546 | # note: not necessarily a good idea, just an example | |
547 | *.gz = pipe: gunzip |
|
547 | *.gz = pipe: gunzip | |
548 |
|
548 | |||
549 | [decode] |
|
549 | [decode] | |
550 | # recompress gzip files when writing them to the working dir (we |
|
550 | # recompress gzip files when writing them to the working dir (we | |
551 | # can safely omit "pipe:", because it's the default) |
|
551 | # can safely omit "pipe:", because it's the default) | |
552 | *.gz = gzip |
|
552 | *.gz = gzip | |
553 |
|
553 | |||
554 | A ``tempfile:`` command is a template. The string ``INFILE`` is replaced |
|
554 | A ``tempfile:`` command is a template. The string ``INFILE`` is replaced | |
555 | with the name of a temporary file that contains the data to be |
|
555 | with the name of a temporary file that contains the data to be | |
556 | filtered by the command. The string ``OUTFILE`` is replaced with the name |
|
556 | filtered by the command. The string ``OUTFILE`` is replaced with the name | |
557 | of an empty temporary file, where the filtered data must be written by |
|
557 | of an empty temporary file, where the filtered data must be written by | |
558 | the command. |
|
558 | the command. | |
559 |
|
559 | |||
560 | .. container:: windows |
|
560 | .. container:: windows | |
561 |
|
561 | |||
562 | .. note:: |
|
562 | .. note:: | |
563 |
|
563 | |||
564 | The tempfile mechanism is recommended for Windows systems, |
|
564 | The tempfile mechanism is recommended for Windows systems, | |
565 | where the standard shell I/O redirection operators often have |
|
565 | where the standard shell I/O redirection operators often have | |
566 | strange effects and may corrupt the contents of your files. |
|
566 | strange effects and may corrupt the contents of your files. | |
567 |
|
567 | |||
568 | This filter mechanism is used internally by the ``eol`` extension to |
|
568 | This filter mechanism is used internally by the ``eol`` extension to | |
569 | translate line ending characters between Windows (CRLF) and Unix (LF) |
|
569 | translate line ending characters between Windows (CRLF) and Unix (LF) | |
570 | format. We suggest you use the ``eol`` extension for convenience. |
|
570 | format. We suggest you use the ``eol`` extension for convenience. | |
571 |
|
571 | |||
572 |
|
572 | |||
573 | ``defaults`` |
|
573 | ``defaults`` | |
574 | ------------ |
|
574 | ------------ | |
575 |
|
575 | |||
576 | (defaults are deprecated. Don't use them. Use aliases instead.) |
|
576 | (defaults are deprecated. Don't use them. Use aliases instead.) | |
577 |
|
577 | |||
578 | Use the ``[defaults]`` section to define command defaults, i.e. the |
|
578 | Use the ``[defaults]`` section to define command defaults, i.e. the | |
579 | default options/arguments to pass to the specified commands. |
|
579 | default options/arguments to pass to the specified commands. | |
580 |
|
580 | |||
581 | The following example makes :hg:`log` run in verbose mode, and |
|
581 | The following example makes :hg:`log` run in verbose mode, and | |
582 | :hg:`status` show only the modified files, by default:: |
|
582 | :hg:`status` show only the modified files, by default:: | |
583 |
|
583 | |||
584 | [defaults] |
|
584 | [defaults] | |
585 | log = -v |
|
585 | log = -v | |
586 | status = -m |
|
586 | status = -m | |
587 |
|
587 | |||
588 | The actual commands, instead of their aliases, must be used when |
|
588 | The actual commands, instead of their aliases, must be used when | |
589 | defining command defaults. The command defaults will also be applied |
|
589 | defining command defaults. The command defaults will also be applied | |
590 | to the aliases of the commands defined. |
|
590 | to the aliases of the commands defined. | |
591 |
|
591 | |||
592 |
|
592 | |||
593 | ``diff`` |
|
593 | ``diff`` | |
594 | -------- |
|
594 | -------- | |
595 |
|
595 | |||
596 | Settings used when displaying diffs. Everything except for ``unified`` |
|
596 | Settings used when displaying diffs. Everything except for ``unified`` | |
597 | is a Boolean and defaults to False. See :hg:`help config.annotate` |
|
597 | is a Boolean and defaults to False. See :hg:`help config.annotate` | |
598 | for related options for the annotate command. |
|
598 | for related options for the annotate command. | |
599 |
|
599 | |||
600 | ``git`` |
|
600 | ``git`` | |
601 | Use git extended diff format. |
|
601 | Use git extended diff format. | |
602 |
|
602 | |||
603 | ``nobinary`` |
|
603 | ``nobinary`` | |
604 | Omit git binary patches. |
|
604 | Omit git binary patches. | |
605 |
|
605 | |||
606 | ``nodates`` |
|
606 | ``nodates`` | |
607 | Don't include dates in diff headers. |
|
607 | Don't include dates in diff headers. | |
608 |
|
608 | |||
609 | ``noprefix`` |
|
609 | ``noprefix`` | |
610 | Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode. |
|
610 | Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode. | |
611 |
|
611 | |||
612 | ``showfunc`` |
|
612 | ``showfunc`` | |
613 | Show which function each change is in. |
|
613 | Show which function each change is in. | |
614 |
|
614 | |||
615 | ``ignorews`` |
|
615 | ``ignorews`` | |
616 | Ignore white space when comparing lines. |
|
616 | Ignore white space when comparing lines. | |
617 |
|
617 | |||
618 | ``ignorewsamount`` |
|
618 | ``ignorewsamount`` | |
619 | Ignore changes in the amount of white space. |
|
619 | Ignore changes in the amount of white space. | |
620 |
|
620 | |||
621 | ``ignoreblanklines`` |
|
621 | ``ignoreblanklines`` | |
622 | Ignore changes whose lines are all blank. |
|
622 | Ignore changes whose lines are all blank. | |
623 |
|
623 | |||
624 | ``unified`` |
|
624 | ``unified`` | |
625 | Number of lines of context to show. |
|
625 | Number of lines of context to show. | |
626 |
|
626 | |||
627 | ``email`` |
|
627 | ``email`` | |
628 | --------- |
|
628 | --------- | |
629 |
|
629 | |||
630 | Settings for extensions that send email messages. |
|
630 | Settings for extensions that send email messages. | |
631 |
|
631 | |||
632 | ``from`` |
|
632 | ``from`` | |
633 | Optional. Email address to use in "From" header and SMTP envelope |
|
633 | Optional. Email address to use in "From" header and SMTP envelope | |
634 | of outgoing messages. |
|
634 | of outgoing messages. | |
635 |
|
635 | |||
636 | ``to`` |
|
636 | ``to`` | |
637 | Optional. Comma-separated list of recipients' email addresses. |
|
637 | Optional. Comma-separated list of recipients' email addresses. | |
638 |
|
638 | |||
639 | ``cc`` |
|
639 | ``cc`` | |
640 | Optional. Comma-separated list of carbon copy recipients' |
|
640 | Optional. Comma-separated list of carbon copy recipients' | |
641 | email addresses. |
|
641 | email addresses. | |
642 |
|
642 | |||
643 | ``bcc`` |
|
643 | ``bcc`` | |
644 | Optional. Comma-separated list of blind carbon copy recipients' |
|
644 | Optional. Comma-separated list of blind carbon copy recipients' | |
645 | email addresses. |
|
645 | email addresses. | |
646 |
|
646 | |||
647 | ``method`` |
|
647 | ``method`` | |
648 | Optional. Method to use to send email messages. If value is ``smtp`` |
|
648 | Optional. Method to use to send email messages. If value is ``smtp`` | |
649 | (default), use SMTP (see the ``[smtp]`` section for configuration). |
|
649 | (default), use SMTP (see the ``[smtp]`` section for configuration). | |
650 | Otherwise, use as name of program to run that acts like sendmail |
|
650 | Otherwise, use as name of program to run that acts like sendmail | |
651 | (takes ``-f`` option for sender, list of recipients on command line, |
|
651 | (takes ``-f`` option for sender, list of recipients on command line, | |
652 | message on stdin). Normally, setting this to ``sendmail`` or |
|
652 | message on stdin). Normally, setting this to ``sendmail`` or | |
653 | ``/usr/sbin/sendmail`` is enough to use sendmail to send messages. |
|
653 | ``/usr/sbin/sendmail`` is enough to use sendmail to send messages. | |
654 |
|
654 | |||
655 | ``charsets`` |
|
655 | ``charsets`` | |
656 | Optional. Comma-separated list of character sets considered |
|
656 | Optional. Comma-separated list of character sets considered | |
657 | convenient for recipients. Addresses, headers, and parts not |
|
657 | convenient for recipients. Addresses, headers, and parts not | |
658 | containing patches of outgoing messages will be encoded in the |
|
658 | containing patches of outgoing messages will be encoded in the | |
659 | first character set to which conversion from local encoding |
|
659 | first character set to which conversion from local encoding | |
660 | (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct |
|
660 | (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct | |
661 | conversion fails, the text in question is sent as is. |
|
661 | conversion fails, the text in question is sent as is. | |
662 | (default: '') |
|
662 | (default: '') | |
663 |
|
663 | |||
664 | Order of outgoing email character sets: |
|
664 | Order of outgoing email character sets: | |
665 |
|
665 | |||
666 | 1. ``us-ascii``: always first, regardless of settings |
|
666 | 1. ``us-ascii``: always first, regardless of settings | |
667 | 2. ``email.charsets``: in order given by user |
|
667 | 2. ``email.charsets``: in order given by user | |
668 | 3. ``ui.fallbackencoding``: if not in email.charsets |
|
668 | 3. ``ui.fallbackencoding``: if not in email.charsets | |
669 | 4. ``$HGENCODING``: if not in email.charsets |
|
669 | 4. ``$HGENCODING``: if not in email.charsets | |
670 | 5. ``utf-8``: always last, regardless of settings |
|
670 | 5. ``utf-8``: always last, regardless of settings | |
671 |
|
671 | |||
672 | Email example:: |
|
672 | Email example:: | |
673 |
|
673 | |||
674 | [email] |
|
674 | [email] | |
675 | from = Joseph User <joe.user@example.com> |
|
675 | from = Joseph User <joe.user@example.com> | |
676 | method = /usr/sbin/sendmail |
|
676 | method = /usr/sbin/sendmail | |
677 | # charsets for western Europeans |
|
677 | # charsets for western Europeans | |
678 | # us-ascii, utf-8 omitted, as they are tried first and last |
|
678 | # us-ascii, utf-8 omitted, as they are tried first and last | |
679 | charsets = iso-8859-1, iso-8859-15, windows-1252 |
|
679 | charsets = iso-8859-1, iso-8859-15, windows-1252 | |
680 |
|
680 | |||
681 |
|
681 | |||
682 | ``extensions`` |
|
682 | ``extensions`` | |
683 | -------------- |
|
683 | -------------- | |
684 |
|
684 | |||
685 | Mercurial has an extension mechanism for adding new features. To |
|
685 | Mercurial has an extension mechanism for adding new features. To | |
686 | enable an extension, create an entry for it in this section. |
|
686 | enable an extension, create an entry for it in this section. | |
687 |
|
687 | |||
688 | If you know that the extension is already in Python's search path, |
|
688 | If you know that the extension is already in Python's search path, | |
689 | you can give the name of the module, followed by ``=``, with nothing |
|
689 | you can give the name of the module, followed by ``=``, with nothing | |
690 | after the ``=``. |
|
690 | after the ``=``. | |
691 |
|
691 | |||
692 | Otherwise, give a name that you choose, followed by ``=``, followed by |
|
692 | Otherwise, give a name that you choose, followed by ``=``, followed by | |
693 | the path to the ``.py`` file (including the file name extension) that |
|
693 | the path to the ``.py`` file (including the file name extension) that | |
694 | defines the extension. |
|
694 | defines the extension. | |
695 |
|
695 | |||
696 | To explicitly disable an extension that is enabled in an hgrc of |
|
696 | To explicitly disable an extension that is enabled in an hgrc of | |
697 | broader scope, prepend its path with ``!``, as in ``foo = !/ext/path`` |
|
697 | broader scope, prepend its path with ``!``, as in ``foo = !/ext/path`` | |
698 | or ``foo = !`` when path is not supplied. |
|
698 | or ``foo = !`` when path is not supplied. | |
699 |
|
699 | |||
700 | Example for ``~/.hgrc``:: |
|
700 | Example for ``~/.hgrc``:: | |
701 |
|
701 | |||
702 | [extensions] |
|
702 | [extensions] | |
703 | # (the color extension will get loaded from Mercurial's path) |
|
703 | # (the color extension will get loaded from Mercurial's path) | |
704 | color = |
|
704 | color = | |
705 | # (this extension will get loaded from the file specified) |
|
705 | # (this extension will get loaded from the file specified) | |
706 | myfeature = ~/.hgext/myfeature.py |
|
706 | myfeature = ~/.hgext/myfeature.py | |
707 |
|
707 | |||
708 |
|
708 | |||
709 | ``format`` |
|
709 | ``format`` | |
710 | ---------- |
|
710 | ---------- | |
711 |
|
711 | |||
712 | ``usegeneraldelta`` |
|
712 | ``usegeneraldelta`` | |
713 | Enable or disable the "generaldelta" repository format which improves |
|
713 | Enable or disable the "generaldelta" repository format which improves | |
714 | repository compression by allowing "revlog" to store delta against arbitrary |
|
714 | repository compression by allowing "revlog" to store delta against arbitrary | |
715 | revision instead of the previous stored one. This provides significant |
|
715 | revision instead of the previous stored one. This provides significant | |
716 | improvement for repositories with branches. |
|
716 | improvement for repositories with branches. | |
717 |
|
717 | |||
718 | Repositories with this on-disk format require Mercurial version 1.9. |
|
718 | Repositories with this on-disk format require Mercurial version 1.9. | |
719 |
|
719 | |||
720 | Enabled by default. |
|
720 | Enabled by default. | |
721 |
|
721 | |||
722 | ``dotencode`` |
|
722 | ``dotencode`` | |
723 | Enable or disable the "dotencode" repository format which enhances |
|
723 | Enable or disable the "dotencode" repository format which enhances | |
724 | the "fncache" repository format (which has to be enabled to use |
|
724 | the "fncache" repository format (which has to be enabled to use | |
725 | dotencode) to avoid issues with filenames starting with ._ on |
|
725 | dotencode) to avoid issues with filenames starting with ._ on | |
726 | Mac OS X and spaces on Windows. |
|
726 | Mac OS X and spaces on Windows. | |
727 |
|
727 | |||
728 | Repositories with this on-disk format require Mercurial version 1.7. |
|
728 | Repositories with this on-disk format require Mercurial version 1.7. | |
729 |
|
729 | |||
730 | Enabled by default. |
|
730 | Enabled by default. | |
731 |
|
731 | |||
732 | ``usefncache`` |
|
732 | ``usefncache`` | |
733 | Enable or disable the "fncache" repository format which enhances |
|
733 | Enable or disable the "fncache" repository format which enhances | |
734 | the "store" repository format (which has to be enabled to use |
|
734 | the "store" repository format (which has to be enabled to use | |
735 | fncache) to allow longer filenames and avoids using Windows |
|
735 | fncache) to allow longer filenames and avoids using Windows | |
736 | reserved names, e.g. "nul". |
|
736 | reserved names, e.g. "nul". | |
737 |
|
737 | |||
738 | Repositories with this on-disk format require Mercurial version 1.1. |
|
738 | Repositories with this on-disk format require Mercurial version 1.1. | |
739 |
|
739 | |||
740 | Enabled by default. |
|
740 | Enabled by default. | |
741 |
|
741 | |||
742 | ``usestore`` |
|
742 | ``usestore`` | |
743 | Enable or disable the "store" repository format which improves |
|
743 | Enable or disable the "store" repository format which improves | |
744 | compatibility with systems that fold case or otherwise mangle |
|
744 | compatibility with systems that fold case or otherwise mangle | |
745 | filenames. Disabling this option will allow you to store longer filenames |
|
745 | filenames. Disabling this option will allow you to store longer filenames | |
746 | in some situations at the expense of compatibility. |
|
746 | in some situations at the expense of compatibility. | |
747 |
|
747 | |||
748 | Repositories with this on-disk format require Mercurial version 0.9.4. |
|
748 | Repositories with this on-disk format require Mercurial version 0.9.4. | |
749 |
|
749 | |||
750 | Enabled by default. |
|
750 | Enabled by default. | |
751 |
|
751 | |||
752 | ``graph`` |
|
752 | ``graph`` | |
753 | --------- |
|
753 | --------- | |
754 |
|
754 | |||
755 | Web graph view configuration. This section let you change graph |
|
755 | Web graph view configuration. This section let you change graph | |
756 | elements display properties by branches, for instance to make the |
|
756 | elements display properties by branches, for instance to make the | |
757 | ``default`` branch stand out. |
|
757 | ``default`` branch stand out. | |
758 |
|
758 | |||
759 | Each line has the following format:: |
|
759 | Each line has the following format:: | |
760 |
|
760 | |||
761 | <branch>.<argument> = <value> |
|
761 | <branch>.<argument> = <value> | |
762 |
|
762 | |||
763 | where ``<branch>`` is the name of the branch being |
|
763 | where ``<branch>`` is the name of the branch being | |
764 | customized. Example:: |
|
764 | customized. Example:: | |
765 |
|
765 | |||
766 | [graph] |
|
766 | [graph] | |
767 | # 2px width |
|
767 | # 2px width | |
768 | default.width = 2 |
|
768 | default.width = 2 | |
769 | # red color |
|
769 | # red color | |
770 | default.color = FF0000 |
|
770 | default.color = FF0000 | |
771 |
|
771 | |||
772 | Supported arguments: |
|
772 | Supported arguments: | |
773 |
|
773 | |||
774 | ``width`` |
|
774 | ``width`` | |
775 | Set branch edges width in pixels. |
|
775 | Set branch edges width in pixels. | |
776 |
|
776 | |||
777 | ``color`` |
|
777 | ``color`` | |
778 | Set branch edges color in hexadecimal RGB notation. |
|
778 | Set branch edges color in hexadecimal RGB notation. | |
779 |
|
779 | |||
780 | ``hooks`` |
|
780 | ``hooks`` | |
781 | --------- |
|
781 | --------- | |
782 |
|
782 | |||
783 | Commands or Python functions that get automatically executed by |
|
783 | Commands or Python functions that get automatically executed by | |
784 | various actions such as starting or finishing a commit. Multiple |
|
784 | various actions such as starting or finishing a commit. Multiple | |
785 | hooks can be run for the same action by appending a suffix to the |
|
785 | hooks can be run for the same action by appending a suffix to the | |
786 | action. Overriding a site-wide hook can be done by changing its |
|
786 | action. Overriding a site-wide hook can be done by changing its | |
787 | value or setting it to an empty string. Hooks can be prioritized |
|
787 | value or setting it to an empty string. Hooks can be prioritized | |
788 | by adding a prefix of ``priority.`` to the hook name on a new line |
|
788 | by adding a prefix of ``priority.`` to the hook name on a new line | |
789 | and setting the priority. The default priority is 0. |
|
789 | and setting the priority. The default priority is 0. | |
790 |
|
790 | |||
791 | Example ``.hg/hgrc``:: |
|
791 | Example ``.hg/hgrc``:: | |
792 |
|
792 | |||
793 | [hooks] |
|
793 | [hooks] | |
794 | # update working directory after adding changesets |
|
794 | # update working directory after adding changesets | |
795 | changegroup.update = hg update |
|
795 | changegroup.update = hg update | |
796 | # do not use the site-wide hook |
|
796 | # do not use the site-wide hook | |
797 | incoming = |
|
797 | incoming = | |
798 | incoming.email = /my/email/hook |
|
798 | incoming.email = /my/email/hook | |
799 | incoming.autobuild = /my/build/hook |
|
799 | incoming.autobuild = /my/build/hook | |
800 | # force autobuild hook to run before other incoming hooks |
|
800 | # force autobuild hook to run before other incoming hooks | |
801 | priority.incoming.autobuild = 1 |
|
801 | priority.incoming.autobuild = 1 | |
802 |
|
802 | |||
803 | Most hooks are run with environment variables set that give useful |
|
803 | Most hooks are run with environment variables set that give useful | |
804 | additional information. For each hook below, the environment |
|
804 | additional information. For each hook below, the environment | |
805 | variables it is passed are listed with names of the form ``$HG_foo``. |
|
805 | variables it is passed are listed with names of the form ``$HG_foo``. | |
806 |
|
806 | |||
807 | ``changegroup`` |
|
807 | ``changegroup`` | |
808 | Run after a changegroup has been added via push, pull or unbundle. ID of the |
|
808 | Run after a changegroup has been added via push, pull or unbundle. ID of the | |
809 | first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL |
|
809 | first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL | |
810 | from which changes came is in ``$HG_URL``. |
|
810 | from which changes came is in ``$HG_URL``. | |
811 |
|
811 | |||
812 | ``commit`` |
|
812 | ``commit`` | |
813 | Run after a changeset has been created in the local repository. ID |
|
813 | Run after a changeset has been created in the local repository. ID | |
814 | of the newly created changeset is in ``$HG_NODE``. Parent changeset |
|
814 | of the newly created changeset is in ``$HG_NODE``. Parent changeset | |
815 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
815 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
816 |
|
816 | |||
817 | ``incoming`` |
|
817 | ``incoming`` | |
818 | Run after a changeset has been pulled, pushed, or unbundled into |
|
818 | Run after a changeset has been pulled, pushed, or unbundled into | |
819 | the local repository. The ID of the newly arrived changeset is in |
|
819 | the local repository. The ID of the newly arrived changeset is in | |
820 | ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``. |
|
820 | ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``. | |
821 |
|
821 | |||
822 | ``outgoing`` |
|
822 | ``outgoing`` | |
823 | Run after sending changes from local repository to another. ID of |
|
823 | Run after sending changes from local repository to another. ID of | |
824 | first changeset sent is in ``$HG_NODE``. Source of operation is in |
|
824 | first changeset sent is in ``$HG_NODE``. Source of operation is in | |
825 | ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook. |
|
825 | ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook. | |
826 |
|
826 | |||
827 | ``post-<command>`` |
|
827 | ``post-<command>`` | |
828 | Run after successful invocations of the associated command. The |
|
828 | Run after successful invocations of the associated command. The | |
829 | contents of the command line are passed as ``$HG_ARGS`` and the result |
|
829 | contents of the command line are passed as ``$HG_ARGS`` and the result | |
830 | code in ``$HG_RESULT``. Parsed command line arguments are passed as |
|
830 | code in ``$HG_RESULT``. Parsed command line arguments are passed as | |
831 | ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of |
|
831 | ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of | |
832 | the python data internally passed to <command>. ``$HG_OPTS`` is a |
|
832 | the python data internally passed to <command>. ``$HG_OPTS`` is a | |
833 | dictionary of options (with unspecified options set to their defaults). |
|
833 | dictionary of options (with unspecified options set to their defaults). | |
834 | ``$HG_PATS`` is a list of arguments. Hook failure is ignored. |
|
834 | ``$HG_PATS`` is a list of arguments. Hook failure is ignored. | |
835 |
|
835 | |||
836 | ``fail-<command>`` |
|
836 | ``fail-<command>`` | |
837 | Run after a failed invocation of an associated command. The contents |
|
837 | Run after a failed invocation of an associated command. The contents | |
838 | of the command line are passed as ``$HG_ARGS``. Parsed command line |
|
838 | of the command line are passed as ``$HG_ARGS``. Parsed command line | |
839 | arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain |
|
839 | arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain | |
840 | string representations of the python data internally passed to |
|
840 | string representations of the python data internally passed to | |
841 | <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified |
|
841 | <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified | |
842 | options set to their defaults). ``$HG_PATS`` is a list of arguments. |
|
842 | options set to their defaults). ``$HG_PATS`` is a list of arguments. | |
843 | Hook failure is ignored. |
|
843 | Hook failure is ignored. | |
844 |
|
844 | |||
845 | ``pre-<command>`` |
|
845 | ``pre-<command>`` | |
846 | Run before executing the associated command. The contents of the |
|
846 | Run before executing the associated command. The contents of the | |
847 | command line are passed as ``$HG_ARGS``. Parsed command line arguments |
|
847 | command line are passed as ``$HG_ARGS``. Parsed command line arguments | |
848 | are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string |
|
848 | are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string | |
849 | representations of the data internally passed to <command>. ``$HG_OPTS`` |
|
849 | representations of the data internally passed to <command>. ``$HG_OPTS`` | |
850 | is a dictionary of options (with unspecified options set to their |
|
850 | is a dictionary of options (with unspecified options set to their | |
851 | defaults). ``$HG_PATS`` is a list of arguments. If the hook returns |
|
851 | defaults). ``$HG_PATS`` is a list of arguments. If the hook returns | |
852 | failure, the command doesn't execute and Mercurial returns the failure |
|
852 | failure, the command doesn't execute and Mercurial returns the failure | |
853 | code. |
|
853 | code. | |
854 |
|
854 | |||
855 | ``prechangegroup`` |
|
855 | ``prechangegroup`` | |
856 | Run before a changegroup is added via push, pull or unbundle. Exit |
|
856 | Run before a changegroup is added via push, pull or unbundle. Exit | |
857 | status 0 allows the changegroup to proceed. Non-zero status will |
|
857 | status 0 allows the changegroup to proceed. Non-zero status will | |
858 | cause the push, pull or unbundle to fail. URL from which changes |
|
858 | cause the push, pull or unbundle to fail. URL from which changes | |
859 | will come is in ``$HG_URL``. |
|
859 | will come is in ``$HG_URL``. | |
860 |
|
860 | |||
861 | ``precommit`` |
|
861 | ``precommit`` | |
862 | Run before starting a local commit. Exit status 0 allows the |
|
862 | Run before starting a local commit. Exit status 0 allows the | |
863 | commit to proceed. Non-zero status will cause the commit to fail. |
|
863 | commit to proceed. Non-zero status will cause the commit to fail. | |
864 | Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
864 | Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
865 |
|
865 | |||
866 | ``prelistkeys`` |
|
866 | ``prelistkeys`` | |
867 | Run before listing pushkeys (like bookmarks) in the |
|
867 | Run before listing pushkeys (like bookmarks) in the | |
868 | repository. Non-zero status will cause failure. The key namespace is |
|
868 | repository. Non-zero status will cause failure. The key namespace is | |
869 | in ``$HG_NAMESPACE``. |
|
869 | in ``$HG_NAMESPACE``. | |
870 |
|
870 | |||
871 | ``preoutgoing`` |
|
871 | ``preoutgoing`` | |
872 | Run before collecting changes to send from the local repository to |
|
872 | Run before collecting changes to send from the local repository to | |
873 | another. Non-zero status will cause failure. This lets you prevent |
|
873 | another. Non-zero status will cause failure. This lets you prevent | |
874 | pull over HTTP or SSH. Also prevents against local pull, push |
|
874 | pull over HTTP or SSH. Also prevents against local pull, push | |
875 | (outbound) or bundle commands, but not effective, since you can |
|
875 | (outbound) or bundle commands, but not effective, since you can | |
876 | just copy files instead then. Source of operation is in |
|
876 | just copy files instead then. Source of operation is in | |
877 | ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote |
|
877 | ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote | |
878 | SSH or HTTP repository. If "push", "pull" or "bundle", operation |
|
878 | SSH or HTTP repository. If "push", "pull" or "bundle", operation | |
879 | is happening on behalf of repository on same system. |
|
879 | is happening on behalf of repository on same system. | |
880 |
|
880 | |||
881 | ``prepushkey`` |
|
881 | ``prepushkey`` | |
882 | Run before a pushkey (like a bookmark) is added to the |
|
882 | Run before a pushkey (like a bookmark) is added to the | |
883 | repository. Non-zero status will cause the key to be rejected. The |
|
883 | repository. Non-zero status will cause the key to be rejected. The | |
884 | key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``, |
|
884 | key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``, | |
885 | the old value (if any) is in ``$HG_OLD``, and the new value is in |
|
885 | the old value (if any) is in ``$HG_OLD``, and the new value is in | |
886 | ``$HG_NEW``. |
|
886 | ``$HG_NEW``. | |
887 |
|
887 | |||
888 | ``pretag`` |
|
888 | ``pretag`` | |
889 | Run before creating a tag. Exit status 0 allows the tag to be |
|
889 | Run before creating a tag. Exit status 0 allows the tag to be | |
890 | created. Non-zero status will cause the tag to fail. ID of |
|
890 | created. Non-zero status will cause the tag to fail. ID of | |
891 | changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is |
|
891 | changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is | |
892 | local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``. |
|
892 | local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``. | |
893 |
|
893 | |||
894 | ``pretxnopen`` |
|
894 | ``pretxnopen`` | |
895 | Run before any new repository transaction is open. The reason for the |
|
895 | Run before any new repository transaction is open. The reason for the | |
896 | transaction will be in ``$HG_TXNNAME`` and a unique identifier for the |
|
896 | transaction will be in ``$HG_TXNNAME`` and a unique identifier for the | |
897 | transaction will be in ``HG_TXNID``. A non-zero status will prevent the |
|
897 | transaction will be in ``HG_TXNID``. A non-zero status will prevent the | |
898 | transaction from being opened. |
|
898 | transaction from being opened. | |
899 |
|
899 | |||
900 | ``pretxnclose`` |
|
900 | ``pretxnclose`` | |
901 | Run right before the transaction is actually finalized. Any repository change |
|
901 | Run right before the transaction is actually finalized. Any repository change | |
902 | will be visible to the hook program. This lets you validate the transaction |
|
902 | will be visible to the hook program. This lets you validate the transaction | |
903 | content or change it. Exit status 0 allows the commit to proceed. Non-zero |
|
903 | content or change it. Exit status 0 allows the commit to proceed. Non-zero | |
904 | status will cause the transaction to be rolled back. The reason for the |
|
904 | status will cause the transaction to be rolled back. The reason for the | |
905 | transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for |
|
905 | transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for | |
906 | the transaction will be in ``HG_TXNID``. The rest of the available data will |
|
906 | the transaction will be in ``HG_TXNID``. The rest of the available data will | |
907 | vary according the transaction type. New changesets will add ``$HG_NODE`` (id |
|
907 | vary according the transaction type. New changesets will add ``$HG_NODE`` (id | |
908 | of the first added changeset), ``$HG_NODE_LAST`` (id of the last added |
|
908 | of the first added changeset), ``$HG_NODE_LAST`` (id of the last added | |
909 | changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases |
|
909 | changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases | |
910 | changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc. |
|
910 | changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc. | |
911 |
|
911 | |||
912 | ``txnclose`` |
|
912 | ``txnclose`` | |
913 | Run after any repository transaction has been committed. At this |
|
913 | Run after any repository transaction has been committed. At this | |
914 | point, the transaction can no longer be rolled back. The hook will run |
|
914 | point, the transaction can no longer be rolled back. The hook will run | |
915 | after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for |
|
915 | after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for | |
916 | details about available variables. |
|
916 | details about available variables. | |
917 |
|
917 | |||
918 | ``txnabort`` |
|
918 | ``txnabort`` | |
919 | Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose` |
|
919 | Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose` | |
920 | docs for details about available variables. |
|
920 | docs for details about available variables. | |
921 |
|
921 | |||
922 | ``pretxnchangegroup`` |
|
922 | ``pretxnchangegroup`` | |
923 | Run after a changegroup has been added via push, pull or unbundle, but before |
|
923 | Run after a changegroup has been added via push, pull or unbundle, but before | |
924 | the transaction has been committed. Changegroup is visible to hook program. |
|
924 | the transaction has been committed. Changegroup is visible to hook program. | |
925 | This lets you validate incoming changes before accepting them. Passed the ID |
|
925 | This lets you validate incoming changes before accepting them. Passed the ID | |
926 | of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. |
|
926 | of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. | |
927 | Exit status 0 allows the transaction to commit. Non-zero status will cause |
|
927 | Exit status 0 allows the transaction to commit. Non-zero status will cause | |
928 | the transaction to be rolled back and the push, pull or unbundle will fail. |
|
928 | the transaction to be rolled back and the push, pull or unbundle will fail. | |
929 | URL that was source of changes is in ``$HG_URL``. |
|
929 | URL that was source of changes is in ``$HG_URL``. | |
930 |
|
930 | |||
931 | ``pretxncommit`` |
|
931 | ``pretxncommit`` | |
932 | Run after a changeset has been created but the transaction not yet |
|
932 | Run after a changeset has been created but the transaction not yet | |
933 | committed. Changeset is visible to hook program. This lets you |
|
933 | committed. Changeset is visible to hook program. This lets you | |
934 | validate commit message and changes. Exit status 0 allows the |
|
934 | validate commit message and changes. Exit status 0 allows the | |
935 | commit to proceed. Non-zero status will cause the transaction to |
|
935 | commit to proceed. Non-zero status will cause the transaction to | |
936 | be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset |
|
936 | be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset | |
937 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
937 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
938 |
|
938 | |||
939 | ``preupdate`` |
|
939 | ``preupdate`` | |
940 | Run before updating the working directory. Exit status 0 allows |
|
940 | Run before updating the working directory. Exit status 0 allows | |
941 | the update to proceed. Non-zero status will prevent the update. |
|
941 | the update to proceed. Non-zero status will prevent the update. | |
942 | Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID |
|
942 | Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID | |
943 | of second new parent is in ``$HG_PARENT2``. |
|
943 | of second new parent is in ``$HG_PARENT2``. | |
944 |
|
944 | |||
945 | ``listkeys`` |
|
945 | ``listkeys`` | |
946 | Run after listing pushkeys (like bookmarks) in the repository. The |
|
946 | Run after listing pushkeys (like bookmarks) in the repository. The | |
947 | key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a |
|
947 | key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a | |
948 | dictionary containing the keys and values. |
|
948 | dictionary containing the keys and values. | |
949 |
|
949 | |||
950 | ``pushkey`` |
|
950 | ``pushkey`` | |
951 | Run after a pushkey (like a bookmark) is added to the |
|
951 | Run after a pushkey (like a bookmark) is added to the | |
952 | repository. The key namespace is in ``$HG_NAMESPACE``, the key is in |
|
952 | repository. The key namespace is in ``$HG_NAMESPACE``, the key is in | |
953 | ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new |
|
953 | ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new | |
954 | value is in ``$HG_NEW``. |
|
954 | value is in ``$HG_NEW``. | |
955 |
|
955 | |||
956 | ``tag`` |
|
956 | ``tag`` | |
957 | Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``. |
|
957 | Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``. | |
958 | Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in |
|
958 | Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in | |
959 | repository if ``$HG_LOCAL=0``. |
|
959 | repository if ``$HG_LOCAL=0``. | |
960 |
|
960 | |||
961 | ``update`` |
|
961 | ``update`` | |
962 | Run after updating the working directory. Changeset ID of first |
|
962 | Run after updating the working directory. Changeset ID of first | |
963 | new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is |
|
963 | new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is | |
964 | in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the |
|
964 | in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the | |
965 | update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``. |
|
965 | update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``. | |
966 |
|
966 | |||
967 | .. note:: |
|
967 | .. note:: | |
968 |
|
968 | |||
969 | It is generally better to use standard hooks rather than the |
|
969 | It is generally better to use standard hooks rather than the | |
970 | generic pre- and post- command hooks as they are guaranteed to be |
|
970 | generic pre- and post- command hooks as they are guaranteed to be | |
971 | called in the appropriate contexts for influencing transactions. |
|
971 | called in the appropriate contexts for influencing transactions. | |
972 | Also, hooks like "commit" will be called in all contexts that |
|
972 | Also, hooks like "commit" will be called in all contexts that | |
973 | generate a commit (e.g. tag) and not just the commit command. |
|
973 | generate a commit (e.g. tag) and not just the commit command. | |
974 |
|
974 | |||
975 | .. note:: |
|
975 | .. note:: | |
976 |
|
976 | |||
977 | Environment variables with empty values may not be passed to |
|
977 | Environment variables with empty values may not be passed to | |
978 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
|
978 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` | |
979 | will have an empty value under Unix-like platforms for non-merge |
|
979 | will have an empty value under Unix-like platforms for non-merge | |
980 | changesets, while it will not be available at all under Windows. |
|
980 | changesets, while it will not be available at all under Windows. | |
981 |
|
981 | |||
982 | The syntax for Python hooks is as follows:: |
|
982 | The syntax for Python hooks is as follows:: | |
983 |
|
983 | |||
984 | hookname = python:modulename.submodule.callable |
|
984 | hookname = python:modulename.submodule.callable | |
985 | hookname = python:/path/to/python/module.py:callable |
|
985 | hookname = python:/path/to/python/module.py:callable | |
986 |
|
986 | |||
987 | Python hooks are run within the Mercurial process. Each hook is |
|
987 | Python hooks are run within the Mercurial process. Each hook is | |
988 | called with at least three keyword arguments: a ui object (keyword |
|
988 | called with at least three keyword arguments: a ui object (keyword | |
989 | ``ui``), a repository object (keyword ``repo``), and a ``hooktype`` |
|
989 | ``ui``), a repository object (keyword ``repo``), and a ``hooktype`` | |
990 | keyword that tells what kind of hook is used. Arguments listed as |
|
990 | keyword that tells what kind of hook is used. Arguments listed as | |
991 | environment variables above are passed as keyword arguments, with no |
|
991 | environment variables above are passed as keyword arguments, with no | |
992 | ``HG_`` prefix, and names in lower case. |
|
992 | ``HG_`` prefix, and names in lower case. | |
993 |
|
993 | |||
994 | If a Python hook returns a "true" value or raises an exception, this |
|
994 | If a Python hook returns a "true" value or raises an exception, this | |
995 | is treated as a failure. |
|
995 | is treated as a failure. | |
996 |
|
996 | |||
997 |
|
997 | |||
998 | ``hostfingerprints`` |
|
998 | ``hostfingerprints`` | |
999 | -------------------- |
|
999 | -------------------- | |
1000 |
|
1000 | |||
1001 | (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.) |
|
1001 | (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.) | |
1002 |
|
1002 | |||
1003 | Fingerprints of the certificates of known HTTPS servers. |
|
1003 | Fingerprints of the certificates of known HTTPS servers. | |
1004 |
|
1004 | |||
1005 | A HTTPS connection to a server with a fingerprint configured here will |
|
1005 | A HTTPS connection to a server with a fingerprint configured here will | |
1006 | only succeed if the servers certificate matches the fingerprint. |
|
1006 | only succeed if the servers certificate matches the fingerprint. | |
1007 | This is very similar to how ssh known hosts works. |
|
1007 | This is very similar to how ssh known hosts works. | |
1008 |
|
1008 | |||
1009 | The fingerprint is the SHA-1 hash value of the DER encoded certificate. |
|
1009 | The fingerprint is the SHA-1 hash value of the DER encoded certificate. | |
1010 | Multiple values can be specified (separated by spaces or commas). This can |
|
1010 | Multiple values can be specified (separated by spaces or commas). This can | |
1011 | be used to define both old and new fingerprints while a host transitions |
|
1011 | be used to define both old and new fingerprints while a host transitions | |
1012 | to a new certificate. |
|
1012 | to a new certificate. | |
1013 |
|
1013 | |||
1014 | The CA chain and web.cacerts is not used for servers with a fingerprint. |
|
1014 | The CA chain and web.cacerts is not used for servers with a fingerprint. | |
1015 |
|
1015 | |||
1016 | For example:: |
|
1016 | For example:: | |
1017 |
|
1017 | |||
1018 | [hostfingerprints] |
|
1018 | [hostfingerprints] | |
1019 | hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1019 | hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 | |
1020 | hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1020 | hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 | |
1021 |
|
1021 | |||
1022 | ``hostsecurity`` |
|
1022 | ``hostsecurity`` | |
1023 | ---------------- |
|
1023 | ---------------- | |
1024 |
|
1024 | |||
1025 | Used to specify global and per-host security settings for connecting to |
|
1025 | Used to specify global and per-host security settings for connecting to | |
1026 | other machines. |
|
1026 | other machines. | |
1027 |
|
1027 | |||
1028 | The following options control default behavior for all hosts. |
|
1028 | The following options control default behavior for all hosts. | |
1029 |
|
1029 | |||
1030 | ``ciphers`` |
|
1030 | ``ciphers`` | |
1031 | Defines the cryptographic ciphers to use for connections. |
|
1031 | Defines the cryptographic ciphers to use for connections. | |
1032 |
|
1032 | |||
1033 | Value must be a valid OpenSSL Cipher List Format as documented at |
|
1033 | Value must be a valid OpenSSL Cipher List Format as documented at | |
1034 | https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT. |
|
1034 | https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT. | |
1035 |
|
1035 | |||
1036 | This setting is for advanced users only. Setting to incorrect values |
|
1036 | This setting is for advanced users only. Setting to incorrect values | |
1037 | can significantly lower connection security or decrease performance. |
|
1037 | can significantly lower connection security or decrease performance. | |
1038 | You have been warned. |
|
1038 | You have been warned. | |
1039 |
|
1039 | |||
1040 | This option requires Python 2.7. |
|
1040 | This option requires Python 2.7. | |
1041 |
|
1041 | |||
1042 | ``minimumprotocol`` |
|
1042 | ``minimumprotocol`` | |
1043 | Defines the minimum channel encryption protocol to use. |
|
1043 | Defines the minimum channel encryption protocol to use. | |
1044 |
|
1044 | |||
1045 | By default, the highest version of TLS supported by both client and server |
|
1045 | By default, the highest version of TLS supported by both client and server | |
1046 | is used. |
|
1046 | is used. | |
1047 |
|
1047 | |||
1048 | Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``. |
|
1048 | Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``. | |
1049 |
|
1049 | |||
1050 | When running on an old Python version, only ``tls1.0`` is allowed since |
|
1050 | When running on an old Python version, only ``tls1.0`` is allowed since | |
1051 | old versions of Python only support up to TLS 1.0. |
|
1051 | old versions of Python only support up to TLS 1.0. | |
1052 |
|
1052 | |||
1053 | When running a Python that supports modern TLS versions, the default is |
|
1053 | When running a Python that supports modern TLS versions, the default is | |
1054 | ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this |
|
1054 | ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this | |
1055 | weakens security and should only be used as a feature of last resort if |
|
1055 | weakens security and should only be used as a feature of last resort if | |
1056 | a server does not support TLS 1.1+. |
|
1056 | a server does not support TLS 1.1+. | |
1057 |
|
1057 | |||
1058 | Options in the ``[hostsecurity]`` section can have the form |
|
1058 | Options in the ``[hostsecurity]`` section can have the form | |
1059 | ``hostname``:``setting``. This allows multiple settings to be defined on a |
|
1059 | ``hostname``:``setting``. This allows multiple settings to be defined on a | |
1060 | per-host basis. |
|
1060 | per-host basis. | |
1061 |
|
1061 | |||
1062 | The following per-host settings can be defined. |
|
1062 | The following per-host settings can be defined. | |
1063 |
|
1063 | |||
1064 | ``ciphers`` |
|
1064 | ``ciphers`` | |
1065 | This behaves like ``ciphers`` as described above except it only applies |
|
1065 | This behaves like ``ciphers`` as described above except it only applies | |
1066 | to the host on which it is defined. |
|
1066 | to the host on which it is defined. | |
1067 |
|
1067 | |||
1068 | ``fingerprints`` |
|
1068 | ``fingerprints`` | |
1069 | A list of hashes of the DER encoded peer/remote certificate. Values have |
|
1069 | A list of hashes of the DER encoded peer/remote certificate. Values have | |
1070 | the form ``algorithm``:``fingerprint``. e.g. |
|
1070 | the form ``algorithm``:``fingerprint``. e.g. | |
1071 | ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``. |
|
1071 | ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``. | |
1072 |
|
1072 | |||
1073 | The following algorithms/prefixes are supported: ``sha1``, ``sha256``, |
|
1073 | The following algorithms/prefixes are supported: ``sha1``, ``sha256``, | |
1074 | ``sha512``. |
|
1074 | ``sha512``. | |
1075 |
|
1075 | |||
1076 | Use of ``sha256`` or ``sha512`` is preferred. |
|
1076 | Use of ``sha256`` or ``sha512`` is preferred. | |
1077 |
|
1077 | |||
1078 | If a fingerprint is specified, the CA chain is not validated for this |
|
1078 | If a fingerprint is specified, the CA chain is not validated for this | |
1079 | host and Mercurial will require the remote certificate to match one |
|
1079 | host and Mercurial will require the remote certificate to match one | |
1080 | of the fingerprints specified. This means if the server updates its |
|
1080 | of the fingerprints specified. This means if the server updates its | |
1081 | certificate, Mercurial will abort until a new fingerprint is defined. |
|
1081 | certificate, Mercurial will abort until a new fingerprint is defined. | |
1082 | This can provide stronger security than traditional CA-based validation |
|
1082 | This can provide stronger security than traditional CA-based validation | |
1083 | at the expense of convenience. |
|
1083 | at the expense of convenience. | |
1084 |
|
1084 | |||
1085 | This option takes precedence over ``verifycertsfile``. |
|
1085 | This option takes precedence over ``verifycertsfile``. | |
1086 |
|
1086 | |||
1087 | ``minimumprotocol`` |
|
1087 | ``minimumprotocol`` | |
1088 | This behaves like ``minimumprotocol`` as described above except it |
|
1088 | This behaves like ``minimumprotocol`` as described above except it | |
1089 | only applies to the host on which it is defined. |
|
1089 | only applies to the host on which it is defined. | |
1090 |
|
1090 | |||
1091 | ``verifycertsfile`` |
|
1091 | ``verifycertsfile`` | |
1092 | Path to file a containing a list of PEM encoded certificates used to |
|
1092 | Path to file a containing a list of PEM encoded certificates used to | |
1093 | verify the server certificate. Environment variables and ``~user`` |
|
1093 | verify the server certificate. Environment variables and ``~user`` | |
1094 | constructs are expanded in the filename. |
|
1094 | constructs are expanded in the filename. | |
1095 |
|
1095 | |||
1096 | The server certificate or the certificate's certificate authority (CA) |
|
1096 | The server certificate or the certificate's certificate authority (CA) | |
1097 | must match a certificate from this file or certificate verification |
|
1097 | must match a certificate from this file or certificate verification | |
1098 | will fail and connections to the server will be refused. |
|
1098 | will fail and connections to the server will be refused. | |
1099 |
|
1099 | |||
1100 | If defined, only certificates provided by this file will be used: |
|
1100 | If defined, only certificates provided by this file will be used: | |
1101 | ``web.cacerts`` and any system/default certificates will not be |
|
1101 | ``web.cacerts`` and any system/default certificates will not be | |
1102 | used. |
|
1102 | used. | |
1103 |
|
1103 | |||
1104 | This option has no effect if the per-host ``fingerprints`` option |
|
1104 | This option has no effect if the per-host ``fingerprints`` option | |
1105 | is set. |
|
1105 | is set. | |
1106 |
|
1106 | |||
1107 | The format of the file is as follows:: |
|
1107 | The format of the file is as follows:: | |
1108 |
|
1108 | |||
1109 | -----BEGIN CERTIFICATE----- |
|
1109 | -----BEGIN CERTIFICATE----- | |
1110 | ... (certificate in base64 PEM encoding) ... |
|
1110 | ... (certificate in base64 PEM encoding) ... | |
1111 | -----END CERTIFICATE----- |
|
1111 | -----END CERTIFICATE----- | |
1112 | -----BEGIN CERTIFICATE----- |
|
1112 | -----BEGIN CERTIFICATE----- | |
1113 | ... (certificate in base64 PEM encoding) ... |
|
1113 | ... (certificate in base64 PEM encoding) ... | |
1114 | -----END CERTIFICATE----- |
|
1114 | -----END CERTIFICATE----- | |
1115 |
|
1115 | |||
1116 | For example:: |
|
1116 | For example:: | |
1117 |
|
1117 | |||
1118 | [hostsecurity] |
|
1118 | [hostsecurity] | |
1119 | hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2 |
|
1119 | hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2 | |
1120 | 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 |
|
1120 | 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 | |
1121 | foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem |
|
1121 | foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem | |
1122 |
|
1122 | |||
1123 | To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1 |
|
1123 | To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1 | |
1124 | when connecting to ``hg.example.com``:: |
|
1124 | when connecting to ``hg.example.com``:: | |
1125 |
|
1125 | |||
1126 | [hostsecurity] |
|
1126 | [hostsecurity] | |
1127 | minimumprotocol = tls1.2 |
|
1127 | minimumprotocol = tls1.2 | |
1128 | hg.example.com:minimumprotocol = tls1.1 |
|
1128 | hg.example.com:minimumprotocol = tls1.1 | |
1129 |
|
1129 | |||
1130 | ``http_proxy`` |
|
1130 | ``http_proxy`` | |
1131 | -------------- |
|
1131 | -------------- | |
1132 |
|
1132 | |||
1133 | Used to access web-based Mercurial repositories through a HTTP |
|
1133 | Used to access web-based Mercurial repositories through a HTTP | |
1134 | proxy. |
|
1134 | proxy. | |
1135 |
|
1135 | |||
1136 | ``host`` |
|
1136 | ``host`` | |
1137 | Host name and (optional) port of the proxy server, for example |
|
1137 | Host name and (optional) port of the proxy server, for example | |
1138 | "myproxy:8000". |
|
1138 | "myproxy:8000". | |
1139 |
|
1139 | |||
1140 | ``no`` |
|
1140 | ``no`` | |
1141 | Optional. Comma-separated list of host names that should bypass |
|
1141 | Optional. Comma-separated list of host names that should bypass | |
1142 | the proxy. |
|
1142 | the proxy. | |
1143 |
|
1143 | |||
1144 | ``passwd`` |
|
1144 | ``passwd`` | |
1145 | Optional. Password to authenticate with at the proxy server. |
|
1145 | Optional. Password to authenticate with at the proxy server. | |
1146 |
|
1146 | |||
1147 | ``user`` |
|
1147 | ``user`` | |
1148 | Optional. User name to authenticate with at the proxy server. |
|
1148 | Optional. User name to authenticate with at the proxy server. | |
1149 |
|
1149 | |||
1150 | ``always`` |
|
1150 | ``always`` | |
1151 | Optional. Always use the proxy, even for localhost and any entries |
|
1151 | Optional. Always use the proxy, even for localhost and any entries | |
1152 | in ``http_proxy.no``. (default: False) |
|
1152 | in ``http_proxy.no``. (default: False) | |
1153 |
|
1153 | |||
1154 | ``merge`` |
|
1154 | ``merge`` | |
1155 | --------- |
|
1155 | --------- | |
1156 |
|
1156 | |||
1157 | This section specifies behavior during merges and updates. |
|
1157 | This section specifies behavior during merges and updates. | |
1158 |
|
1158 | |||
1159 | ``checkignored`` |
|
1159 | ``checkignored`` | |
1160 | Controls behavior when an ignored file on disk has the same name as a tracked |
|
1160 | Controls behavior when an ignored file on disk has the same name as a tracked | |
1161 | file in the changeset being merged or updated to, and has different |
|
1161 | file in the changeset being merged or updated to, and has different | |
1162 | contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, |
|
1162 | contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, | |
1163 | abort on such files. With ``warn``, warn on such files and back them up as |
|
1163 | abort on such files. With ``warn``, warn on such files and back them up as | |
1164 | ``.orig``. With ``ignore``, don't print a warning and back them up as |
|
1164 | ``.orig``. With ``ignore``, don't print a warning and back them up as | |
1165 | ``.orig``. (default: ``abort``) |
|
1165 | ``.orig``. (default: ``abort``) | |
1166 |
|
1166 | |||
1167 | ``checkunknown`` |
|
1167 | ``checkunknown`` | |
1168 | Controls behavior when an unknown file that isn't ignored has the same name |
|
1168 | Controls behavior when an unknown file that isn't ignored has the same name | |
1169 | as a tracked file in the changeset being merged or updated to, and has |
|
1169 | as a tracked file in the changeset being merged or updated to, and has | |
1170 | different contents. Similar to ``merge.checkignored``, except for files that |
|
1170 | different contents. Similar to ``merge.checkignored``, except for files that | |
1171 | are not ignored. (default: ``abort``) |
|
1171 | are not ignored. (default: ``abort``) | |
1172 |
|
1172 | |||
1173 | ``merge-patterns`` |
|
1173 | ``merge-patterns`` | |
1174 | ------------------ |
|
1174 | ------------------ | |
1175 |
|
1175 | |||
1176 | This section specifies merge tools to associate with particular file |
|
1176 | This section specifies merge tools to associate with particular file | |
1177 | patterns. Tools matched here will take precedence over the default |
|
1177 | patterns. Tools matched here will take precedence over the default | |
1178 | merge tool. Patterns are globs by default, rooted at the repository |
|
1178 | merge tool. Patterns are globs by default, rooted at the repository | |
1179 | root. |
|
1179 | root. | |
1180 |
|
1180 | |||
1181 | Example:: |
|
1181 | Example:: | |
1182 |
|
1182 | |||
1183 | [merge-patterns] |
|
1183 | [merge-patterns] | |
1184 | **.c = kdiff3 |
|
1184 | **.c = kdiff3 | |
1185 | **.jpg = myimgmerge |
|
1185 | **.jpg = myimgmerge | |
1186 |
|
1186 | |||
1187 | ``merge-tools`` |
|
1187 | ``merge-tools`` | |
1188 | --------------- |
|
1188 | --------------- | |
1189 |
|
1189 | |||
1190 | This section configures external merge tools to use for file-level |
|
1190 | This section configures external merge tools to use for file-level | |
1191 | merges. This section has likely been preconfigured at install time. |
|
1191 | merges. This section has likely been preconfigured at install time. | |
1192 | Use :hg:`config merge-tools` to check the existing configuration. |
|
1192 | Use :hg:`config merge-tools` to check the existing configuration. | |
1193 | Also see :hg:`help merge-tools` for more details. |
|
1193 | Also see :hg:`help merge-tools` for more details. | |
1194 |
|
1194 | |||
1195 | Example ``~/.hgrc``:: |
|
1195 | Example ``~/.hgrc``:: | |
1196 |
|
1196 | |||
1197 | [merge-tools] |
|
1197 | [merge-tools] | |
1198 | # Override stock tool location |
|
1198 | # Override stock tool location | |
1199 | kdiff3.executable = ~/bin/kdiff3 |
|
1199 | kdiff3.executable = ~/bin/kdiff3 | |
1200 | # Specify command line |
|
1200 | # Specify command line | |
1201 | kdiff3.args = $base $local $other -o $output |
|
1201 | kdiff3.args = $base $local $other -o $output | |
1202 | # Give higher priority |
|
1202 | # Give higher priority | |
1203 | kdiff3.priority = 1 |
|
1203 | kdiff3.priority = 1 | |
1204 |
|
1204 | |||
1205 | # Changing the priority of preconfigured tool |
|
1205 | # Changing the priority of preconfigured tool | |
1206 | meld.priority = 0 |
|
1206 | meld.priority = 0 | |
1207 |
|
1207 | |||
1208 | # Disable a preconfigured tool |
|
1208 | # Disable a preconfigured tool | |
1209 | vimdiff.disabled = yes |
|
1209 | vimdiff.disabled = yes | |
1210 |
|
1210 | |||
1211 | # Define new tool |
|
1211 | # Define new tool | |
1212 | myHtmlTool.args = -m $local $other $base $output |
|
1212 | myHtmlTool.args = -m $local $other $base $output | |
1213 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
|
1213 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge | |
1214 | myHtmlTool.priority = 1 |
|
1214 | myHtmlTool.priority = 1 | |
1215 |
|
1215 | |||
1216 | Supported arguments: |
|
1216 | Supported arguments: | |
1217 |
|
1217 | |||
1218 | ``priority`` |
|
1218 | ``priority`` | |
1219 | The priority in which to evaluate this tool. |
|
1219 | The priority in which to evaluate this tool. | |
1220 | (default: 0) |
|
1220 | (default: 0) | |
1221 |
|
1221 | |||
1222 | ``executable`` |
|
1222 | ``executable`` | |
1223 | Either just the name of the executable or its pathname. |
|
1223 | Either just the name of the executable or its pathname. | |
1224 |
|
1224 | |||
1225 | .. container:: windows |
|
1225 | .. container:: windows | |
1226 |
|
1226 | |||
1227 | On Windows, the path can use environment variables with ${ProgramFiles} |
|
1227 | On Windows, the path can use environment variables with ${ProgramFiles} | |
1228 | syntax. |
|
1228 | syntax. | |
1229 |
|
1229 | |||
1230 | (default: the tool name) |
|
1230 | (default: the tool name) | |
1231 |
|
1231 | |||
1232 | ``args`` |
|
1232 | ``args`` | |
1233 | The arguments to pass to the tool executable. You can refer to the |
|
1233 | The arguments to pass to the tool executable. You can refer to the | |
1234 | files being merged as well as the output file through these |
|
1234 | files being merged as well as the output file through these | |
1235 | variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning |
|
1235 | variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning | |
1236 | of ``$local`` and ``$other`` can vary depending on which action is being |
|
1236 | of ``$local`` and ``$other`` can vary depending on which action is being | |
1237 | performed. During and update or merge, ``$local`` represents the original |
|
1237 | performed. During and update or merge, ``$local`` represents the original | |
1238 | state of the file, while ``$other`` represents the commit you are updating |
|
1238 | state of the file, while ``$other`` represents the commit you are updating | |
1239 | to or the commit you are merging with. During a rebase ``$local`` |
|
1239 | to or the commit you are merging with. During a rebase ``$local`` | |
1240 | represents the destination of the rebase, and ``$other`` represents the |
|
1240 | represents the destination of the rebase, and ``$other`` represents the | |
1241 | commit being rebased. |
|
1241 | commit being rebased. | |
1242 | (default: ``$local $base $other``) |
|
1242 | (default: ``$local $base $other``) | |
1243 |
|
1243 | |||
1244 | ``premerge`` |
|
1244 | ``premerge`` | |
1245 | Attempt to run internal non-interactive 3-way merge tool before |
|
1245 | Attempt to run internal non-interactive 3-way merge tool before | |
1246 | launching external tool. Options are ``true``, ``false``, ``keep`` or |
|
1246 | launching external tool. Options are ``true``, ``false``, ``keep`` or | |
1247 | ``keep-merge3``. The ``keep`` option will leave markers in the file if the |
|
1247 | ``keep-merge3``. The ``keep`` option will leave markers in the file if the | |
1248 | premerge fails. The ``keep-merge3`` will do the same but include information |
|
1248 | premerge fails. The ``keep-merge3`` will do the same but include information | |
1249 | about the base of the merge in the marker (see internal :merge3 in |
|
1249 | about the base of the merge in the marker (see internal :merge3 in | |
1250 | :hg:`help merge-tools`). |
|
1250 | :hg:`help merge-tools`). | |
1251 | (default: True) |
|
1251 | (default: True) | |
1252 |
|
1252 | |||
1253 | ``binary`` |
|
1253 | ``binary`` | |
1254 | This tool can merge binary files. (default: False, unless tool |
|
1254 | This tool can merge binary files. (default: False, unless tool | |
1255 | was selected by file pattern match) |
|
1255 | was selected by file pattern match) | |
1256 |
|
1256 | |||
1257 | ``symlink`` |
|
1257 | ``symlink`` | |
1258 | This tool can merge symlinks. (default: False) |
|
1258 | This tool can merge symlinks. (default: False) | |
1259 |
|
1259 | |||
1260 | ``check`` |
|
1260 | ``check`` | |
1261 | A list of merge success-checking options: |
|
1261 | A list of merge success-checking options: | |
1262 |
|
1262 | |||
1263 | ``changed`` |
|
1263 | ``changed`` | |
1264 | Ask whether merge was successful when the merged file shows no changes. |
|
1264 | Ask whether merge was successful when the merged file shows no changes. | |
1265 | ``conflicts`` |
|
1265 | ``conflicts`` | |
1266 | Check whether there are conflicts even though the tool reported success. |
|
1266 | Check whether there are conflicts even though the tool reported success. | |
1267 | ``prompt`` |
|
1267 | ``prompt`` | |
1268 | Always prompt for merge success, regardless of success reported by tool. |
|
1268 | Always prompt for merge success, regardless of success reported by tool. | |
1269 |
|
1269 | |||
1270 | ``fixeol`` |
|
1270 | ``fixeol`` | |
1271 | Attempt to fix up EOL changes caused by the merge tool. |
|
1271 | Attempt to fix up EOL changes caused by the merge tool. | |
1272 | (default: False) |
|
1272 | (default: False) | |
1273 |
|
1273 | |||
1274 | ``gui`` |
|
1274 | ``gui`` | |
1275 | This tool requires a graphical interface to run. (default: False) |
|
1275 | This tool requires a graphical interface to run. (default: False) | |
1276 |
|
1276 | |||
1277 | .. container:: windows |
|
1277 | .. container:: windows | |
1278 |
|
1278 | |||
1279 | ``regkey`` |
|
1279 | ``regkey`` | |
1280 | Windows registry key which describes install location of this |
|
1280 | Windows registry key which describes install location of this | |
1281 | tool. Mercurial will search for this key first under |
|
1281 | tool. Mercurial will search for this key first under | |
1282 | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
|
1282 | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. | |
1283 | (default: None) |
|
1283 | (default: None) | |
1284 |
|
1284 | |||
1285 | ``regkeyalt`` |
|
1285 | ``regkeyalt`` | |
1286 | An alternate Windows registry key to try if the first key is not |
|
1286 | An alternate Windows registry key to try if the first key is not | |
1287 | found. The alternate key uses the same ``regname`` and ``regappend`` |
|
1287 | found. The alternate key uses the same ``regname`` and ``regappend`` | |
1288 | semantics of the primary key. The most common use for this key |
|
1288 | semantics of the primary key. The most common use for this key | |
1289 | is to search for 32bit applications on 64bit operating systems. |
|
1289 | is to search for 32bit applications on 64bit operating systems. | |
1290 | (default: None) |
|
1290 | (default: None) | |
1291 |
|
1291 | |||
1292 | ``regname`` |
|
1292 | ``regname`` | |
1293 | Name of value to read from specified registry key. |
|
1293 | Name of value to read from specified registry key. | |
1294 | (default: the unnamed (default) value) |
|
1294 | (default: the unnamed (default) value) | |
1295 |
|
1295 | |||
1296 | ``regappend`` |
|
1296 | ``regappend`` | |
1297 | String to append to the value read from the registry, typically |
|
1297 | String to append to the value read from the registry, typically | |
1298 | the executable name of the tool. |
|
1298 | the executable name of the tool. | |
1299 | (default: None) |
|
1299 | (default: None) | |
1300 |
|
1300 | |||
1301 |
|
1301 | |||
1302 | ``patch`` |
|
1302 | ``patch`` | |
1303 | --------- |
|
1303 | --------- | |
1304 |
|
1304 | |||
1305 | Settings used when applying patches, for instance through the 'import' |
|
1305 | Settings used when applying patches, for instance through the 'import' | |
1306 | command or with Mercurial Queues extension. |
|
1306 | command or with Mercurial Queues extension. | |
1307 |
|
1307 | |||
1308 | ``eol`` |
|
1308 | ``eol`` | |
1309 | When set to 'strict' patch content and patched files end of lines |
|
1309 | When set to 'strict' patch content and patched files end of lines | |
1310 | are preserved. When set to ``lf`` or ``crlf``, both files end of |
|
1310 | are preserved. When set to ``lf`` or ``crlf``, both files end of | |
1311 | lines are ignored when patching and the result line endings are |
|
1311 | lines are ignored when patching and the result line endings are | |
1312 | normalized to either LF (Unix) or CRLF (Windows). When set to |
|
1312 | normalized to either LF (Unix) or CRLF (Windows). When set to | |
1313 | ``auto``, end of lines are again ignored while patching but line |
|
1313 | ``auto``, end of lines are again ignored while patching but line | |
1314 | endings in patched files are normalized to their original setting |
|
1314 | endings in patched files are normalized to their original setting | |
1315 | on a per-file basis. If target file does not exist or has no end |
|
1315 | on a per-file basis. If target file does not exist or has no end | |
1316 | of line, patch line endings are preserved. |
|
1316 | of line, patch line endings are preserved. | |
1317 | (default: strict) |
|
1317 | (default: strict) | |
1318 |
|
1318 | |||
1319 | ``fuzz`` |
|
1319 | ``fuzz`` | |
1320 | The number of lines of 'fuzz' to allow when applying patches. This |
|
1320 | The number of lines of 'fuzz' to allow when applying patches. This | |
1321 | controls how much context the patcher is allowed to ignore when |
|
1321 | controls how much context the patcher is allowed to ignore when | |
1322 | trying to apply a patch. |
|
1322 | trying to apply a patch. | |
1323 | (default: 2) |
|
1323 | (default: 2) | |
1324 |
|
1324 | |||
1325 | ``paths`` |
|
1325 | ``paths`` | |
1326 | --------- |
|
1326 | --------- | |
1327 |
|
1327 | |||
1328 | Assigns symbolic names and behavior to repositories. |
|
1328 | Assigns symbolic names and behavior to repositories. | |
1329 |
|
1329 | |||
1330 | Options are symbolic names defining the URL or directory that is the |
|
1330 | Options are symbolic names defining the URL or directory that is the | |
1331 | location of the repository. Example:: |
|
1331 | location of the repository. Example:: | |
1332 |
|
1332 | |||
1333 | [paths] |
|
1333 | [paths] | |
1334 | my_server = https://example.com/my_repo |
|
1334 | my_server = https://example.com/my_repo | |
1335 | local_path = /home/me/repo |
|
1335 | local_path = /home/me/repo | |
1336 |
|
1336 | |||
1337 | These symbolic names can be used from the command line. To pull |
|
1337 | These symbolic names can be used from the command line. To pull | |
1338 | from ``my_server``: :hg:`pull my_server`. To push to ``local_path``: |
|
1338 | from ``my_server``: :hg:`pull my_server`. To push to ``local_path``: | |
1339 | :hg:`push local_path`. |
|
1339 | :hg:`push local_path`. | |
1340 |
|
1340 | |||
1341 | Options containing colons (``:``) denote sub-options that can influence |
|
1341 | Options containing colons (``:``) denote sub-options that can influence | |
1342 | behavior for that specific path. Example:: |
|
1342 | behavior for that specific path. Example:: | |
1343 |
|
1343 | |||
1344 | [paths] |
|
1344 | [paths] | |
1345 | my_server = https://example.com/my_path |
|
1345 | my_server = https://example.com/my_path | |
1346 | my_server:pushurl = ssh://example.com/my_path |
|
1346 | my_server:pushurl = ssh://example.com/my_path | |
1347 |
|
1347 | |||
1348 | The following sub-options can be defined: |
|
1348 | The following sub-options can be defined: | |
1349 |
|
1349 | |||
1350 | ``pushurl`` |
|
1350 | ``pushurl`` | |
1351 | The URL to use for push operations. If not defined, the location |
|
1351 | The URL to use for push operations. If not defined, the location | |
1352 | defined by the path's main entry is used. |
|
1352 | defined by the path's main entry is used. | |
1353 |
|
1353 | |||
1354 | ``pushrev`` |
|
1354 | ``pushrev`` | |
1355 | A revset defining which revisions to push by default. |
|
1355 | A revset defining which revisions to push by default. | |
1356 |
|
1356 | |||
1357 | When :hg:`push` is executed without a ``-r`` argument, the revset |
|
1357 | When :hg:`push` is executed without a ``-r`` argument, the revset | |
1358 | defined by this sub-option is evaluated to determine what to push. |
|
1358 | defined by this sub-option is evaluated to determine what to push. | |
1359 |
|
1359 | |||
1360 | For example, a value of ``.`` will push the working directory's |
|
1360 | For example, a value of ``.`` will push the working directory's | |
1361 | revision by default. |
|
1361 | revision by default. | |
1362 |
|
1362 | |||
1363 | Revsets specifying bookmarks will not result in the bookmark being |
|
1363 | Revsets specifying bookmarks will not result in the bookmark being | |
1364 | pushed. |
|
1364 | pushed. | |
1365 |
|
1365 | |||
1366 | The following special named paths exist: |
|
1366 | The following special named paths exist: | |
1367 |
|
1367 | |||
1368 | ``default`` |
|
1368 | ``default`` | |
1369 | The URL or directory to use when no source or remote is specified. |
|
1369 | The URL or directory to use when no source or remote is specified. | |
1370 |
|
1370 | |||
1371 | :hg:`clone` will automatically define this path to the location the |
|
1371 | :hg:`clone` will automatically define this path to the location the | |
1372 | repository was cloned from. |
|
1372 | repository was cloned from. | |
1373 |
|
1373 | |||
1374 | ``default-push`` |
|
1374 | ``default-push`` | |
1375 | (deprecated) The URL or directory for the default :hg:`push` location. |
|
1375 | (deprecated) The URL or directory for the default :hg:`push` location. | |
1376 | ``default:pushurl`` should be used instead. |
|
1376 | ``default:pushurl`` should be used instead. | |
1377 |
|
1377 | |||
1378 | ``phases`` |
|
1378 | ``phases`` | |
1379 | ---------- |
|
1379 | ---------- | |
1380 |
|
1380 | |||
1381 | Specifies default handling of phases. See :hg:`help phases` for more |
|
1381 | Specifies default handling of phases. See :hg:`help phases` for more | |
1382 | information about working with phases. |
|
1382 | information about working with phases. | |
1383 |
|
1383 | |||
1384 | ``publish`` |
|
1384 | ``publish`` | |
1385 | Controls draft phase behavior when working as a server. When true, |
|
1385 | Controls draft phase behavior when working as a server. When true, | |
1386 | pushed changesets are set to public in both client and server and |
|
1386 | pushed changesets are set to public in both client and server and | |
1387 | pulled or cloned changesets are set to public in the client. |
|
1387 | pulled or cloned changesets are set to public in the client. | |
1388 | (default: True) |
|
1388 | (default: True) | |
1389 |
|
1389 | |||
1390 | ``new-commit`` |
|
1390 | ``new-commit`` | |
1391 | Phase of newly-created commits. |
|
1391 | Phase of newly-created commits. | |
1392 | (default: draft) |
|
1392 | (default: draft) | |
1393 |
|
1393 | |||
1394 | ``checksubrepos`` |
|
1394 | ``checksubrepos`` | |
1395 | Check the phase of the current revision of each subrepository. Allowed |
|
1395 | Check the phase of the current revision of each subrepository. Allowed | |
1396 | values are "ignore", "follow" and "abort". For settings other than |
|
1396 | values are "ignore", "follow" and "abort". For settings other than | |
1397 | "ignore", the phase of the current revision of each subrepository is |
|
1397 | "ignore", the phase of the current revision of each subrepository is | |
1398 | checked before committing the parent repository. If any of those phases is |
|
1398 | checked before committing the parent repository. If any of those phases is | |
1399 | greater than the phase of the parent repository (e.g. if a subrepo is in a |
|
1399 | greater than the phase of the parent repository (e.g. if a subrepo is in a | |
1400 | "secret" phase while the parent repo is in "draft" phase), the commit is |
|
1400 | "secret" phase while the parent repo is in "draft" phase), the commit is | |
1401 | either aborted (if checksubrepos is set to "abort") or the higher phase is |
|
1401 | either aborted (if checksubrepos is set to "abort") or the higher phase is | |
1402 | used for the parent repository commit (if set to "follow"). |
|
1402 | used for the parent repository commit (if set to "follow"). | |
1403 | (default: follow) |
|
1403 | (default: follow) | |
1404 |
|
1404 | |||
1405 |
|
1405 | |||
1406 | ``profiling`` |
|
1406 | ``profiling`` | |
1407 | ------------- |
|
1407 | ------------- | |
1408 |
|
1408 | |||
1409 | Specifies profiling type, format, and file output. Two profilers are |
|
1409 | Specifies profiling type, format, and file output. Two profilers are | |
1410 | supported: an instrumenting profiler (named ``ls``), and a sampling |
|
1410 | supported: an instrumenting profiler (named ``ls``), and a sampling | |
1411 | profiler (named ``stat``). |
|
1411 | profiler (named ``stat``). | |
1412 |
|
1412 | |||
1413 | In this section description, 'profiling data' stands for the raw data |
|
1413 | In this section description, 'profiling data' stands for the raw data | |
1414 | collected during profiling, while 'profiling report' stands for a |
|
1414 | collected during profiling, while 'profiling report' stands for a | |
1415 | statistical text report generated from the profiling data. The |
|
1415 | statistical text report generated from the profiling data. The | |
1416 | profiling is done using lsprof. |
|
1416 | profiling is done using lsprof. | |
1417 |
|
1417 | |||
1418 | ``enabled`` |
|
1418 | ``enabled`` | |
1419 | Enable the profiler. |
|
1419 | Enable the profiler. | |
1420 | (default: false) |
|
1420 | (default: false) | |
1421 |
|
1421 | |||
1422 | This is equivalent to passing ``--profile`` on the command line. |
|
1422 | This is equivalent to passing ``--profile`` on the command line. | |
1423 |
|
1423 | |||
1424 | ``type`` |
|
1424 | ``type`` | |
1425 | The type of profiler to use. |
|
1425 | The type of profiler to use. | |
1426 | (default: stat) |
|
1426 | (default: stat) | |
1427 |
|
1427 | |||
1428 | ``ls`` |
|
1428 | ``ls`` | |
1429 | Use Python's built-in instrumenting profiler. This profiler |
|
1429 | Use Python's built-in instrumenting profiler. This profiler | |
1430 | works on all platforms, but each line number it reports is the |
|
1430 | works on all platforms, but each line number it reports is the | |
1431 | first line of a function. This restriction makes it difficult to |
|
1431 | first line of a function. This restriction makes it difficult to | |
1432 | identify the expensive parts of a non-trivial function. |
|
1432 | identify the expensive parts of a non-trivial function. | |
1433 | ``stat`` |
|
1433 | ``stat`` | |
1434 | Use a statistical profiler, statprof. This profiler is most |
|
1434 | Use a statistical profiler, statprof. This profiler is most | |
1435 | useful for profiling commands that run for longer than about 0.1 |
|
1435 | useful for profiling commands that run for longer than about 0.1 | |
1436 | seconds. |
|
1436 | seconds. | |
1437 |
|
1437 | |||
1438 | ``format`` |
|
1438 | ``format`` | |
1439 | Profiling format. Specific to the ``ls`` instrumenting profiler. |
|
1439 | Profiling format. Specific to the ``ls`` instrumenting profiler. | |
1440 | (default: text) |
|
1440 | (default: text) | |
1441 |
|
1441 | |||
1442 | ``text`` |
|
1442 | ``text`` | |
1443 | Generate a profiling report. When saving to a file, it should be |
|
1443 | Generate a profiling report. When saving to a file, it should be | |
1444 | noted that only the report is saved, and the profiling data is |
|
1444 | noted that only the report is saved, and the profiling data is | |
1445 | not kept. |
|
1445 | not kept. | |
1446 | ``kcachegrind`` |
|
1446 | ``kcachegrind`` | |
1447 | Format profiling data for kcachegrind use: when saving to a |
|
1447 | Format profiling data for kcachegrind use: when saving to a | |
1448 | file, the generated file can directly be loaded into |
|
1448 | file, the generated file can directly be loaded into | |
1449 | kcachegrind. |
|
1449 | kcachegrind. | |
1450 |
|
1450 | |||
1451 | ``statformat`` |
|
1451 | ``statformat`` | |
1452 | Profiling format for the ``stat`` profiler. |
|
1452 | Profiling format for the ``stat`` profiler. | |
1453 | (default: hotpath) |
|
1453 | (default: hotpath) | |
1454 |
|
1454 | |||
1455 | ``hotpath`` |
|
1455 | ``hotpath`` | |
1456 | Show a tree-based display containing the hot path of execution (where |
|
1456 | Show a tree-based display containing the hot path of execution (where | |
1457 | most time was spent). |
|
1457 | most time was spent). | |
1458 | ``bymethod`` |
|
1458 | ``bymethod`` | |
1459 | Show a table of methods ordered by how frequently they are active. |
|
1459 | Show a table of methods ordered by how frequently they are active. | |
1460 | ``byline`` |
|
1460 | ``byline`` | |
1461 | Show a table of lines in files ordered by how frequently they are active. |
|
1461 | Show a table of lines in files ordered by how frequently they are active. | |
1462 | ``json`` |
|
1462 | ``json`` | |
1463 | Render profiling data as JSON. |
|
1463 | Render profiling data as JSON. | |
1464 |
|
1464 | |||
1465 | ``frequency`` |
|
1465 | ``frequency`` | |
1466 | Sampling frequency. Specific to the ``stat`` sampling profiler. |
|
1466 | Sampling frequency. Specific to the ``stat`` sampling profiler. | |
1467 | (default: 1000) |
|
1467 | (default: 1000) | |
1468 |
|
1468 | |||
1469 | ``output`` |
|
1469 | ``output`` | |
1470 | File path where profiling data or report should be saved. If the |
|
1470 | File path where profiling data or report should be saved. If the | |
1471 | file exists, it is replaced. (default: None, data is printed on |
|
1471 | file exists, it is replaced. (default: None, data is printed on | |
1472 | stderr) |
|
1472 | stderr) | |
1473 |
|
1473 | |||
1474 | ``sort`` |
|
1474 | ``sort`` | |
1475 | Sort field. Specific to the ``ls`` instrumenting profiler. |
|
1475 | Sort field. Specific to the ``ls`` instrumenting profiler. | |
1476 | One of ``callcount``, ``reccallcount``, ``totaltime`` and |
|
1476 | One of ``callcount``, ``reccallcount``, ``totaltime`` and | |
1477 | ``inlinetime``. |
|
1477 | ``inlinetime``. | |
1478 | (default: inlinetime) |
|
1478 | (default: inlinetime) | |
1479 |
|
1479 | |||
1480 | ``limit`` |
|
1480 | ``limit`` | |
1481 | Number of lines to show. Specific to the ``ls`` instrumenting profiler. |
|
1481 | Number of lines to show. Specific to the ``ls`` instrumenting profiler. | |
1482 | (default: 30) |
|
1482 | (default: 30) | |
1483 |
|
1483 | |||
1484 | ``nested`` |
|
1484 | ``nested`` | |
1485 | Show at most this number of lines of drill-down info after each main entry. |
|
1485 | Show at most this number of lines of drill-down info after each main entry. | |
1486 | This can help explain the difference between Total and Inline. |
|
1486 | This can help explain the difference between Total and Inline. | |
1487 | Specific to the ``ls`` instrumenting profiler. |
|
1487 | Specific to the ``ls`` instrumenting profiler. | |
1488 | (default: 5) |
|
1488 | (default: 5) | |
1489 |
|
1489 | |||
1490 | ``progress`` |
|
1490 | ``progress`` | |
1491 | ------------ |
|
1491 | ------------ | |
1492 |
|
1492 | |||
1493 | Mercurial commands can draw progress bars that are as informative as |
|
1493 | Mercurial commands can draw progress bars that are as informative as | |
1494 | possible. Some progress bars only offer indeterminate information, while others |
|
1494 | possible. Some progress bars only offer indeterminate information, while others | |
1495 | have a definite end point. |
|
1495 | have a definite end point. | |
1496 |
|
1496 | |||
1497 | ``delay`` |
|
1497 | ``delay`` | |
1498 | Number of seconds (float) before showing the progress bar. (default: 3) |
|
1498 | Number of seconds (float) before showing the progress bar. (default: 3) | |
1499 |
|
1499 | |||
1500 | ``changedelay`` |
|
1500 | ``changedelay`` | |
1501 | Minimum delay before showing a new topic. When set to less than 3 * refresh, |
|
1501 | Minimum delay before showing a new topic. When set to less than 3 * refresh, | |
1502 | that value will be used instead. (default: 1) |
|
1502 | that value will be used instead. (default: 1) | |
1503 |
|
1503 | |||
1504 | ``refresh`` |
|
1504 | ``refresh`` | |
1505 | Time in seconds between refreshes of the progress bar. (default: 0.1) |
|
1505 | Time in seconds between refreshes of the progress bar. (default: 0.1) | |
1506 |
|
1506 | |||
1507 | ``format`` |
|
1507 | ``format`` | |
1508 | Format of the progress bar. |
|
1508 | Format of the progress bar. | |
1509 |
|
1509 | |||
1510 | Valid entries for the format field are ``topic``, ``bar``, ``number``, |
|
1510 | Valid entries for the format field are ``topic``, ``bar``, ``number``, | |
1511 | ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the |
|
1511 | ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the | |
1512 | last 20 characters of the item, but this can be changed by adding either |
|
1512 | last 20 characters of the item, but this can be changed by adding either | |
1513 | ``-<num>`` which would take the last num characters, or ``+<num>`` for the |
|
1513 | ``-<num>`` which would take the last num characters, or ``+<num>`` for the | |
1514 | first num characters. |
|
1514 | first num characters. | |
1515 |
|
1515 | |||
1516 | (default: topic bar number estimate) |
|
1516 | (default: topic bar number estimate) | |
1517 |
|
1517 | |||
1518 | ``width`` |
|
1518 | ``width`` | |
1519 | If set, the maximum width of the progress information (that is, min(width, |
|
1519 | If set, the maximum width of the progress information (that is, min(width, | |
1520 | term width) will be used). |
|
1520 | term width) will be used). | |
1521 |
|
1521 | |||
1522 | ``clear-complete`` |
|
1522 | ``clear-complete`` | |
1523 | Clear the progress bar after it's done. (default: True) |
|
1523 | Clear the progress bar after it's done. (default: True) | |
1524 |
|
1524 | |||
1525 | ``disable`` |
|
1525 | ``disable`` | |
1526 | If true, don't show a progress bar. |
|
1526 | If true, don't show a progress bar. | |
1527 |
|
1527 | |||
1528 | ``assume-tty`` |
|
1528 | ``assume-tty`` | |
1529 | If true, ALWAYS show a progress bar, unless disable is given. |
|
1529 | If true, ALWAYS show a progress bar, unless disable is given. | |
1530 |
|
1530 | |||
1531 | ``rebase`` |
|
1531 | ``rebase`` | |
1532 | ---------- |
|
1532 | ---------- | |
1533 |
|
1533 | |||
1534 | ``allowdivergence`` |
|
1534 | ``allowdivergence`` | |
1535 | Default to False, when True allow creating divergence when performing |
|
1535 | Default to False, when True allow creating divergence when performing | |
1536 | rebase of obsolete changesets. |
|
1536 | rebase of obsolete changesets. | |
1537 |
|
1537 | |||
1538 | ``revsetalias`` |
|
1538 | ``revsetalias`` | |
1539 | --------------- |
|
1539 | --------------- | |
1540 |
|
1540 | |||
1541 | Alias definitions for revsets. See :hg:`help revsets` for details. |
|
1541 | Alias definitions for revsets. See :hg:`help revsets` for details. | |
1542 |
|
1542 | |||
1543 | ``server`` |
|
1543 | ``server`` | |
1544 | ---------- |
|
1544 | ---------- | |
1545 |
|
1545 | |||
1546 | Controls generic server settings. |
|
1546 | Controls generic server settings. | |
1547 |
|
1547 | |||
1548 | ``compressionengines`` |
|
1548 | ``compressionengines`` | |
1549 | List of compression engines and their relative priority to advertise |
|
1549 | List of compression engines and their relative priority to advertise | |
1550 | to clients. |
|
1550 | to clients. | |
1551 |
|
1551 | |||
1552 | The order of compression engines determines their priority, the first |
|
1552 | The order of compression engines determines their priority, the first | |
1553 | having the highest priority. If a compression engine is not listed |
|
1553 | having the highest priority. If a compression engine is not listed | |
1554 | here, it won't be advertised to clients. |
|
1554 | here, it won't be advertised to clients. | |
1555 |
|
1555 | |||
1556 | If not set (the default), built-in defaults are used. Run |
|
1556 | If not set (the default), built-in defaults are used. Run | |
1557 | :hg:`debuginstall` to list available compression engines and their |
|
1557 | :hg:`debuginstall` to list available compression engines and their | |
1558 | default wire protocol priority. |
|
1558 | default wire protocol priority. | |
1559 |
|
1559 | |||
1560 | Older Mercurial clients only support zlib compression and this setting |
|
1560 | Older Mercurial clients only support zlib compression and this setting | |
1561 | has no effect for legacy clients. |
|
1561 | has no effect for legacy clients. | |
1562 |
|
1562 | |||
1563 | ``uncompressed`` |
|
1563 | ``uncompressed`` | |
1564 | Whether to allow clients to clone a repository using the |
|
1564 | Whether to allow clients to clone a repository using the | |
1565 | uncompressed streaming protocol. This transfers about 40% more |
|
1565 | uncompressed streaming protocol. This transfers about 40% more | |
1566 | data than a regular clone, but uses less memory and CPU on both |
|
1566 | data than a regular clone, but uses less memory and CPU on both | |
1567 | server and client. Over a LAN (100 Mbps or better) or a very fast |
|
1567 | server and client. Over a LAN (100 Mbps or better) or a very fast | |
1568 | WAN, an uncompressed streaming clone is a lot faster (~10x) than a |
|
1568 | WAN, an uncompressed streaming clone is a lot faster (~10x) than a | |
1569 | regular clone. Over most WAN connections (anything slower than |
|
1569 | regular clone. Over most WAN connections (anything slower than | |
1570 | about 6 Mbps), uncompressed streaming is slower, because of the |
|
1570 | about 6 Mbps), uncompressed streaming is slower, because of the | |
1571 | extra data transfer overhead. This mode will also temporarily hold |
|
1571 | extra data transfer overhead. This mode will also temporarily hold | |
1572 | the write lock while determining what data to transfer. |
|
1572 | the write lock while determining what data to transfer. | |
1573 | (default: True) |
|
1573 | (default: True) | |
1574 |
|
1574 | |||
1575 | ``preferuncompressed`` |
|
1575 | ``preferuncompressed`` | |
1576 | When set, clients will try to use the uncompressed streaming |
|
1576 | When set, clients will try to use the uncompressed streaming | |
1577 | protocol. (default: False) |
|
1577 | protocol. (default: False) | |
1578 |
|
1578 | |||
1579 | ``validate`` |
|
1579 | ``validate`` | |
1580 | Whether to validate the completeness of pushed changesets by |
|
1580 | Whether to validate the completeness of pushed changesets by | |
1581 | checking that all new file revisions specified in manifests are |
|
1581 | checking that all new file revisions specified in manifests are | |
1582 | present. (default: False) |
|
1582 | present. (default: False) | |
1583 |
|
1583 | |||
1584 | ``maxhttpheaderlen`` |
|
1584 | ``maxhttpheaderlen`` | |
1585 | Instruct HTTP clients not to send request headers longer than this |
|
1585 | Instruct HTTP clients not to send request headers longer than this | |
1586 | many bytes. (default: 1024) |
|
1586 | many bytes. (default: 1024) | |
1587 |
|
1587 | |||
1588 | ``bundle1`` |
|
1588 | ``bundle1`` | |
1589 | Whether to allow clients to push and pull using the legacy bundle1 |
|
1589 | Whether to allow clients to push and pull using the legacy bundle1 | |
1590 | exchange format. (default: True) |
|
1590 | exchange format. (default: True) | |
1591 |
|
1591 | |||
1592 | ``bundle1gd`` |
|
1592 | ``bundle1gd`` | |
1593 | Like ``bundle1`` but only used if the repository is using the |
|
1593 | Like ``bundle1`` but only used if the repository is using the | |
1594 | *generaldelta* storage format. (default: True) |
|
1594 | *generaldelta* storage format. (default: True) | |
1595 |
|
1595 | |||
1596 | ``bundle1.push`` |
|
1596 | ``bundle1.push`` | |
1597 | Whether to allow clients to push using the legacy bundle1 exchange |
|
1597 | Whether to allow clients to push using the legacy bundle1 exchange | |
1598 | format. (default: True) |
|
1598 | format. (default: True) | |
1599 |
|
1599 | |||
1600 | ``bundle1gd.push`` |
|
1600 | ``bundle1gd.push`` | |
1601 | Like ``bundle1.push`` but only used if the repository is using the |
|
1601 | Like ``bundle1.push`` but only used if the repository is using the | |
1602 | *generaldelta* storage format. (default: True) |
|
1602 | *generaldelta* storage format. (default: True) | |
1603 |
|
1603 | |||
1604 | ``bundle1.pull`` |
|
1604 | ``bundle1.pull`` | |
1605 | Whether to allow clients to pull using the legacy bundle1 exchange |
|
1605 | Whether to allow clients to pull using the legacy bundle1 exchange | |
1606 | format. (default: True) |
|
1606 | format. (default: True) | |
1607 |
|
1607 | |||
1608 | ``bundle1gd.pull`` |
|
1608 | ``bundle1gd.pull`` | |
1609 | Like ``bundle1.pull`` but only used if the repository is using the |
|
1609 | Like ``bundle1.pull`` but only used if the repository is using the | |
1610 | *generaldelta* storage format. (default: True) |
|
1610 | *generaldelta* storage format. (default: True) | |
1611 |
|
1611 | |||
1612 | Large repositories using the *generaldelta* storage format should |
|
1612 | Large repositories using the *generaldelta* storage format should | |
1613 | consider setting this option because converting *generaldelta* |
|
1613 | consider setting this option because converting *generaldelta* | |
1614 | repositories to the exchange format required by the bundle1 data |
|
1614 | repositories to the exchange format required by the bundle1 data | |
1615 | format can consume a lot of CPU. |
|
1615 | format can consume a lot of CPU. | |
1616 |
|
1616 | |||
1617 | ``zliblevel`` |
|
1617 | ``zliblevel`` | |
1618 | Integer between ``-1`` and ``9`` that controls the zlib compression level |
|
1618 | Integer between ``-1`` and ``9`` that controls the zlib compression level | |
1619 | for wire protocol commands that send zlib compressed output (notably the |
|
1619 | for wire protocol commands that send zlib compressed output (notably the | |
1620 | commands that send repository history data). |
|
1620 | commands that send repository history data). | |
1621 |
|
1621 | |||
1622 | The default (``-1``) uses the default zlib compression level, which is |
|
1622 | The default (``-1``) uses the default zlib compression level, which is | |
1623 | likely equivalent to ``6``. ``0`` means no compression. ``9`` means |
|
1623 | likely equivalent to ``6``. ``0`` means no compression. ``9`` means | |
1624 | maximum compression. |
|
1624 | maximum compression. | |
1625 |
|
1625 | |||
1626 | Setting this option allows server operators to make trade-offs between |
|
1626 | Setting this option allows server operators to make trade-offs between | |
1627 | bandwidth and CPU used. Lowering the compression lowers CPU utilization |
|
1627 | bandwidth and CPU used. Lowering the compression lowers CPU utilization | |
1628 | but sends more bytes to clients. |
|
1628 | but sends more bytes to clients. | |
1629 |
|
1629 | |||
1630 | This option only impacts the HTTP server. |
|
1630 | This option only impacts the HTTP server. | |
1631 |
|
1631 | |||
1632 | ``zstdlevel`` |
|
1632 | ``zstdlevel`` | |
1633 | Integer between ``1`` and ``22`` that controls the zstd compression level |
|
1633 | Integer between ``1`` and ``22`` that controls the zstd compression level | |
1634 | for wire protocol commands. ``1`` is the minimal amount of compression and |
|
1634 | for wire protocol commands. ``1`` is the minimal amount of compression and | |
1635 | ``22`` is the highest amount of compression. |
|
1635 | ``22`` is the highest amount of compression. | |
1636 |
|
1636 | |||
1637 | The default (``3``) should be significantly faster than zlib while likely |
|
1637 | The default (``3``) should be significantly faster than zlib while likely | |
1638 | delivering better compression ratios. |
|
1638 | delivering better compression ratios. | |
1639 |
|
1639 | |||
1640 | This option only impacts the HTTP server. |
|
1640 | This option only impacts the HTTP server. | |
1641 |
|
1641 | |||
1642 | See also ``server.zliblevel``. |
|
1642 | See also ``server.zliblevel``. | |
1643 |
|
1643 | |||
1644 | ``smtp`` |
|
1644 | ``smtp`` | |
1645 | -------- |
|
1645 | -------- | |
1646 |
|
1646 | |||
1647 | Configuration for extensions that need to send email messages. |
|
1647 | Configuration for extensions that need to send email messages. | |
1648 |
|
1648 | |||
1649 | ``host`` |
|
1649 | ``host`` | |
1650 | Host name of mail server, e.g. "mail.example.com". |
|
1650 | Host name of mail server, e.g. "mail.example.com". | |
1651 |
|
1651 | |||
1652 | ``port`` |
|
1652 | ``port`` | |
1653 | Optional. Port to connect to on mail server. (default: 465 if |
|
1653 | Optional. Port to connect to on mail server. (default: 465 if | |
1654 | ``tls`` is smtps; 25 otherwise) |
|
1654 | ``tls`` is smtps; 25 otherwise) | |
1655 |
|
1655 | |||
1656 | ``tls`` |
|
1656 | ``tls`` | |
1657 | Optional. Method to enable TLS when connecting to mail server: starttls, |
|
1657 | Optional. Method to enable TLS when connecting to mail server: starttls, | |
1658 | smtps or none. (default: none) |
|
1658 | smtps or none. (default: none) | |
1659 |
|
1659 | |||
1660 | ``username`` |
|
1660 | ``username`` | |
1661 | Optional. User name for authenticating with the SMTP server. |
|
1661 | Optional. User name for authenticating with the SMTP server. | |
1662 | (default: None) |
|
1662 | (default: None) | |
1663 |
|
1663 | |||
1664 | ``password`` |
|
1664 | ``password`` | |
1665 | Optional. Password for authenticating with the SMTP server. If not |
|
1665 | Optional. Password for authenticating with the SMTP server. If not | |
1666 | specified, interactive sessions will prompt the user for a |
|
1666 | specified, interactive sessions will prompt the user for a | |
1667 | password; non-interactive sessions will fail. (default: None) |
|
1667 | password; non-interactive sessions will fail. (default: None) | |
1668 |
|
1668 | |||
1669 | ``local_hostname`` |
|
1669 | ``local_hostname`` | |
1670 | Optional. The hostname that the sender can use to identify |
|
1670 | Optional. The hostname that the sender can use to identify | |
1671 | itself to the MTA. |
|
1671 | itself to the MTA. | |
1672 |
|
1672 | |||
1673 |
|
1673 | |||
1674 | ``subpaths`` |
|
1674 | ``subpaths`` | |
1675 | ------------ |
|
1675 | ------------ | |
1676 |
|
1676 | |||
1677 | Subrepository source URLs can go stale if a remote server changes name |
|
1677 | Subrepository source URLs can go stale if a remote server changes name | |
1678 | or becomes temporarily unavailable. This section lets you define |
|
1678 | or becomes temporarily unavailable. This section lets you define | |
1679 | rewrite rules of the form:: |
|
1679 | rewrite rules of the form:: | |
1680 |
|
1680 | |||
1681 | <pattern> = <replacement> |
|
1681 | <pattern> = <replacement> | |
1682 |
|
1682 | |||
1683 | where ``pattern`` is a regular expression matching a subrepository |
|
1683 | where ``pattern`` is a regular expression matching a subrepository | |
1684 | source URL and ``replacement`` is the replacement string used to |
|
1684 | source URL and ``replacement`` is the replacement string used to | |
1685 | rewrite it. Groups can be matched in ``pattern`` and referenced in |
|
1685 | rewrite it. Groups can be matched in ``pattern`` and referenced in | |
1686 | ``replacements``. For instance:: |
|
1686 | ``replacements``. For instance:: | |
1687 |
|
1687 | |||
1688 | http://server/(.*)-hg/ = http://hg.server/\1/ |
|
1688 | http://server/(.*)-hg/ = http://hg.server/\1/ | |
1689 |
|
1689 | |||
1690 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. |
|
1690 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. | |
1691 |
|
1691 | |||
1692 | Relative subrepository paths are first made absolute, and the |
|
1692 | Relative subrepository paths are first made absolute, and the | |
1693 | rewrite rules are then applied on the full (absolute) path. If ``pattern`` |
|
1693 | rewrite rules are then applied on the full (absolute) path. If ``pattern`` | |
1694 | doesn't match the full path, an attempt is made to apply it on the |
|
1694 | doesn't match the full path, an attempt is made to apply it on the | |
1695 | relative path alone. The rules are applied in definition order. |
|
1695 | relative path alone. The rules are applied in definition order. | |
1696 |
|
1696 | |||
1697 | ``templatealias`` |
|
1697 | ``templatealias`` | |
1698 | ----------------- |
|
1698 | ----------------- | |
1699 |
|
1699 | |||
1700 | Alias definitions for templates. See :hg:`help templates` for details. |
|
1700 | Alias definitions for templates. See :hg:`help templates` for details. | |
1701 |
|
1701 | |||
1702 | ``templates`` |
|
1702 | ``templates`` | |
1703 | ------------- |
|
1703 | ------------- | |
1704 |
|
1704 | |||
1705 | Use the ``[templates]`` section to define template strings. |
|
1705 | Use the ``[templates]`` section to define template strings. | |
1706 | See :hg:`help templates` for details. |
|
1706 | See :hg:`help templates` for details. | |
1707 |
|
1707 | |||
1708 | ``trusted`` |
|
1708 | ``trusted`` | |
1709 | ----------- |
|
1709 | ----------- | |
1710 |
|
1710 | |||
1711 | Mercurial will not use the settings in the |
|
1711 | Mercurial will not use the settings in the | |
1712 | ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted |
|
1712 | ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted | |
1713 | user or to a trusted group, as various hgrc features allow arbitrary |
|
1713 | user or to a trusted group, as various hgrc features allow arbitrary | |
1714 | commands to be run. This issue is often encountered when configuring |
|
1714 | commands to be run. This issue is often encountered when configuring | |
1715 | hooks or extensions for shared repositories or servers. However, |
|
1715 | hooks or extensions for shared repositories or servers. However, | |
1716 | the web interface will use some safe settings from the ``[web]`` |
|
1716 | the web interface will use some safe settings from the ``[web]`` | |
1717 | section. |
|
1717 | section. | |
1718 |
|
1718 | |||
1719 | This section specifies what users and groups are trusted. The |
|
1719 | This section specifies what users and groups are trusted. The | |
1720 | current user is always trusted. To trust everybody, list a user or a |
|
1720 | current user is always trusted. To trust everybody, list a user or a | |
1721 | group with name ``*``. These settings must be placed in an |
|
1721 | group with name ``*``. These settings must be placed in an | |
1722 | *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the |
|
1722 | *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the | |
1723 | user or service running Mercurial. |
|
1723 | user or service running Mercurial. | |
1724 |
|
1724 | |||
1725 | ``users`` |
|
1725 | ``users`` | |
1726 | Comma-separated list of trusted users. |
|
1726 | Comma-separated list of trusted users. | |
1727 |
|
1727 | |||
1728 | ``groups`` |
|
1728 | ``groups`` | |
1729 | Comma-separated list of trusted groups. |
|
1729 | Comma-separated list of trusted groups. | |
1730 |
|
1730 | |||
1731 |
|
1731 | |||
1732 | ``ui`` |
|
1732 | ``ui`` | |
1733 | ------ |
|
1733 | ------ | |
1734 |
|
1734 | |||
1735 | User interface controls. |
|
1735 | User interface controls. | |
1736 |
|
1736 | |||
1737 | ``archivemeta`` |
|
1737 | ``archivemeta`` | |
1738 | Whether to include the .hg_archival.txt file containing meta data |
|
1738 | Whether to include the .hg_archival.txt file containing meta data | |
1739 | (hashes for the repository base and for tip) in archives created |
|
1739 | (hashes for the repository base and for tip) in archives created | |
1740 | by the :hg:`archive` command or downloaded via hgweb. |
|
1740 | by the :hg:`archive` command or downloaded via hgweb. | |
1741 | (default: True) |
|
1741 | (default: True) | |
1742 |
|
1742 | |||
1743 | ``askusername`` |
|
1743 | ``askusername`` | |
1744 | Whether to prompt for a username when committing. If True, and |
|
1744 | Whether to prompt for a username when committing. If True, and | |
1745 | neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will |
|
1745 | neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will | |
1746 | be prompted to enter a username. If no username is entered, the |
|
1746 | be prompted to enter a username. If no username is entered, the | |
1747 | default ``USER@HOST`` is used instead. |
|
1747 | default ``USER@HOST`` is used instead. | |
1748 | (default: False) |
|
1748 | (default: False) | |
1749 |
|
1749 | |||
1750 | ``clonebundles`` |
|
1750 | ``clonebundles`` | |
1751 | Whether the "clone bundles" feature is enabled. |
|
1751 | Whether the "clone bundles" feature is enabled. | |
1752 |
|
1752 | |||
1753 | When enabled, :hg:`clone` may download and apply a server-advertised |
|
1753 | When enabled, :hg:`clone` may download and apply a server-advertised | |
1754 | bundle file from a URL instead of using the normal exchange mechanism. |
|
1754 | bundle file from a URL instead of using the normal exchange mechanism. | |
1755 |
|
1755 | |||
1756 | This can likely result in faster and more reliable clones. |
|
1756 | This can likely result in faster and more reliable clones. | |
1757 |
|
1757 | |||
1758 | (default: True) |
|
1758 | (default: True) | |
1759 |
|
1759 | |||
1760 | ``clonebundlefallback`` |
|
1760 | ``clonebundlefallback`` | |
1761 | Whether failure to apply an advertised "clone bundle" from a server |
|
1761 | Whether failure to apply an advertised "clone bundle" from a server | |
1762 | should result in fallback to a regular clone. |
|
1762 | should result in fallback to a regular clone. | |
1763 |
|
1763 | |||
1764 | This is disabled by default because servers advertising "clone |
|
1764 | This is disabled by default because servers advertising "clone | |
1765 | bundles" often do so to reduce server load. If advertised bundles |
|
1765 | bundles" often do so to reduce server load. If advertised bundles | |
1766 | start mass failing and clients automatically fall back to a regular |
|
1766 | start mass failing and clients automatically fall back to a regular | |
1767 | clone, this would add significant and unexpected load to the server |
|
1767 | clone, this would add significant and unexpected load to the server | |
1768 | since the server is expecting clone operations to be offloaded to |
|
1768 | since the server is expecting clone operations to be offloaded to | |
1769 | pre-generated bundles. Failing fast (the default behavior) ensures |
|
1769 | pre-generated bundles. Failing fast (the default behavior) ensures | |
1770 | clients don't overwhelm the server when "clone bundle" application |
|
1770 | clients don't overwhelm the server when "clone bundle" application | |
1771 | fails. |
|
1771 | fails. | |
1772 |
|
1772 | |||
1773 | (default: False) |
|
1773 | (default: False) | |
1774 |
|
1774 | |||
1775 | ``clonebundleprefers`` |
|
1775 | ``clonebundleprefers`` | |
1776 | Defines preferences for which "clone bundles" to use. |
|
1776 | Defines preferences for which "clone bundles" to use. | |
1777 |
|
1777 | |||
1778 | Servers advertising "clone bundles" may advertise multiple available |
|
1778 | Servers advertising "clone bundles" may advertise multiple available | |
1779 | bundles. Each bundle may have different attributes, such as the bundle |
|
1779 | bundles. Each bundle may have different attributes, such as the bundle | |
1780 | type and compression format. This option is used to prefer a particular |
|
1780 | type and compression format. This option is used to prefer a particular | |
1781 | bundle over another. |
|
1781 | bundle over another. | |
1782 |
|
1782 | |||
1783 | The following keys are defined by Mercurial: |
|
1783 | The following keys are defined by Mercurial: | |
1784 |
|
1784 | |||
1785 | BUNDLESPEC |
|
1785 | BUNDLESPEC | |
1786 | A bundle type specifier. These are strings passed to :hg:`bundle -t`. |
|
1786 | A bundle type specifier. These are strings passed to :hg:`bundle -t`. | |
1787 | e.g. ``gzip-v2`` or ``bzip2-v1``. |
|
1787 | e.g. ``gzip-v2`` or ``bzip2-v1``. | |
1788 |
|
1788 | |||
1789 | COMPRESSION |
|
1789 | COMPRESSION | |
1790 | The compression format of the bundle. e.g. ``gzip`` and ``bzip2``. |
|
1790 | The compression format of the bundle. e.g. ``gzip`` and ``bzip2``. | |
1791 |
|
1791 | |||
1792 | Server operators may define custom keys. |
|
1792 | Server operators may define custom keys. | |
1793 |
|
1793 | |||
1794 | Example values: ``COMPRESSION=bzip2``, |
|
1794 | Example values: ``COMPRESSION=bzip2``, | |
1795 | ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``. |
|
1795 | ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``. | |
1796 |
|
1796 | |||
1797 | By default, the first bundle advertised by the server is used. |
|
1797 | By default, the first bundle advertised by the server is used. | |
1798 |
|
1798 | |||
1799 | ``commitsubrepos`` |
|
1799 | ``commitsubrepos`` | |
1800 | Whether to commit modified subrepositories when committing the |
|
1800 | Whether to commit modified subrepositories when committing the | |
1801 | parent repository. If False and one subrepository has uncommitted |
|
1801 | parent repository. If False and one subrepository has uncommitted | |
1802 | changes, abort the commit. |
|
1802 | changes, abort the commit. | |
1803 | (default: False) |
|
1803 | (default: False) | |
1804 |
|
1804 | |||
1805 | ``debug`` |
|
1805 | ``debug`` | |
1806 | Print debugging information. (default: False) |
|
1806 | Print debugging information. (default: False) | |
1807 |
|
1807 | |||
1808 | ``editor`` |
|
1808 | ``editor`` | |
1809 | The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) |
|
1809 | The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) | |
1810 |
|
1810 | |||
1811 | ``fallbackencoding`` |
|
1811 | ``fallbackencoding`` | |
1812 | Encoding to try if it's not possible to decode the changelog using |
|
1812 | Encoding to try if it's not possible to decode the changelog using | |
1813 | UTF-8. (default: ISO-8859-1) |
|
1813 | UTF-8. (default: ISO-8859-1) | |
1814 |
|
1814 | |||
1815 | ``graphnodetemplate`` |
|
1815 | ``graphnodetemplate`` | |
1816 | The template used to print changeset nodes in an ASCII revision graph. |
|
1816 | The template used to print changeset nodes in an ASCII revision graph. | |
1817 | (default: ``{graphnode}``) |
|
1817 | (default: ``{graphnode}``) | |
1818 |
|
1818 | |||
1819 | ``ignore`` |
|
1819 | ``ignore`` | |
1820 | A file to read per-user ignore patterns from. This file should be |
|
1820 | A file to read per-user ignore patterns from. This file should be | |
1821 | in the same format as a repository-wide .hgignore file. Filenames |
|
1821 | in the same format as a repository-wide .hgignore file. Filenames | |
1822 | are relative to the repository root. This option supports hook syntax, |
|
1822 | are relative to the repository root. This option supports hook syntax, | |
1823 | so if you want to specify multiple ignore files, you can do so by |
|
1823 | so if you want to specify multiple ignore files, you can do so by | |
1824 | setting something like ``ignore.other = ~/.hgignore2``. For details |
|
1824 | setting something like ``ignore.other = ~/.hgignore2``. For details | |
1825 | of the ignore file format, see the ``hgignore(5)`` man page. |
|
1825 | of the ignore file format, see the ``hgignore(5)`` man page. | |
1826 |
|
1826 | |||
1827 | ``interactive`` |
|
1827 | ``interactive`` | |
1828 | Allow to prompt the user. (default: True) |
|
1828 | Allow to prompt the user. (default: True) | |
1829 |
|
1829 | |||
1830 | ``interface`` |
|
1830 | ``interface`` | |
1831 | Select the default interface for interactive features (default: text). |
|
1831 | Select the default interface for interactive features (default: text). | |
1832 | Possible values are 'text' and 'curses'. |
|
1832 | Possible values are 'text' and 'curses'. | |
1833 |
|
1833 | |||
1834 | ``interface.chunkselector`` |
|
1834 | ``interface.chunkselector`` | |
1835 | Select the interface for change recording (e.g. :hg:`commit -i`). |
|
1835 | Select the interface for change recording (e.g. :hg:`commit -i`). | |
1836 | Possible values are 'text' and 'curses'. |
|
1836 | Possible values are 'text' and 'curses'. | |
1837 | This config overrides the interface specified by ui.interface. |
|
1837 | This config overrides the interface specified by ui.interface. | |
1838 |
|
1838 | |||
1839 | ``logtemplate`` |
|
1839 | ``logtemplate`` | |
1840 | Template string for commands that print changesets. |
|
1840 | Template string for commands that print changesets. | |
1841 |
|
1841 | |||
1842 | ``merge`` |
|
1842 | ``merge`` | |
1843 | The conflict resolution program to use during a manual merge. |
|
1843 | The conflict resolution program to use during a manual merge. | |
1844 | For more information on merge tools see :hg:`help merge-tools`. |
|
1844 | For more information on merge tools see :hg:`help merge-tools`. | |
1845 | For configuring merge tools see the ``[merge-tools]`` section. |
|
1845 | For configuring merge tools see the ``[merge-tools]`` section. | |
1846 |
|
1846 | |||
1847 | ``mergemarkers`` |
|
1847 | ``mergemarkers`` | |
1848 | Sets the merge conflict marker label styling. The ``detailed`` |
|
1848 | Sets the merge conflict marker label styling. The ``detailed`` | |
1849 | style uses the ``mergemarkertemplate`` setting to style the labels. |
|
1849 | style uses the ``mergemarkertemplate`` setting to style the labels. | |
1850 | The ``basic`` style just uses 'local' and 'other' as the marker label. |
|
1850 | The ``basic`` style just uses 'local' and 'other' as the marker label. | |
1851 | One of ``basic`` or ``detailed``. |
|
1851 | One of ``basic`` or ``detailed``. | |
1852 | (default: ``basic``) |
|
1852 | (default: ``basic``) | |
1853 |
|
1853 | |||
1854 | ``mergemarkertemplate`` |
|
1854 | ``mergemarkertemplate`` | |
1855 | The template used to print the commit description next to each conflict |
|
1855 | The template used to print the commit description next to each conflict | |
1856 | marker during merge conflicts. See :hg:`help templates` for the template |
|
1856 | marker during merge conflicts. See :hg:`help templates` for the template | |
1857 | format. |
|
1857 | format. | |
1858 |
|
1858 | |||
1859 | Defaults to showing the hash, tags, branches, bookmarks, author, and |
|
1859 | Defaults to showing the hash, tags, branches, bookmarks, author, and | |
1860 | the first line of the commit description. |
|
1860 | the first line of the commit description. | |
1861 |
|
1861 | |||
1862 | If you use non-ASCII characters in names for tags, branches, bookmarks, |
|
1862 | If you use non-ASCII characters in names for tags, branches, bookmarks, | |
1863 | authors, and/or commit descriptions, you must pay attention to encodings of |
|
1863 | authors, and/or commit descriptions, you must pay attention to encodings of | |
1864 | managed files. At template expansion, non-ASCII characters use the encoding |
|
1864 | managed files. At template expansion, non-ASCII characters use the encoding | |
1865 | specified by the ``--encoding`` global option, ``HGENCODING`` or other |
|
1865 | specified by the ``--encoding`` global option, ``HGENCODING`` or other | |
1866 | environment variables that govern your locale. If the encoding of the merge |
|
1866 | environment variables that govern your locale. If the encoding of the merge | |
1867 | markers is different from the encoding of the merged files, |
|
1867 | markers is different from the encoding of the merged files, | |
1868 | serious problems may occur. |
|
1868 | serious problems may occur. | |
1869 |
|
1869 | |||
1870 | ``origbackuppath`` |
|
1870 | ``origbackuppath`` | |
1871 | The path to a directory used to store generated .orig files. If the path is |
|
1871 | The path to a directory used to store generated .orig files. If the path is | |
1872 | not a directory, one will be created. |
|
1872 | not a directory, one will be created. | |
1873 |
|
1873 | |||
1874 | ``patch`` |
|
1874 | ``patch`` | |
1875 | An optional external tool that ``hg import`` and some extensions |
|
1875 | An optional external tool that ``hg import`` and some extensions | |
1876 | will use for applying patches. By default Mercurial uses an |
|
1876 | will use for applying patches. By default Mercurial uses an | |
1877 | internal patch utility. The external tool must work as the common |
|
1877 | internal patch utility. The external tool must work as the common | |
1878 | Unix ``patch`` program. In particular, it must accept a ``-p`` |
|
1878 | Unix ``patch`` program. In particular, it must accept a ``-p`` | |
1879 | argument to strip patch headers, a ``-d`` argument to specify the |
|
1879 | argument to strip patch headers, a ``-d`` argument to specify the | |
1880 | current directory, a file name to patch, and a patch file to take |
|
1880 | current directory, a file name to patch, and a patch file to take | |
1881 | from stdin. |
|
1881 | from stdin. | |
1882 |
|
1882 | |||
1883 | It is possible to specify a patch tool together with extra |
|
1883 | It is possible to specify a patch tool together with extra | |
1884 | arguments. For example, setting this option to ``patch --merge`` |
|
1884 | arguments. For example, setting this option to ``patch --merge`` | |
1885 | will use the ``patch`` program with its 2-way merge option. |
|
1885 | will use the ``patch`` program with its 2-way merge option. | |
1886 |
|
1886 | |||
1887 | ``portablefilenames`` |
|
1887 | ``portablefilenames`` | |
1888 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
|
1888 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. | |
1889 | (default: ``warn``) |
|
1889 | (default: ``warn``) | |
1890 |
|
1890 | |||
1891 | ``warn`` |
|
1891 | ``warn`` | |
1892 | Print a warning message on POSIX platforms, if a file with a non-portable |
|
1892 | Print a warning message on POSIX platforms, if a file with a non-portable | |
1893 | filename is added (e.g. a file with a name that can't be created on |
|
1893 | filename is added (e.g. a file with a name that can't be created on | |
1894 | Windows because it contains reserved parts like ``AUX``, reserved |
|
1894 | Windows because it contains reserved parts like ``AUX``, reserved | |
1895 | characters like ``:``, or would cause a case collision with an existing |
|
1895 | characters like ``:``, or would cause a case collision with an existing | |
1896 | file). |
|
1896 | file). | |
1897 |
|
1897 | |||
1898 | ``ignore`` |
|
1898 | ``ignore`` | |
1899 | Don't print a warning. |
|
1899 | Don't print a warning. | |
1900 |
|
1900 | |||
1901 | ``abort`` |
|
1901 | ``abort`` | |
1902 | The command is aborted. |
|
1902 | The command is aborted. | |
1903 |
|
1903 | |||
1904 | ``true`` |
|
1904 | ``true`` | |
1905 | Alias for ``warn``. |
|
1905 | Alias for ``warn``. | |
1906 |
|
1906 | |||
1907 | ``false`` |
|
1907 | ``false`` | |
1908 | Alias for ``ignore``. |
|
1908 | Alias for ``ignore``. | |
1909 |
|
1909 | |||
1910 | .. container:: windows |
|
1910 | .. container:: windows | |
1911 |
|
1911 | |||
1912 | On Windows, this configuration option is ignored and the command aborted. |
|
1912 | On Windows, this configuration option is ignored and the command aborted. | |
1913 |
|
1913 | |||
1914 | ``quiet`` |
|
1914 | ``quiet`` | |
1915 | Reduce the amount of output printed. |
|
1915 | Reduce the amount of output printed. | |
1916 | (default: False) |
|
1916 | (default: False) | |
1917 |
|
1917 | |||
1918 | ``remotecmd`` |
|
1918 | ``remotecmd`` | |
1919 | Remote command to use for clone/push/pull operations. |
|
1919 | Remote command to use for clone/push/pull operations. | |
1920 | (default: ``hg``) |
|
1920 | (default: ``hg``) | |
1921 |
|
1921 | |||
1922 | ``report_untrusted`` |
|
1922 | ``report_untrusted`` | |
1923 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a |
|
1923 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a | |
1924 | trusted user or group. |
|
1924 | trusted user or group. | |
1925 | (default: True) |
|
1925 | (default: True) | |
1926 |
|
1926 | |||
1927 | ``slash`` |
|
1927 | ``slash`` | |
1928 | Display paths using a slash (``/``) as the path separator. This |
|
1928 | Display paths using a slash (``/``) as the path separator. This | |
1929 | only makes a difference on systems where the default path |
|
1929 | only makes a difference on systems where the default path | |
1930 | separator is not the slash character (e.g. Windows uses the |
|
1930 | separator is not the slash character (e.g. Windows uses the | |
1931 | backslash character (``\``)). |
|
1931 | backslash character (``\``)). | |
1932 | (default: False) |
|
1932 | (default: False) | |
1933 |
|
1933 | |||
1934 | ``statuscopies`` |
|
1934 | ``statuscopies`` | |
1935 | Display copies in the status command. |
|
1935 | Display copies in the status command. | |
1936 |
|
1936 | |||
1937 | ``ssh`` |
|
1937 | ``ssh`` | |
1938 | Command to use for SSH connections. (default: ``ssh``) |
|
1938 | Command to use for SSH connections. (default: ``ssh``) | |
1939 |
|
1939 | |||
1940 | ``strict`` |
|
1940 | ``strict`` | |
1941 | Require exact command names, instead of allowing unambiguous |
|
1941 | Require exact command names, instead of allowing unambiguous | |
1942 | abbreviations. (default: False) |
|
1942 | abbreviations. (default: False) | |
1943 |
|
1943 | |||
1944 | ``style`` |
|
1944 | ``style`` | |
1945 | Name of style to use for command output. |
|
1945 | Name of style to use for command output. | |
1946 |
|
1946 | |||
1947 | ``supportcontact`` |
|
1947 | ``supportcontact`` | |
1948 | A URL where users should report a Mercurial traceback. Use this if you are a |
|
1948 | A URL where users should report a Mercurial traceback. Use this if you are a | |
1949 | large organisation with its own Mercurial deployment process and crash |
|
1949 | large organisation with its own Mercurial deployment process and crash | |
1950 | reports should be addressed to your internal support. |
|
1950 | reports should be addressed to your internal support. | |
1951 |
|
1951 | |||
1952 | ``textwidth`` |
|
1952 | ``textwidth`` | |
1953 | Maximum width of help text. A longer line generated by ``hg help`` or |
|
1953 | Maximum width of help text. A longer line generated by ``hg help`` or | |
1954 | ``hg subcommand --help`` will be broken after white space to get this |
|
1954 | ``hg subcommand --help`` will be broken after white space to get this | |
1955 | width or the terminal width, whichever comes first. |
|
1955 | width or the terminal width, whichever comes first. | |
1956 | A non-positive value will disable this and the terminal width will be |
|
1956 | A non-positive value will disable this and the terminal width will be | |
1957 | used. (default: 78) |
|
1957 | used. (default: 78) | |
1958 |
|
1958 | |||
1959 | ``timeout`` |
|
1959 | ``timeout`` | |
1960 | The timeout used when a lock is held (in seconds), a negative value |
|
1960 | The timeout used when a lock is held (in seconds), a negative value | |
1961 | means no timeout. (default: 600) |
|
1961 | means no timeout. (default: 600) | |
1962 |
|
1962 | |||
1963 | ``traceback`` |
|
1963 | ``traceback`` | |
1964 | Mercurial always prints a traceback when an unknown exception |
|
1964 | Mercurial always prints a traceback when an unknown exception | |
1965 | occurs. Setting this to True will make Mercurial print a traceback |
|
1965 | occurs. Setting this to True will make Mercurial print a traceback | |
1966 | on all exceptions, even those recognized by Mercurial (such as |
|
1966 | on all exceptions, even those recognized by Mercurial (such as | |
1967 | IOError or MemoryError). (default: False) |
|
1967 | IOError or MemoryError). (default: False) | |
1968 |
|
1968 | |||
1969 | ``username`` |
|
1969 | ``username`` | |
1970 | The committer of a changeset created when running "commit". |
|
1970 | The committer of a changeset created when running "commit". | |
1971 | Typically a person's name and email address, e.g. ``Fred Widget |
|
1971 | Typically a person's name and email address, e.g. ``Fred Widget | |
1972 | <fred@example.com>``. Environment variables in the |
|
1972 | <fred@example.com>``. Environment variables in the | |
1973 | username are expanded. |
|
1973 | username are expanded. | |
1974 |
|
1974 | |||
1975 | (default: ``$EMAIL`` or ``username@hostname``. If the username in |
|
1975 | (default: ``$EMAIL`` or ``username@hostname``. If the username in | |
1976 | hgrc is empty, e.g. if the system admin set ``username =`` in the |
|
1976 | hgrc is empty, e.g. if the system admin set ``username =`` in the | |
1977 | system hgrc, it has to be specified manually or in a different |
|
1977 | system hgrc, it has to be specified manually or in a different | |
1978 | hgrc file) |
|
1978 | hgrc file) | |
1979 |
|
1979 | |||
1980 | ``verbose`` |
|
1980 | ``verbose`` | |
1981 | Increase the amount of output printed. (default: False) |
|
1981 | Increase the amount of output printed. (default: False) | |
1982 |
|
1982 | |||
1983 |
|
1983 | |||
1984 | ``web`` |
|
1984 | ``web`` | |
1985 | ------- |
|
1985 | ------- | |
1986 |
|
1986 | |||
1987 | Web interface configuration. The settings in this section apply to |
|
1987 | Web interface configuration. The settings in this section apply to | |
1988 | both the builtin webserver (started by :hg:`serve`) and the script you |
|
1988 | both the builtin webserver (started by :hg:`serve`) and the script you | |
1989 | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI |
|
1989 | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI | |
1990 | and WSGI). |
|
1990 | and WSGI). | |
1991 |
|
1991 | |||
1992 | The Mercurial webserver does no authentication (it does not prompt for |
|
1992 | The Mercurial webserver does no authentication (it does not prompt for | |
1993 | usernames and passwords to validate *who* users are), but it does do |
|
1993 | usernames and passwords to validate *who* users are), but it does do | |
1994 | authorization (it grants or denies access for *authenticated users* |
|
1994 | authorization (it grants or denies access for *authenticated users* | |
1995 | based on settings in this section). You must either configure your |
|
1995 | based on settings in this section). You must either configure your | |
1996 | webserver to do authentication for you, or disable the authorization |
|
1996 | webserver to do authentication for you, or disable the authorization | |
1997 | checks. |
|
1997 | checks. | |
1998 |
|
1998 | |||
1999 | For a quick setup in a trusted environment, e.g., a private LAN, where |
|
1999 | For a quick setup in a trusted environment, e.g., a private LAN, where | |
2000 | you want it to accept pushes from anybody, you can use the following |
|
2000 | you want it to accept pushes from anybody, you can use the following | |
2001 | command line:: |
|
2001 | command line:: | |
2002 |
|
2002 | |||
2003 | $ hg --config web.allow_push=* --config web.push_ssl=False serve |
|
2003 | $ hg --config web.allow_push=* --config web.push_ssl=False serve | |
2004 |
|
2004 | |||
2005 | Note that this will allow anybody to push anything to the server and |
|
2005 | Note that this will allow anybody to push anything to the server and | |
2006 | that this should not be used for public servers. |
|
2006 | that this should not be used for public servers. | |
2007 |
|
2007 | |||
2008 | The full set of options is: |
|
2008 | The full set of options is: | |
2009 |
|
2009 | |||
2010 | ``accesslog`` |
|
2010 | ``accesslog`` | |
2011 | Where to output the access log. (default: stdout) |
|
2011 | Where to output the access log. (default: stdout) | |
2012 |
|
2012 | |||
2013 | ``address`` |
|
2013 | ``address`` | |
2014 | Interface address to bind to. (default: all) |
|
2014 | Interface address to bind to. (default: all) | |
2015 |
|
2015 | |||
2016 | ``allow_archive`` |
|
2016 | ``allow_archive`` | |
2017 | List of archive format (bz2, gz, zip) allowed for downloading. |
|
2017 | List of archive format (bz2, gz, zip) allowed for downloading. | |
2018 | (default: empty) |
|
2018 | (default: empty) | |
2019 |
|
2019 | |||
2020 | ``allowbz2`` |
|
2020 | ``allowbz2`` | |
2021 | (DEPRECATED) Whether to allow .tar.bz2 downloading of repository |
|
2021 | (DEPRECATED) Whether to allow .tar.bz2 downloading of repository | |
2022 | revisions. |
|
2022 | revisions. | |
2023 | (default: False) |
|
2023 | (default: False) | |
2024 |
|
2024 | |||
2025 | ``allowgz`` |
|
2025 | ``allowgz`` | |
2026 | (DEPRECATED) Whether to allow .tar.gz downloading of repository |
|
2026 | (DEPRECATED) Whether to allow .tar.gz downloading of repository | |
2027 | revisions. |
|
2027 | revisions. | |
2028 | (default: False) |
|
2028 | (default: False) | |
2029 |
|
2029 | |||
2030 | ``allowpull`` |
|
2030 | ``allowpull`` | |
2031 | Whether to allow pulling from the repository. (default: True) |
|
2031 | Whether to allow pulling from the repository. (default: True) | |
2032 |
|
2032 | |||
2033 | ``allow_push`` |
|
2033 | ``allow_push`` | |
2034 | Whether to allow pushing to the repository. If empty or not set, |
|
2034 | Whether to allow pushing to the repository. If empty or not set, | |
2035 | pushing is not allowed. If the special value ``*``, any remote |
|
2035 | pushing is not allowed. If the special value ``*``, any remote | |
2036 | user can push, including unauthenticated users. Otherwise, the |
|
2036 | user can push, including unauthenticated users. Otherwise, the | |
2037 | remote user must have been authenticated, and the authenticated |
|
2037 | remote user must have been authenticated, and the authenticated | |
2038 | user name must be present in this list. The contents of the |
|
2038 | user name must be present in this list. The contents of the | |
2039 | allow_push list are examined after the deny_push list. |
|
2039 | allow_push list are examined after the deny_push list. | |
2040 |
|
2040 | |||
2041 | ``allow_read`` |
|
2041 | ``allow_read`` | |
2042 | If the user has not already been denied repository access due to |
|
2042 | If the user has not already been denied repository access due to | |
2043 | the contents of deny_read, this list determines whether to grant |
|
2043 | the contents of deny_read, this list determines whether to grant | |
2044 | repository access to the user. If this list is not empty, and the |
|
2044 | repository access to the user. If this list is not empty, and the | |
2045 | user is unauthenticated or not present in the list, then access is |
|
2045 | user is unauthenticated or not present in the list, then access is | |
2046 | denied for the user. If the list is empty or not set, then access |
|
2046 | denied for the user. If the list is empty or not set, then access | |
2047 | is permitted to all users by default. Setting allow_read to the |
|
2047 | is permitted to all users by default. Setting allow_read to the | |
2048 | special value ``*`` is equivalent to it not being set (i.e. access |
|
2048 | special value ``*`` is equivalent to it not being set (i.e. access | |
2049 | is permitted to all users). The contents of the allow_read list are |
|
2049 | is permitted to all users). The contents of the allow_read list are | |
2050 | examined after the deny_read list. |
|
2050 | examined after the deny_read list. | |
2051 |
|
2051 | |||
2052 | ``allowzip`` |
|
2052 | ``allowzip`` | |
2053 | (DEPRECATED) Whether to allow .zip downloading of repository |
|
2053 | (DEPRECATED) Whether to allow .zip downloading of repository | |
2054 | revisions. This feature creates temporary files. |
|
2054 | revisions. This feature creates temporary files. | |
2055 | (default: False) |
|
2055 | (default: False) | |
2056 |
|
2056 | |||
2057 | ``archivesubrepos`` |
|
2057 | ``archivesubrepos`` | |
2058 | Whether to recurse into subrepositories when archiving. |
|
2058 | Whether to recurse into subrepositories when archiving. | |
2059 | (default: False) |
|
2059 | (default: False) | |
2060 |
|
2060 | |||
2061 | ``baseurl`` |
|
2061 | ``baseurl`` | |
2062 | Base URL to use when publishing URLs in other locations, so |
|
2062 | Base URL to use when publishing URLs in other locations, so | |
2063 | third-party tools like email notification hooks can construct |
|
2063 | third-party tools like email notification hooks can construct | |
2064 | URLs. Example: ``http://hgserver/repos/``. |
|
2064 | URLs. Example: ``http://hgserver/repos/``. | |
2065 |
|
2065 | |||
2066 | ``cacerts`` |
|
2066 | ``cacerts`` | |
2067 | Path to file containing a list of PEM encoded certificate |
|
2067 | Path to file containing a list of PEM encoded certificate | |
2068 | authority certificates. Environment variables and ``~user`` |
|
2068 | authority certificates. Environment variables and ``~user`` | |
2069 | constructs are expanded in the filename. If specified on the |
|
2069 | constructs are expanded in the filename. If specified on the | |
2070 | client, then it will verify the identity of remote HTTPS servers |
|
2070 | client, then it will verify the identity of remote HTTPS servers | |
2071 | with these certificates. |
|
2071 | with these certificates. | |
2072 |
|
2072 | |||
2073 | To disable SSL verification temporarily, specify ``--insecure`` from |
|
2073 | To disable SSL verification temporarily, specify ``--insecure`` from | |
2074 | command line. |
|
2074 | command line. | |
2075 |
|
2075 | |||
2076 | You can use OpenSSL's CA certificate file if your platform has |
|
2076 | You can use OpenSSL's CA certificate file if your platform has | |
2077 | one. On most Linux systems this will be |
|
2077 | one. On most Linux systems this will be | |
2078 | ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to |
|
2078 | ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to | |
2079 | generate this file manually. The form must be as follows:: |
|
2079 | generate this file manually. The form must be as follows:: | |
2080 |
|
2080 | |||
2081 | -----BEGIN CERTIFICATE----- |
|
2081 | -----BEGIN CERTIFICATE----- | |
2082 | ... (certificate in base64 PEM encoding) ... |
|
2082 | ... (certificate in base64 PEM encoding) ... | |
2083 | -----END CERTIFICATE----- |
|
2083 | -----END CERTIFICATE----- | |
2084 | -----BEGIN CERTIFICATE----- |
|
2084 | -----BEGIN CERTIFICATE----- | |
2085 | ... (certificate in base64 PEM encoding) ... |
|
2085 | ... (certificate in base64 PEM encoding) ... | |
2086 | -----END CERTIFICATE----- |
|
2086 | -----END CERTIFICATE----- | |
2087 |
|
2087 | |||
2088 | ``cache`` |
|
2088 | ``cache`` | |
2089 | Whether to support caching in hgweb. (default: True) |
|
2089 | Whether to support caching in hgweb. (default: True) | |
2090 |
|
2090 | |||
2091 | ``certificate`` |
|
2091 | ``certificate`` | |
2092 | Certificate to use when running :hg:`serve`. |
|
2092 | Certificate to use when running :hg:`serve`. | |
2093 |
|
2093 | |||
2094 | ``collapse`` |
|
2094 | ``collapse`` | |
2095 | With ``descend`` enabled, repositories in subdirectories are shown at |
|
2095 | With ``descend`` enabled, repositories in subdirectories are shown at | |
2096 | a single level alongside repositories in the current path. With |
|
2096 | a single level alongside repositories in the current path. With | |
2097 | ``collapse`` also enabled, repositories residing at a deeper level than |
|
2097 | ``collapse`` also enabled, repositories residing at a deeper level than | |
2098 | the current path are grouped behind navigable directory entries that |
|
2098 | the current path are grouped behind navigable directory entries that | |
2099 | lead to the locations of these repositories. In effect, this setting |
|
2099 | lead to the locations of these repositories. In effect, this setting | |
2100 | collapses each collection of repositories found within a subdirectory |
|
2100 | collapses each collection of repositories found within a subdirectory | |
2101 | into a single entry for that subdirectory. (default: False) |
|
2101 | into a single entry for that subdirectory. (default: False) | |
2102 |
|
2102 | |||
2103 | ``comparisoncontext`` |
|
2103 | ``comparisoncontext`` | |
2104 | Number of lines of context to show in side-by-side file comparison. If |
|
2104 | Number of lines of context to show in side-by-side file comparison. If | |
2105 | negative or the value ``full``, whole files are shown. (default: 5) |
|
2105 | negative or the value ``full``, whole files are shown. (default: 5) | |
2106 |
|
2106 | |||
2107 | This setting can be overridden by a ``context`` request parameter to the |
|
2107 | This setting can be overridden by a ``context`` request parameter to the | |
2108 | ``comparison`` command, taking the same values. |
|
2108 | ``comparison`` command, taking the same values. | |
2109 |
|
2109 | |||
2110 | ``contact`` |
|
2110 | ``contact`` | |
2111 | Name or email address of the person in charge of the repository. |
|
2111 | Name or email address of the person in charge of the repository. | |
2112 | (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty) |
|
2112 | (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty) | |
2113 |
|
2113 | |||
|
2114 | ``csp`` | |||
|
2115 | Send a ``Content-Security-Policy`` HTTP header with this value. | |||
|
2116 | ||||
|
2117 | The value may contain a special string ``%nonce%``, which will be replaced | |||
|
2118 | by a randomly-generated one-time use value. If the value contains | |||
|
2119 | ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the | |||
|
2120 | one-time property of the nonce. This nonce will also be inserted into | |||
|
2121 | ``<script>`` elements containing inline JavaScript. | |||
|
2122 | ||||
|
2123 | Note: lots of HTML content sent by the server is derived from repository | |||
|
2124 | data. Please consider the potential for malicious repository data to | |||
|
2125 | "inject" itself into generated HTML content as part of your security | |||
|
2126 | threat model. | |||
|
2127 | ||||
2114 | ``deny_push`` |
|
2128 | ``deny_push`` | |
2115 | Whether to deny pushing to the repository. If empty or not set, |
|
2129 | Whether to deny pushing to the repository. If empty or not set, | |
2116 | push is not denied. If the special value ``*``, all remote users are |
|
2130 | push is not denied. If the special value ``*``, all remote users are | |
2117 | denied push. Otherwise, unauthenticated users are all denied, and |
|
2131 | denied push. Otherwise, unauthenticated users are all denied, and | |
2118 | any authenticated user name present in this list is also denied. The |
|
2132 | any authenticated user name present in this list is also denied. The | |
2119 | contents of the deny_push list are examined before the allow_push list. |
|
2133 | contents of the deny_push list are examined before the allow_push list. | |
2120 |
|
2134 | |||
2121 | ``deny_read`` |
|
2135 | ``deny_read`` | |
2122 | Whether to deny reading/viewing of the repository. If this list is |
|
2136 | Whether to deny reading/viewing of the repository. If this list is | |
2123 | not empty, unauthenticated users are all denied, and any |
|
2137 | not empty, unauthenticated users are all denied, and any | |
2124 | authenticated user name present in this list is also denied access to |
|
2138 | authenticated user name present in this list is also denied access to | |
2125 | the repository. If set to the special value ``*``, all remote users |
|
2139 | the repository. If set to the special value ``*``, all remote users | |
2126 | are denied access (rarely needed ;). If deny_read is empty or not set, |
|
2140 | are denied access (rarely needed ;). If deny_read is empty or not set, | |
2127 | the determination of repository access depends on the presence and |
|
2141 | the determination of repository access depends on the presence and | |
2128 | content of the allow_read list (see description). If both |
|
2142 | content of the allow_read list (see description). If both | |
2129 | deny_read and allow_read are empty or not set, then access is |
|
2143 | deny_read and allow_read are empty or not set, then access is | |
2130 | permitted to all users by default. If the repository is being |
|
2144 | permitted to all users by default. If the repository is being | |
2131 | served via hgwebdir, denied users will not be able to see it in |
|
2145 | served via hgwebdir, denied users will not be able to see it in | |
2132 | the list of repositories. The contents of the deny_read list have |
|
2146 | the list of repositories. The contents of the deny_read list have | |
2133 | priority over (are examined before) the contents of the allow_read |
|
2147 | priority over (are examined before) the contents of the allow_read | |
2134 | list. |
|
2148 | list. | |
2135 |
|
2149 | |||
2136 | ``descend`` |
|
2150 | ``descend`` | |
2137 | hgwebdir indexes will not descend into subdirectories. Only repositories |
|
2151 | hgwebdir indexes will not descend into subdirectories. Only repositories | |
2138 | directly in the current path will be shown (other repositories are still |
|
2152 | directly in the current path will be shown (other repositories are still | |
2139 | available from the index corresponding to their containing path). |
|
2153 | available from the index corresponding to their containing path). | |
2140 |
|
2154 | |||
2141 | ``description`` |
|
2155 | ``description`` | |
2142 | Textual description of the repository's purpose or contents. |
|
2156 | Textual description of the repository's purpose or contents. | |
2143 | (default: "unknown") |
|
2157 | (default: "unknown") | |
2144 |
|
2158 | |||
2145 | ``encoding`` |
|
2159 | ``encoding`` | |
2146 | Character encoding name. (default: the current locale charset) |
|
2160 | Character encoding name. (default: the current locale charset) | |
2147 | Example: "UTF-8". |
|
2161 | Example: "UTF-8". | |
2148 |
|
2162 | |||
2149 | ``errorlog`` |
|
2163 | ``errorlog`` | |
2150 | Where to output the error log. (default: stderr) |
|
2164 | Where to output the error log. (default: stderr) | |
2151 |
|
2165 | |||
2152 | ``guessmime`` |
|
2166 | ``guessmime`` | |
2153 | Control MIME types for raw download of file content. |
|
2167 | Control MIME types for raw download of file content. | |
2154 | Set to True to let hgweb guess the content type from the file |
|
2168 | Set to True to let hgweb guess the content type from the file | |
2155 | extension. This will serve HTML files as ``text/html`` and might |
|
2169 | extension. This will serve HTML files as ``text/html`` and might | |
2156 | allow cross-site scripting attacks when serving untrusted |
|
2170 | allow cross-site scripting attacks when serving untrusted | |
2157 | repositories. (default: False) |
|
2171 | repositories. (default: False) | |
2158 |
|
2172 | |||
2159 | ``hidden`` |
|
2173 | ``hidden`` | |
2160 | Whether to hide the repository in the hgwebdir index. |
|
2174 | Whether to hide the repository in the hgwebdir index. | |
2161 | (default: False) |
|
2175 | (default: False) | |
2162 |
|
2176 | |||
2163 | ``ipv6`` |
|
2177 | ``ipv6`` | |
2164 | Whether to use IPv6. (default: False) |
|
2178 | Whether to use IPv6. (default: False) | |
2165 |
|
2179 | |||
2166 | ``labels`` |
|
2180 | ``labels`` | |
2167 | List of string *labels* associated with the repository. |
|
2181 | List of string *labels* associated with the repository. | |
2168 |
|
2182 | |||
2169 | Labels are exposed as a template keyword and can be used to customize |
|
2183 | Labels are exposed as a template keyword and can be used to customize | |
2170 | output. e.g. the ``index`` template can group or filter repositories |
|
2184 | output. e.g. the ``index`` template can group or filter repositories | |
2171 | by labels and the ``summary`` template can display additional content |
|
2185 | by labels and the ``summary`` template can display additional content | |
2172 | if a specific label is present. |
|
2186 | if a specific label is present. | |
2173 |
|
2187 | |||
2174 | ``logoimg`` |
|
2188 | ``logoimg`` | |
2175 | File name of the logo image that some templates display on each page. |
|
2189 | File name of the logo image that some templates display on each page. | |
2176 | The file name is relative to ``staticurl``. That is, the full path to |
|
2190 | The file name is relative to ``staticurl``. That is, the full path to | |
2177 | the logo image is "staticurl/logoimg". |
|
2191 | the logo image is "staticurl/logoimg". | |
2178 | If unset, ``hglogo.png`` will be used. |
|
2192 | If unset, ``hglogo.png`` will be used. | |
2179 |
|
2193 | |||
2180 | ``logourl`` |
|
2194 | ``logourl`` | |
2181 | Base URL to use for logos. If unset, ``https://mercurial-scm.org/`` |
|
2195 | Base URL to use for logos. If unset, ``https://mercurial-scm.org/`` | |
2182 | will be used. |
|
2196 | will be used. | |
2183 |
|
2197 | |||
2184 | ``maxchanges`` |
|
2198 | ``maxchanges`` | |
2185 | Maximum number of changes to list on the changelog. (default: 10) |
|
2199 | Maximum number of changes to list on the changelog. (default: 10) | |
2186 |
|
2200 | |||
2187 | ``maxfiles`` |
|
2201 | ``maxfiles`` | |
2188 | Maximum number of files to list per changeset. (default: 10) |
|
2202 | Maximum number of files to list per changeset. (default: 10) | |
2189 |
|
2203 | |||
2190 | ``maxshortchanges`` |
|
2204 | ``maxshortchanges`` | |
2191 | Maximum number of changes to list on the shortlog, graph or filelog |
|
2205 | Maximum number of changes to list on the shortlog, graph or filelog | |
2192 | pages. (default: 60) |
|
2206 | pages. (default: 60) | |
2193 |
|
2207 | |||
2194 | ``name`` |
|
2208 | ``name`` | |
2195 | Repository name to use in the web interface. |
|
2209 | Repository name to use in the web interface. | |
2196 | (default: current working directory) |
|
2210 | (default: current working directory) | |
2197 |
|
2211 | |||
2198 | ``port`` |
|
2212 | ``port`` | |
2199 | Port to listen on. (default: 8000) |
|
2213 | Port to listen on. (default: 8000) | |
2200 |
|
2214 | |||
2201 | ``prefix`` |
|
2215 | ``prefix`` | |
2202 | Prefix path to serve from. (default: '' (server root)) |
|
2216 | Prefix path to serve from. (default: '' (server root)) | |
2203 |
|
2217 | |||
2204 | ``push_ssl`` |
|
2218 | ``push_ssl`` | |
2205 | Whether to require that inbound pushes be transported over SSL to |
|
2219 | Whether to require that inbound pushes be transported over SSL to | |
2206 | prevent password sniffing. (default: True) |
|
2220 | prevent password sniffing. (default: True) | |
2207 |
|
2221 | |||
2208 | ``refreshinterval`` |
|
2222 | ``refreshinterval`` | |
2209 | How frequently directory listings re-scan the filesystem for new |
|
2223 | How frequently directory listings re-scan the filesystem for new | |
2210 | repositories, in seconds. This is relevant when wildcards are used |
|
2224 | repositories, in seconds. This is relevant when wildcards are used | |
2211 | to define paths. Depending on how much filesystem traversal is |
|
2225 | to define paths. Depending on how much filesystem traversal is | |
2212 | required, refreshing may negatively impact performance. |
|
2226 | required, refreshing may negatively impact performance. | |
2213 |
|
2227 | |||
2214 | Values less than or equal to 0 always refresh. |
|
2228 | Values less than or equal to 0 always refresh. | |
2215 | (default: 20) |
|
2229 | (default: 20) | |
2216 |
|
2230 | |||
2217 | ``staticurl`` |
|
2231 | ``staticurl`` | |
2218 | Base URL to use for static files. If unset, static files (e.g. the |
|
2232 | Base URL to use for static files. If unset, static files (e.g. the | |
2219 | hgicon.png favicon) will be served by the CGI script itself. Use |
|
2233 | hgicon.png favicon) will be served by the CGI script itself. Use | |
2220 | this setting to serve them directly with the HTTP server. |
|
2234 | this setting to serve them directly with the HTTP server. | |
2221 | Example: ``http://hgserver/static/``. |
|
2235 | Example: ``http://hgserver/static/``. | |
2222 |
|
2236 | |||
2223 | ``stripes`` |
|
2237 | ``stripes`` | |
2224 | How many lines a "zebra stripe" should span in multi-line output. |
|
2238 | How many lines a "zebra stripe" should span in multi-line output. | |
2225 | Set to 0 to disable. (default: 1) |
|
2239 | Set to 0 to disable. (default: 1) | |
2226 |
|
2240 | |||
2227 | ``style`` |
|
2241 | ``style`` | |
2228 | Which template map style to use. The available options are the names of |
|
2242 | Which template map style to use. The available options are the names of | |
2229 | subdirectories in the HTML templates path. (default: ``paper``) |
|
2243 | subdirectories in the HTML templates path. (default: ``paper``) | |
2230 | Example: ``monoblue``. |
|
2244 | Example: ``monoblue``. | |
2231 |
|
2245 | |||
2232 | ``templates`` |
|
2246 | ``templates`` | |
2233 | Where to find the HTML templates. The default path to the HTML templates |
|
2247 | Where to find the HTML templates. The default path to the HTML templates | |
2234 | can be obtained from ``hg debuginstall``. |
|
2248 | can be obtained from ``hg debuginstall``. | |
2235 |
|
2249 | |||
2236 | ``websub`` |
|
2250 | ``websub`` | |
2237 | ---------- |
|
2251 | ---------- | |
2238 |
|
2252 | |||
2239 | Web substitution filter definition. You can use this section to |
|
2253 | Web substitution filter definition. You can use this section to | |
2240 | define a set of regular expression substitution patterns which |
|
2254 | define a set of regular expression substitution patterns which | |
2241 | let you automatically modify the hgweb server output. |
|
2255 | let you automatically modify the hgweb server output. | |
2242 |
|
2256 | |||
2243 | The default hgweb templates only apply these substitution patterns |
|
2257 | The default hgweb templates only apply these substitution patterns | |
2244 | on the revision description fields. You can apply them anywhere |
|
2258 | on the revision description fields. You can apply them anywhere | |
2245 | you want when you create your own templates by adding calls to the |
|
2259 | you want when you create your own templates by adding calls to the | |
2246 | "websub" filter (usually after calling the "escape" filter). |
|
2260 | "websub" filter (usually after calling the "escape" filter). | |
2247 |
|
2261 | |||
2248 | This can be used, for example, to convert issue references to links |
|
2262 | This can be used, for example, to convert issue references to links | |
2249 | to your issue tracker, or to convert "markdown-like" syntax into |
|
2263 | to your issue tracker, or to convert "markdown-like" syntax into | |
2250 | HTML (see the examples below). |
|
2264 | HTML (see the examples below). | |
2251 |
|
2265 | |||
2252 | Each entry in this section names a substitution filter. |
|
2266 | Each entry in this section names a substitution filter. | |
2253 | The value of each entry defines the substitution expression itself. |
|
2267 | The value of each entry defines the substitution expression itself. | |
2254 | The websub expressions follow the old interhg extension syntax, |
|
2268 | The websub expressions follow the old interhg extension syntax, | |
2255 | which in turn imitates the Unix sed replacement syntax:: |
|
2269 | which in turn imitates the Unix sed replacement syntax:: | |
2256 |
|
2270 | |||
2257 | patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] |
|
2271 | patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] | |
2258 |
|
2272 | |||
2259 | You can use any separator other than "/". The final "i" is optional |
|
2273 | You can use any separator other than "/". The final "i" is optional | |
2260 | and indicates that the search must be case insensitive. |
|
2274 | and indicates that the search must be case insensitive. | |
2261 |
|
2275 | |||
2262 | Examples:: |
|
2276 | Examples:: | |
2263 |
|
2277 | |||
2264 | [websub] |
|
2278 | [websub] | |
2265 | issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i |
|
2279 | issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i | |
2266 | italic = s/\b_(\S+)_\b/<i>\1<\/i>/ |
|
2280 | italic = s/\b_(\S+)_\b/<i>\1<\/i>/ | |
2267 | bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ |
|
2281 | bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ | |
2268 |
|
2282 | |||
2269 | ``worker`` |
|
2283 | ``worker`` | |
2270 | ---------- |
|
2284 | ---------- | |
2271 |
|
2285 | |||
2272 | Parallel master/worker configuration. We currently perform working |
|
2286 | Parallel master/worker configuration. We currently perform working | |
2273 | directory updates in parallel on Unix-like systems, which greatly |
|
2287 | directory updates in parallel on Unix-like systems, which greatly | |
2274 | helps performance. |
|
2288 | helps performance. | |
2275 |
|
2289 | |||
2276 | ``numcpus`` |
|
2290 | ``numcpus`` | |
2277 | Number of CPUs to use for parallel operations. A zero or |
|
2291 | Number of CPUs to use for parallel operations. A zero or | |
2278 | negative value is treated as ``use the default``. |
|
2292 | negative value is treated as ``use the default``. | |
2279 | (default: 4 or the number of CPUs on the system, whichever is larger) |
|
2293 | (default: 4 or the number of CPUs on the system, whichever is larger) | |
2280 |
|
2294 | |||
2281 | ``backgroundclose`` |
|
2295 | ``backgroundclose`` | |
2282 | Whether to enable closing file handles on background threads during certain |
|
2296 | Whether to enable closing file handles on background threads during certain | |
2283 | operations. Some platforms aren't very efficient at closing file |
|
2297 | operations. Some platforms aren't very efficient at closing file | |
2284 | handles that have been written or appended to. By performing file closing |
|
2298 | handles that have been written or appended to. By performing file closing | |
2285 | on background threads, file write rate can increase substantially. |
|
2299 | on background threads, file write rate can increase substantially. | |
2286 | (default: true on Windows, false elsewhere) |
|
2300 | (default: true on Windows, false elsewhere) | |
2287 |
|
2301 | |||
2288 | ``backgroundcloseminfilecount`` |
|
2302 | ``backgroundcloseminfilecount`` | |
2289 | Minimum number of files required to trigger background file closing. |
|
2303 | Minimum number of files required to trigger background file closing. | |
2290 | Operations not writing this many files won't start background close |
|
2304 | Operations not writing this many files won't start background close | |
2291 | threads. |
|
2305 | threads. | |
2292 | (default: 2048) |
|
2306 | (default: 2048) | |
2293 |
|
2307 | |||
2294 | ``backgroundclosemaxqueue`` |
|
2308 | ``backgroundclosemaxqueue`` | |
2295 | The maximum number of opened file handles waiting to be closed in the |
|
2309 | The maximum number of opened file handles waiting to be closed in the | |
2296 | background. This option only has an effect if ``backgroundclose`` is |
|
2310 | background. This option only has an effect if ``backgroundclose`` is | |
2297 | enabled. |
|
2311 | enabled. | |
2298 | (default: 384) |
|
2312 | (default: 384) | |
2299 |
|
2313 | |||
2300 | ``backgroundclosethreadcount`` |
|
2314 | ``backgroundclosethreadcount`` | |
2301 | Number of threads to process background file closes. Only relevant if |
|
2315 | Number of threads to process background file closes. Only relevant if | |
2302 | ``backgroundclose`` is enabled. |
|
2316 | ``backgroundclose`` is enabled. | |
2303 | (default: 4) |
|
2317 | (default: 4) |
@@ -1,201 +1,222 b'' | |||||
1 | # hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod |
|
1 | # hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod | |
2 | # |
|
2 | # | |
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
|
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | |
4 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
|
4 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from __future__ import absolute_import |
|
9 | from __future__ import absolute_import | |
10 |
|
10 | |||
|
11 | import base64 | |||
11 | import errno |
|
12 | import errno | |
12 | import mimetypes |
|
13 | import mimetypes | |
13 | import os |
|
14 | import os | |
|
15 | import uuid | |||
14 |
|
16 | |||
15 | from .. import ( |
|
17 | from .. import ( | |
16 | encoding, |
|
18 | encoding, | |
17 | pycompat, |
|
19 | pycompat, | |
18 | util, |
|
20 | util, | |
19 | ) |
|
21 | ) | |
20 |
|
22 | |||
21 | httpserver = util.httpserver |
|
23 | httpserver = util.httpserver | |
22 |
|
24 | |||
23 | HTTP_OK = 200 |
|
25 | HTTP_OK = 200 | |
24 | HTTP_NOT_MODIFIED = 304 |
|
26 | HTTP_NOT_MODIFIED = 304 | |
25 | HTTP_BAD_REQUEST = 400 |
|
27 | HTTP_BAD_REQUEST = 400 | |
26 | HTTP_UNAUTHORIZED = 401 |
|
28 | HTTP_UNAUTHORIZED = 401 | |
27 | HTTP_FORBIDDEN = 403 |
|
29 | HTTP_FORBIDDEN = 403 | |
28 | HTTP_NOT_FOUND = 404 |
|
30 | HTTP_NOT_FOUND = 404 | |
29 | HTTP_METHOD_NOT_ALLOWED = 405 |
|
31 | HTTP_METHOD_NOT_ALLOWED = 405 | |
30 | HTTP_SERVER_ERROR = 500 |
|
32 | HTTP_SERVER_ERROR = 500 | |
31 |
|
33 | |||
32 |
|
34 | |||
33 | def ismember(ui, username, userlist): |
|
35 | def ismember(ui, username, userlist): | |
34 | """Check if username is a member of userlist. |
|
36 | """Check if username is a member of userlist. | |
35 |
|
37 | |||
36 | If userlist has a single '*' member, all users are considered members. |
|
38 | If userlist has a single '*' member, all users are considered members. | |
37 | Can be overridden by extensions to provide more complex authorization |
|
39 | Can be overridden by extensions to provide more complex authorization | |
38 | schemes. |
|
40 | schemes. | |
39 | """ |
|
41 | """ | |
40 | return userlist == ['*'] or username in userlist |
|
42 | return userlist == ['*'] or username in userlist | |
41 |
|
43 | |||
42 | def checkauthz(hgweb, req, op): |
|
44 | def checkauthz(hgweb, req, op): | |
43 | '''Check permission for operation based on request data (including |
|
45 | '''Check permission for operation based on request data (including | |
44 | authentication info). Return if op allowed, else raise an ErrorResponse |
|
46 | authentication info). Return if op allowed, else raise an ErrorResponse | |
45 | exception.''' |
|
47 | exception.''' | |
46 |
|
48 | |||
47 | user = req.env.get('REMOTE_USER') |
|
49 | user = req.env.get('REMOTE_USER') | |
48 |
|
50 | |||
49 | deny_read = hgweb.configlist('web', 'deny_read') |
|
51 | deny_read = hgweb.configlist('web', 'deny_read') | |
50 | if deny_read and (not user or ismember(hgweb.repo.ui, user, deny_read)): |
|
52 | if deny_read and (not user or ismember(hgweb.repo.ui, user, deny_read)): | |
51 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') |
|
53 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | |
52 |
|
54 | |||
53 | allow_read = hgweb.configlist('web', 'allow_read') |
|
55 | allow_read = hgweb.configlist('web', 'allow_read') | |
54 | if allow_read and (not ismember(hgweb.repo.ui, user, allow_read)): |
|
56 | if allow_read and (not ismember(hgweb.repo.ui, user, allow_read)): | |
55 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') |
|
57 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | |
56 |
|
58 | |||
57 | if op == 'pull' and not hgweb.allowpull: |
|
59 | if op == 'pull' and not hgweb.allowpull: | |
58 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'pull not authorized') |
|
60 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'pull not authorized') | |
59 | elif op == 'pull' or op is None: # op is None for interface requests |
|
61 | elif op == 'pull' or op is None: # op is None for interface requests | |
60 | return |
|
62 | return | |
61 |
|
63 | |||
62 | # enforce that you can only push using POST requests |
|
64 | # enforce that you can only push using POST requests | |
63 | if req.env['REQUEST_METHOD'] != 'POST': |
|
65 | if req.env['REQUEST_METHOD'] != 'POST': | |
64 | msg = 'push requires POST request' |
|
66 | msg = 'push requires POST request' | |
65 | raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg) |
|
67 | raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg) | |
66 |
|
68 | |||
67 | # require ssl by default for pushing, auth info cannot be sniffed |
|
69 | # require ssl by default for pushing, auth info cannot be sniffed | |
68 | # and replayed |
|
70 | # and replayed | |
69 | scheme = req.env.get('wsgi.url_scheme') |
|
71 | scheme = req.env.get('wsgi.url_scheme') | |
70 | if hgweb.configbool('web', 'push_ssl', True) and scheme != 'https': |
|
72 | if hgweb.configbool('web', 'push_ssl', True) and scheme != 'https': | |
71 | raise ErrorResponse(HTTP_FORBIDDEN, 'ssl required') |
|
73 | raise ErrorResponse(HTTP_FORBIDDEN, 'ssl required') | |
72 |
|
74 | |||
73 | deny = hgweb.configlist('web', 'deny_push') |
|
75 | deny = hgweb.configlist('web', 'deny_push') | |
74 | if deny and (not user or ismember(hgweb.repo.ui, user, deny)): |
|
76 | if deny and (not user or ismember(hgweb.repo.ui, user, deny)): | |
75 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') |
|
77 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') | |
76 |
|
78 | |||
77 | allow = hgweb.configlist('web', 'allow_push') |
|
79 | allow = hgweb.configlist('web', 'allow_push') | |
78 | if not (allow and ismember(hgweb.repo.ui, user, allow)): |
|
80 | if not (allow and ismember(hgweb.repo.ui, user, allow)): | |
79 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') |
|
81 | raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') | |
80 |
|
82 | |||
81 | # Hooks for hgweb permission checks; extensions can add hooks here. |
|
83 | # Hooks for hgweb permission checks; extensions can add hooks here. | |
82 | # Each hook is invoked like this: hook(hgweb, request, operation), |
|
84 | # Each hook is invoked like this: hook(hgweb, request, operation), | |
83 | # where operation is either read, pull or push. Hooks should either |
|
85 | # where operation is either read, pull or push. Hooks should either | |
84 | # raise an ErrorResponse exception, or just return. |
|
86 | # raise an ErrorResponse exception, or just return. | |
85 | # |
|
87 | # | |
86 | # It is possible to do both authentication and authorization through |
|
88 | # It is possible to do both authentication and authorization through | |
87 | # this. |
|
89 | # this. | |
88 | permhooks = [checkauthz] |
|
90 | permhooks = [checkauthz] | |
89 |
|
91 | |||
90 |
|
92 | |||
91 | class ErrorResponse(Exception): |
|
93 | class ErrorResponse(Exception): | |
92 | def __init__(self, code, message=None, headers=[]): |
|
94 | def __init__(self, code, message=None, headers=[]): | |
93 | if message is None: |
|
95 | if message is None: | |
94 | message = _statusmessage(code) |
|
96 | message = _statusmessage(code) | |
95 | Exception.__init__(self, message) |
|
97 | Exception.__init__(self, message) | |
96 | self.code = code |
|
98 | self.code = code | |
97 | self.headers = headers |
|
99 | self.headers = headers | |
98 |
|
100 | |||
99 | class continuereader(object): |
|
101 | class continuereader(object): | |
100 | def __init__(self, f, write): |
|
102 | def __init__(self, f, write): | |
101 | self.f = f |
|
103 | self.f = f | |
102 | self._write = write |
|
104 | self._write = write | |
103 | self.continued = False |
|
105 | self.continued = False | |
104 |
|
106 | |||
105 | def read(self, amt=-1): |
|
107 | def read(self, amt=-1): | |
106 | if not self.continued: |
|
108 | if not self.continued: | |
107 | self.continued = True |
|
109 | self.continued = True | |
108 | self._write('HTTP/1.1 100 Continue\r\n\r\n') |
|
110 | self._write('HTTP/1.1 100 Continue\r\n\r\n') | |
109 | return self.f.read(amt) |
|
111 | return self.f.read(amt) | |
110 |
|
112 | |||
111 | def __getattr__(self, attr): |
|
113 | def __getattr__(self, attr): | |
112 | if attr in ('close', 'readline', 'readlines', '__iter__'): |
|
114 | if attr in ('close', 'readline', 'readlines', '__iter__'): | |
113 | return getattr(self.f, attr) |
|
115 | return getattr(self.f, attr) | |
114 | raise AttributeError |
|
116 | raise AttributeError | |
115 |
|
117 | |||
116 | def _statusmessage(code): |
|
118 | def _statusmessage(code): | |
117 | responses = httpserver.basehttprequesthandler.responses |
|
119 | responses = httpserver.basehttprequesthandler.responses | |
118 | return responses.get(code, ('Error', 'Unknown error'))[0] |
|
120 | return responses.get(code, ('Error', 'Unknown error'))[0] | |
119 |
|
121 | |||
120 | def statusmessage(code, message=None): |
|
122 | def statusmessage(code, message=None): | |
121 | return '%d %s' % (code, message or _statusmessage(code)) |
|
123 | return '%d %s' % (code, message or _statusmessage(code)) | |
122 |
|
124 | |||
123 | def get_stat(spath, fn): |
|
125 | def get_stat(spath, fn): | |
124 | """stat fn if it exists, spath otherwise""" |
|
126 | """stat fn if it exists, spath otherwise""" | |
125 | cl_path = os.path.join(spath, fn) |
|
127 | cl_path = os.path.join(spath, fn) | |
126 | if os.path.exists(cl_path): |
|
128 | if os.path.exists(cl_path): | |
127 | return os.stat(cl_path) |
|
129 | return os.stat(cl_path) | |
128 | else: |
|
130 | else: | |
129 | return os.stat(spath) |
|
131 | return os.stat(spath) | |
130 |
|
132 | |||
131 | def get_mtime(spath): |
|
133 | def get_mtime(spath): | |
132 | return get_stat(spath, "00changelog.i").st_mtime |
|
134 | return get_stat(spath, "00changelog.i").st_mtime | |
133 |
|
135 | |||
134 | def staticfile(directory, fname, req): |
|
136 | def staticfile(directory, fname, req): | |
135 | """return a file inside directory with guessed Content-Type header |
|
137 | """return a file inside directory with guessed Content-Type header | |
136 |
|
138 | |||
137 | fname always uses '/' as directory separator and isn't allowed to |
|
139 | fname always uses '/' as directory separator and isn't allowed to | |
138 | contain unusual path components. |
|
140 | contain unusual path components. | |
139 | Content-Type is guessed using the mimetypes module. |
|
141 | Content-Type is guessed using the mimetypes module. | |
140 | Return an empty string if fname is illegal or file not found. |
|
142 | Return an empty string if fname is illegal or file not found. | |
141 |
|
143 | |||
142 | """ |
|
144 | """ | |
143 | parts = fname.split('/') |
|
145 | parts = fname.split('/') | |
144 | for part in parts: |
|
146 | for part in parts: | |
145 | if (part in ('', os.curdir, os.pardir) or |
|
147 | if (part in ('', os.curdir, os.pardir) or | |
146 | pycompat.ossep in part or |
|
148 | pycompat.ossep in part or | |
147 | pycompat.osaltsep is not None and pycompat.osaltsep in part): |
|
149 | pycompat.osaltsep is not None and pycompat.osaltsep in part): | |
148 | return |
|
150 | return | |
149 | fpath = os.path.join(*parts) |
|
151 | fpath = os.path.join(*parts) | |
150 | if isinstance(directory, str): |
|
152 | if isinstance(directory, str): | |
151 | directory = [directory] |
|
153 | directory = [directory] | |
152 | for d in directory: |
|
154 | for d in directory: | |
153 | path = os.path.join(d, fpath) |
|
155 | path = os.path.join(d, fpath) | |
154 | if os.path.exists(path): |
|
156 | if os.path.exists(path): | |
155 | break |
|
157 | break | |
156 | try: |
|
158 | try: | |
157 | os.stat(path) |
|
159 | os.stat(path) | |
158 | ct = mimetypes.guess_type(path)[0] or "text/plain" |
|
160 | ct = mimetypes.guess_type(path)[0] or "text/plain" | |
159 | fp = open(path, 'rb') |
|
161 | fp = open(path, 'rb') | |
160 | data = fp.read() |
|
162 | data = fp.read() | |
161 | fp.close() |
|
163 | fp.close() | |
162 | req.respond(HTTP_OK, ct, body=data) |
|
164 | req.respond(HTTP_OK, ct, body=data) | |
163 | except TypeError: |
|
165 | except TypeError: | |
164 | raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') |
|
166 | raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') | |
165 | except OSError as err: |
|
167 | except OSError as err: | |
166 | if err.errno == errno.ENOENT: |
|
168 | if err.errno == errno.ENOENT: | |
167 | raise ErrorResponse(HTTP_NOT_FOUND) |
|
169 | raise ErrorResponse(HTTP_NOT_FOUND) | |
168 | else: |
|
170 | else: | |
169 | raise ErrorResponse(HTTP_SERVER_ERROR, err.strerror) |
|
171 | raise ErrorResponse(HTTP_SERVER_ERROR, err.strerror) | |
170 |
|
172 | |||
171 | def paritygen(stripecount, offset=0): |
|
173 | def paritygen(stripecount, offset=0): | |
172 | """count parity of horizontal stripes for easier reading""" |
|
174 | """count parity of horizontal stripes for easier reading""" | |
173 | if stripecount and offset: |
|
175 | if stripecount and offset: | |
174 | # account for offset, e.g. due to building the list in reverse |
|
176 | # account for offset, e.g. due to building the list in reverse | |
175 | count = (stripecount + offset) % stripecount |
|
177 | count = (stripecount + offset) % stripecount | |
176 | parity = (stripecount + offset) / stripecount & 1 |
|
178 | parity = (stripecount + offset) / stripecount & 1 | |
177 | else: |
|
179 | else: | |
178 | count = 0 |
|
180 | count = 0 | |
179 | parity = 0 |
|
181 | parity = 0 | |
180 | while True: |
|
182 | while True: | |
181 | yield parity |
|
183 | yield parity | |
182 | count += 1 |
|
184 | count += 1 | |
183 | if stripecount and count >= stripecount: |
|
185 | if stripecount and count >= stripecount: | |
184 | parity = 1 - parity |
|
186 | parity = 1 - parity | |
185 | count = 0 |
|
187 | count = 0 | |
186 |
|
188 | |||
187 | def get_contact(config): |
|
189 | def get_contact(config): | |
188 | """Return repo contact information or empty string. |
|
190 | """Return repo contact information or empty string. | |
189 |
|
191 | |||
190 | web.contact is the primary source, but if that is not set, try |
|
192 | web.contact is the primary source, but if that is not set, try | |
191 | ui.username or $EMAIL as a fallback to display something useful. |
|
193 | ui.username or $EMAIL as a fallback to display something useful. | |
192 | """ |
|
194 | """ | |
193 | return (config("web", "contact") or |
|
195 | return (config("web", "contact") or | |
194 | config("ui", "username") or |
|
196 | config("ui", "username") or | |
195 | encoding.environ.get("EMAIL") or "") |
|
197 | encoding.environ.get("EMAIL") or "") | |
196 |
|
198 | |||
197 | def caching(web, req): |
|
199 | def caching(web, req): | |
198 | tag = 'W/"%s"' % web.mtime |
|
200 | tag = 'W/"%s"' % web.mtime | |
199 | if req.env.get('HTTP_IF_NONE_MATCH') == tag: |
|
201 | if req.env.get('HTTP_IF_NONE_MATCH') == tag: | |
200 | raise ErrorResponse(HTTP_NOT_MODIFIED) |
|
202 | raise ErrorResponse(HTTP_NOT_MODIFIED) | |
201 | req.headers.append(('ETag', tag)) |
|
203 | req.headers.append(('ETag', tag)) | |
|
204 | ||||
|
205 | def cspvalues(ui): | |||
|
206 | """Obtain the Content-Security-Policy header and nonce value. | |||
|
207 | ||||
|
208 | Returns a 2-tuple of the CSP header value and the nonce value. | |||
|
209 | ||||
|
210 | First value is ``None`` if CSP isn't enabled. Second value is ``None`` | |||
|
211 | if CSP isn't enabled or if the CSP header doesn't need a nonce. | |||
|
212 | """ | |||
|
213 | # Don't allow untrusted CSP setting since it be disable protections | |||
|
214 | # from a trusted/global source. | |||
|
215 | csp = ui.config('web', 'csp', untrusted=False) | |||
|
216 | nonce = None | |||
|
217 | ||||
|
218 | if csp and '%nonce%' in csp: | |||
|
219 | nonce = base64.urlsafe_b64encode(uuid.uuid4().bytes).rstrip('=') | |||
|
220 | csp = csp.replace('%nonce%', nonce) | |||
|
221 | ||||
|
222 | return csp, nonce |
@@ -1,470 +1,483 b'' | |||||
1 | # hgweb/hgweb_mod.py - Web interface for a repository. |
|
1 | # hgweb/hgweb_mod.py - Web interface for a repository. | |
2 | # |
|
2 | # | |
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
|
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | |
4 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from __future__ import absolute_import |
|
9 | from __future__ import absolute_import | |
10 |
|
10 | |||
11 | import contextlib |
|
11 | import contextlib | |
12 | import os |
|
12 | import os | |
13 |
|
13 | |||
14 | from .common import ( |
|
14 | from .common import ( | |
15 | ErrorResponse, |
|
15 | ErrorResponse, | |
16 | HTTP_BAD_REQUEST, |
|
16 | HTTP_BAD_REQUEST, | |
17 | HTTP_NOT_FOUND, |
|
17 | HTTP_NOT_FOUND, | |
18 | HTTP_NOT_MODIFIED, |
|
18 | HTTP_NOT_MODIFIED, | |
19 | HTTP_OK, |
|
19 | HTTP_OK, | |
20 | HTTP_SERVER_ERROR, |
|
20 | HTTP_SERVER_ERROR, | |
21 | caching, |
|
21 | caching, | |
|
22 | cspvalues, | |||
22 | permhooks, |
|
23 | permhooks, | |
23 | ) |
|
24 | ) | |
24 | from .request import wsgirequest |
|
25 | from .request import wsgirequest | |
25 |
|
26 | |||
26 | from .. import ( |
|
27 | from .. import ( | |
27 | encoding, |
|
28 | encoding, | |
28 | error, |
|
29 | error, | |
29 | hg, |
|
30 | hg, | |
30 | hook, |
|
31 | hook, | |
31 | profiling, |
|
32 | profiling, | |
32 | repoview, |
|
33 | repoview, | |
33 | templatefilters, |
|
34 | templatefilters, | |
34 | templater, |
|
35 | templater, | |
35 | ui as uimod, |
|
36 | ui as uimod, | |
36 | util, |
|
37 | util, | |
37 | ) |
|
38 | ) | |
38 |
|
39 | |||
39 | from . import ( |
|
40 | from . import ( | |
40 | protocol, |
|
41 | protocol, | |
41 | webcommands, |
|
42 | webcommands, | |
42 | webutil, |
|
43 | webutil, | |
43 | wsgicgi, |
|
44 | wsgicgi, | |
44 | ) |
|
45 | ) | |
45 |
|
46 | |||
46 | perms = { |
|
47 | perms = { | |
47 | 'changegroup': 'pull', |
|
48 | 'changegroup': 'pull', | |
48 | 'changegroupsubset': 'pull', |
|
49 | 'changegroupsubset': 'pull', | |
49 | 'getbundle': 'pull', |
|
50 | 'getbundle': 'pull', | |
50 | 'stream_out': 'pull', |
|
51 | 'stream_out': 'pull', | |
51 | 'listkeys': 'pull', |
|
52 | 'listkeys': 'pull', | |
52 | 'unbundle': 'push', |
|
53 | 'unbundle': 'push', | |
53 | 'pushkey': 'push', |
|
54 | 'pushkey': 'push', | |
54 | } |
|
55 | } | |
55 |
|
56 | |||
56 | archivespecs = util.sortdict(( |
|
57 | archivespecs = util.sortdict(( | |
57 | ('zip', ('application/zip', 'zip', '.zip', None)), |
|
58 | ('zip', ('application/zip', 'zip', '.zip', None)), | |
58 | ('gz', ('application/x-gzip', 'tgz', '.tar.gz', None)), |
|
59 | ('gz', ('application/x-gzip', 'tgz', '.tar.gz', None)), | |
59 | ('bz2', ('application/x-bzip2', 'tbz2', '.tar.bz2', None)), |
|
60 | ('bz2', ('application/x-bzip2', 'tbz2', '.tar.bz2', None)), | |
60 | )) |
|
61 | )) | |
61 |
|
62 | |||
62 | def makebreadcrumb(url, prefix=''): |
|
63 | def makebreadcrumb(url, prefix=''): | |
63 | '''Return a 'URL breadcrumb' list |
|
64 | '''Return a 'URL breadcrumb' list | |
64 |
|
65 | |||
65 | A 'URL breadcrumb' is a list of URL-name pairs, |
|
66 | A 'URL breadcrumb' is a list of URL-name pairs, | |
66 | corresponding to each of the path items on a URL. |
|
67 | corresponding to each of the path items on a URL. | |
67 | This can be used to create path navigation entries. |
|
68 | This can be used to create path navigation entries. | |
68 | ''' |
|
69 | ''' | |
69 | if url.endswith('/'): |
|
70 | if url.endswith('/'): | |
70 | url = url[:-1] |
|
71 | url = url[:-1] | |
71 | if prefix: |
|
72 | if prefix: | |
72 | url = '/' + prefix + url |
|
73 | url = '/' + prefix + url | |
73 | relpath = url |
|
74 | relpath = url | |
74 | if relpath.startswith('/'): |
|
75 | if relpath.startswith('/'): | |
75 | relpath = relpath[1:] |
|
76 | relpath = relpath[1:] | |
76 |
|
77 | |||
77 | breadcrumb = [] |
|
78 | breadcrumb = [] | |
78 | urlel = url |
|
79 | urlel = url | |
79 | pathitems = [''] + relpath.split('/') |
|
80 | pathitems = [''] + relpath.split('/') | |
80 | for pathel in reversed(pathitems): |
|
81 | for pathel in reversed(pathitems): | |
81 | if not pathel or not urlel: |
|
82 | if not pathel or not urlel: | |
82 | break |
|
83 | break | |
83 | breadcrumb.append({'url': urlel, 'name': pathel}) |
|
84 | breadcrumb.append({'url': urlel, 'name': pathel}) | |
84 | urlel = os.path.dirname(urlel) |
|
85 | urlel = os.path.dirname(urlel) | |
85 | return reversed(breadcrumb) |
|
86 | return reversed(breadcrumb) | |
86 |
|
87 | |||
87 | class requestcontext(object): |
|
88 | class requestcontext(object): | |
88 | """Holds state/context for an individual request. |
|
89 | """Holds state/context for an individual request. | |
89 |
|
90 | |||
90 | Servers can be multi-threaded. Holding state on the WSGI application |
|
91 | Servers can be multi-threaded. Holding state on the WSGI application | |
91 | is prone to race conditions. Instances of this class exist to hold |
|
92 | is prone to race conditions. Instances of this class exist to hold | |
92 | mutable and race-free state for requests. |
|
93 | mutable and race-free state for requests. | |
93 | """ |
|
94 | """ | |
94 | def __init__(self, app, repo): |
|
95 | def __init__(self, app, repo): | |
95 | self.repo = repo |
|
96 | self.repo = repo | |
96 | self.reponame = app.reponame |
|
97 | self.reponame = app.reponame | |
97 |
|
98 | |||
98 | self.archivespecs = archivespecs |
|
99 | self.archivespecs = archivespecs | |
99 |
|
100 | |||
100 | self.maxchanges = self.configint('web', 'maxchanges', 10) |
|
101 | self.maxchanges = self.configint('web', 'maxchanges', 10) | |
101 | self.stripecount = self.configint('web', 'stripes', 1) |
|
102 | self.stripecount = self.configint('web', 'stripes', 1) | |
102 | self.maxshortchanges = self.configint('web', 'maxshortchanges', 60) |
|
103 | self.maxshortchanges = self.configint('web', 'maxshortchanges', 60) | |
103 | self.maxfiles = self.configint('web', 'maxfiles', 10) |
|
104 | self.maxfiles = self.configint('web', 'maxfiles', 10) | |
104 | self.allowpull = self.configbool('web', 'allowpull', True) |
|
105 | self.allowpull = self.configbool('web', 'allowpull', True) | |
105 |
|
106 | |||
106 | # we use untrusted=False to prevent a repo owner from using |
|
107 | # we use untrusted=False to prevent a repo owner from using | |
107 | # web.templates in .hg/hgrc to get access to any file readable |
|
108 | # web.templates in .hg/hgrc to get access to any file readable | |
108 | # by the user running the CGI script |
|
109 | # by the user running the CGI script | |
109 | self.templatepath = self.config('web', 'templates', untrusted=False) |
|
110 | self.templatepath = self.config('web', 'templates', untrusted=False) | |
110 |
|
111 | |||
111 | # This object is more expensive to build than simple config values. |
|
112 | # This object is more expensive to build than simple config values. | |
112 | # It is shared across requests. The app will replace the object |
|
113 | # It is shared across requests. The app will replace the object | |
113 | # if it is updated. Since this is a reference and nothing should |
|
114 | # if it is updated. Since this is a reference and nothing should | |
114 | # modify the underlying object, it should be constant for the lifetime |
|
115 | # modify the underlying object, it should be constant for the lifetime | |
115 | # of the request. |
|
116 | # of the request. | |
116 | self.websubtable = app.websubtable |
|
117 | self.websubtable = app.websubtable | |
117 |
|
118 | |||
|
119 | self.csp, self.nonce = cspvalues(self.repo.ui) | |||
|
120 | ||||
118 | # Trust the settings from the .hg/hgrc files by default. |
|
121 | # Trust the settings from the .hg/hgrc files by default. | |
119 | def config(self, section, name, default=None, untrusted=True): |
|
122 | def config(self, section, name, default=None, untrusted=True): | |
120 | return self.repo.ui.config(section, name, default, |
|
123 | return self.repo.ui.config(section, name, default, | |
121 | untrusted=untrusted) |
|
124 | untrusted=untrusted) | |
122 |
|
125 | |||
123 | def configbool(self, section, name, default=False, untrusted=True): |
|
126 | def configbool(self, section, name, default=False, untrusted=True): | |
124 | return self.repo.ui.configbool(section, name, default, |
|
127 | return self.repo.ui.configbool(section, name, default, | |
125 | untrusted=untrusted) |
|
128 | untrusted=untrusted) | |
126 |
|
129 | |||
127 | def configint(self, section, name, default=None, untrusted=True): |
|
130 | def configint(self, section, name, default=None, untrusted=True): | |
128 | return self.repo.ui.configint(section, name, default, |
|
131 | return self.repo.ui.configint(section, name, default, | |
129 | untrusted=untrusted) |
|
132 | untrusted=untrusted) | |
130 |
|
133 | |||
131 | def configlist(self, section, name, default=None, untrusted=True): |
|
134 | def configlist(self, section, name, default=None, untrusted=True): | |
132 | return self.repo.ui.configlist(section, name, default, |
|
135 | return self.repo.ui.configlist(section, name, default, | |
133 | untrusted=untrusted) |
|
136 | untrusted=untrusted) | |
134 |
|
137 | |||
135 | def archivelist(self, nodeid): |
|
138 | def archivelist(self, nodeid): | |
136 | allowed = self.configlist('web', 'allow_archive') |
|
139 | allowed = self.configlist('web', 'allow_archive') | |
137 | for typ, spec in self.archivespecs.iteritems(): |
|
140 | for typ, spec in self.archivespecs.iteritems(): | |
138 | if typ in allowed or self.configbool('web', 'allow%s' % typ): |
|
141 | if typ in allowed or self.configbool('web', 'allow%s' % typ): | |
139 | yield {'type': typ, 'extension': spec[2], 'node': nodeid} |
|
142 | yield {'type': typ, 'extension': spec[2], 'node': nodeid} | |
140 |
|
143 | |||
141 | def templater(self, req): |
|
144 | def templater(self, req): | |
142 | # determine scheme, port and server name |
|
145 | # determine scheme, port and server name | |
143 | # this is needed to create absolute urls |
|
146 | # this is needed to create absolute urls | |
144 |
|
147 | |||
145 | proto = req.env.get('wsgi.url_scheme') |
|
148 | proto = req.env.get('wsgi.url_scheme') | |
146 | if proto == 'https': |
|
149 | if proto == 'https': | |
147 | proto = 'https' |
|
150 | proto = 'https' | |
148 | default_port = '443' |
|
151 | default_port = '443' | |
149 | else: |
|
152 | else: | |
150 | proto = 'http' |
|
153 | proto = 'http' | |
151 | default_port = '80' |
|
154 | default_port = '80' | |
152 |
|
155 | |||
153 | port = req.env['SERVER_PORT'] |
|
156 | port = req.env['SERVER_PORT'] | |
154 | port = port != default_port and (':' + port) or '' |
|
157 | port = port != default_port and (':' + port) or '' | |
155 | urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port) |
|
158 | urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port) | |
156 | logourl = self.config('web', 'logourl', 'https://mercurial-scm.org/') |
|
159 | logourl = self.config('web', 'logourl', 'https://mercurial-scm.org/') | |
157 | logoimg = self.config('web', 'logoimg', 'hglogo.png') |
|
160 | logoimg = self.config('web', 'logoimg', 'hglogo.png') | |
158 | staticurl = self.config('web', 'staticurl') or req.url + 'static/' |
|
161 | staticurl = self.config('web', 'staticurl') or req.url + 'static/' | |
159 | if not staticurl.endswith('/'): |
|
162 | if not staticurl.endswith('/'): | |
160 | staticurl += '/' |
|
163 | staticurl += '/' | |
161 |
|
164 | |||
162 | # some functions for the templater |
|
165 | # some functions for the templater | |
163 |
|
166 | |||
164 | def motd(**map): |
|
167 | def motd(**map): | |
165 | yield self.config('web', 'motd', '') |
|
168 | yield self.config('web', 'motd', '') | |
166 |
|
169 | |||
167 | # figure out which style to use |
|
170 | # figure out which style to use | |
168 |
|
171 | |||
169 | vars = {} |
|
172 | vars = {} | |
170 | styles = ( |
|
173 | styles = ( | |
171 | req.form.get('style', [None])[0], |
|
174 | req.form.get('style', [None])[0], | |
172 | self.config('web', 'style'), |
|
175 | self.config('web', 'style'), | |
173 | 'paper', |
|
176 | 'paper', | |
174 | ) |
|
177 | ) | |
175 | style, mapfile = templater.stylemap(styles, self.templatepath) |
|
178 | style, mapfile = templater.stylemap(styles, self.templatepath) | |
176 | if style == styles[0]: |
|
179 | if style == styles[0]: | |
177 | vars['style'] = style |
|
180 | vars['style'] = style | |
178 |
|
181 | |||
179 | start = req.url[-1] == '?' and '&' or '?' |
|
182 | start = req.url[-1] == '?' and '&' or '?' | |
180 | sessionvars = webutil.sessionvars(vars, start) |
|
183 | sessionvars = webutil.sessionvars(vars, start) | |
181 |
|
184 | |||
182 | if not self.reponame: |
|
185 | if not self.reponame: | |
183 | self.reponame = (self.config('web', 'name') |
|
186 | self.reponame = (self.config('web', 'name') | |
184 | or req.env.get('REPO_NAME') |
|
187 | or req.env.get('REPO_NAME') | |
185 | or req.url.strip('/') or self.repo.root) |
|
188 | or req.url.strip('/') or self.repo.root) | |
186 |
|
189 | |||
187 | def websubfilter(text): |
|
190 | def websubfilter(text): | |
188 | return templatefilters.websub(text, self.websubtable) |
|
191 | return templatefilters.websub(text, self.websubtable) | |
189 |
|
192 | |||
190 | # create the templater |
|
193 | # create the templater | |
191 |
|
194 | |||
192 | defaults = { |
|
195 | defaults = { | |
193 | 'url': req.url, |
|
196 | 'url': req.url, | |
194 | 'logourl': logourl, |
|
197 | 'logourl': logourl, | |
195 | 'logoimg': logoimg, |
|
198 | 'logoimg': logoimg, | |
196 | 'staticurl': staticurl, |
|
199 | 'staticurl': staticurl, | |
197 | 'urlbase': urlbase, |
|
200 | 'urlbase': urlbase, | |
198 | 'repo': self.reponame, |
|
201 | 'repo': self.reponame, | |
199 | 'encoding': encoding.encoding, |
|
202 | 'encoding': encoding.encoding, | |
200 | 'motd': motd, |
|
203 | 'motd': motd, | |
201 | 'sessionvars': sessionvars, |
|
204 | 'sessionvars': sessionvars, | |
202 | 'pathdef': makebreadcrumb(req.url), |
|
205 | 'pathdef': makebreadcrumb(req.url), | |
203 | 'style': style, |
|
206 | 'style': style, | |
|
207 | 'nonce': self.nonce, | |||
204 | } |
|
208 | } | |
205 | tmpl = templater.templater.frommapfile(mapfile, |
|
209 | tmpl = templater.templater.frommapfile(mapfile, | |
206 | filters={'websub': websubfilter}, |
|
210 | filters={'websub': websubfilter}, | |
207 | defaults=defaults) |
|
211 | defaults=defaults) | |
208 | return tmpl |
|
212 | return tmpl | |
209 |
|
213 | |||
210 |
|
214 | |||
211 | class hgweb(object): |
|
215 | class hgweb(object): | |
212 | """HTTP server for individual repositories. |
|
216 | """HTTP server for individual repositories. | |
213 |
|
217 | |||
214 | Instances of this class serve HTTP responses for a particular |
|
218 | Instances of this class serve HTTP responses for a particular | |
215 | repository. |
|
219 | repository. | |
216 |
|
220 | |||
217 | Instances are typically used as WSGI applications. |
|
221 | Instances are typically used as WSGI applications. | |
218 |
|
222 | |||
219 | Some servers are multi-threaded. On these servers, there may |
|
223 | Some servers are multi-threaded. On these servers, there may | |
220 | be multiple active threads inside __call__. |
|
224 | be multiple active threads inside __call__. | |
221 | """ |
|
225 | """ | |
222 | def __init__(self, repo, name=None, baseui=None): |
|
226 | def __init__(self, repo, name=None, baseui=None): | |
223 | if isinstance(repo, str): |
|
227 | if isinstance(repo, str): | |
224 | if baseui: |
|
228 | if baseui: | |
225 | u = baseui.copy() |
|
229 | u = baseui.copy() | |
226 | else: |
|
230 | else: | |
227 | u = uimod.ui.load() |
|
231 | u = uimod.ui.load() | |
228 | r = hg.repository(u, repo) |
|
232 | r = hg.repository(u, repo) | |
229 | else: |
|
233 | else: | |
230 | # we trust caller to give us a private copy |
|
234 | # we trust caller to give us a private copy | |
231 | r = repo |
|
235 | r = repo | |
232 |
|
236 | |||
233 | r.ui.setconfig('ui', 'report_untrusted', 'off', 'hgweb') |
|
237 | r.ui.setconfig('ui', 'report_untrusted', 'off', 'hgweb') | |
234 | r.baseui.setconfig('ui', 'report_untrusted', 'off', 'hgweb') |
|
238 | r.baseui.setconfig('ui', 'report_untrusted', 'off', 'hgweb') | |
235 | r.ui.setconfig('ui', 'nontty', 'true', 'hgweb') |
|
239 | r.ui.setconfig('ui', 'nontty', 'true', 'hgweb') | |
236 | r.baseui.setconfig('ui', 'nontty', 'true', 'hgweb') |
|
240 | r.baseui.setconfig('ui', 'nontty', 'true', 'hgweb') | |
237 | # resolve file patterns relative to repo root |
|
241 | # resolve file patterns relative to repo root | |
238 | r.ui.setconfig('ui', 'forcecwd', r.root, 'hgweb') |
|
242 | r.ui.setconfig('ui', 'forcecwd', r.root, 'hgweb') | |
239 | r.baseui.setconfig('ui', 'forcecwd', r.root, 'hgweb') |
|
243 | r.baseui.setconfig('ui', 'forcecwd', r.root, 'hgweb') | |
240 | # displaying bundling progress bar while serving feel wrong and may |
|
244 | # displaying bundling progress bar while serving feel wrong and may | |
241 | # break some wsgi implementation. |
|
245 | # break some wsgi implementation. | |
242 | r.ui.setconfig('progress', 'disable', 'true', 'hgweb') |
|
246 | r.ui.setconfig('progress', 'disable', 'true', 'hgweb') | |
243 | r.baseui.setconfig('progress', 'disable', 'true', 'hgweb') |
|
247 | r.baseui.setconfig('progress', 'disable', 'true', 'hgweb') | |
244 | self._repos = [hg.cachedlocalrepo(self._webifyrepo(r))] |
|
248 | self._repos = [hg.cachedlocalrepo(self._webifyrepo(r))] | |
245 | self._lastrepo = self._repos[0] |
|
249 | self._lastrepo = self._repos[0] | |
246 | hook.redirect(True) |
|
250 | hook.redirect(True) | |
247 | self.reponame = name |
|
251 | self.reponame = name | |
248 |
|
252 | |||
249 | def _webifyrepo(self, repo): |
|
253 | def _webifyrepo(self, repo): | |
250 | repo = getwebview(repo) |
|
254 | repo = getwebview(repo) | |
251 | self.websubtable = webutil.getwebsubs(repo) |
|
255 | self.websubtable = webutil.getwebsubs(repo) | |
252 | return repo |
|
256 | return repo | |
253 |
|
257 | |||
254 | @contextlib.contextmanager |
|
258 | @contextlib.contextmanager | |
255 | def _obtainrepo(self): |
|
259 | def _obtainrepo(self): | |
256 | """Obtain a repo unique to the caller. |
|
260 | """Obtain a repo unique to the caller. | |
257 |
|
261 | |||
258 | Internally we maintain a stack of cachedlocalrepo instances |
|
262 | Internally we maintain a stack of cachedlocalrepo instances | |
259 | to be handed out. If one is available, we pop it and return it, |
|
263 | to be handed out. If one is available, we pop it and return it, | |
260 | ensuring it is up to date in the process. If one is not available, |
|
264 | ensuring it is up to date in the process. If one is not available, | |
261 | we clone the most recently used repo instance and return it. |
|
265 | we clone the most recently used repo instance and return it. | |
262 |
|
266 | |||
263 | It is currently possible for the stack to grow without bounds |
|
267 | It is currently possible for the stack to grow without bounds | |
264 | if the server allows infinite threads. However, servers should |
|
268 | if the server allows infinite threads. However, servers should | |
265 | have a thread limit, thus establishing our limit. |
|
269 | have a thread limit, thus establishing our limit. | |
266 | """ |
|
270 | """ | |
267 | if self._repos: |
|
271 | if self._repos: | |
268 | cached = self._repos.pop() |
|
272 | cached = self._repos.pop() | |
269 | r, created = cached.fetch() |
|
273 | r, created = cached.fetch() | |
270 | else: |
|
274 | else: | |
271 | cached = self._lastrepo.copy() |
|
275 | cached = self._lastrepo.copy() | |
272 | r, created = cached.fetch() |
|
276 | r, created = cached.fetch() | |
273 | if created: |
|
277 | if created: | |
274 | r = self._webifyrepo(r) |
|
278 | r = self._webifyrepo(r) | |
275 |
|
279 | |||
276 | self._lastrepo = cached |
|
280 | self._lastrepo = cached | |
277 | self.mtime = cached.mtime |
|
281 | self.mtime = cached.mtime | |
278 | try: |
|
282 | try: | |
279 | yield r |
|
283 | yield r | |
280 | finally: |
|
284 | finally: | |
281 | self._repos.append(cached) |
|
285 | self._repos.append(cached) | |
282 |
|
286 | |||
283 | def run(self): |
|
287 | def run(self): | |
284 | """Start a server from CGI environment. |
|
288 | """Start a server from CGI environment. | |
285 |
|
289 | |||
286 | Modern servers should be using WSGI and should avoid this |
|
290 | Modern servers should be using WSGI and should avoid this | |
287 | method, if possible. |
|
291 | method, if possible. | |
288 | """ |
|
292 | """ | |
289 | if not encoding.environ.get('GATEWAY_INTERFACE', |
|
293 | if not encoding.environ.get('GATEWAY_INTERFACE', | |
290 | '').startswith("CGI/1."): |
|
294 | '').startswith("CGI/1."): | |
291 | raise RuntimeError("This function is only intended to be " |
|
295 | raise RuntimeError("This function is only intended to be " | |
292 | "called while running as a CGI script.") |
|
296 | "called while running as a CGI script.") | |
293 | wsgicgi.launch(self) |
|
297 | wsgicgi.launch(self) | |
294 |
|
298 | |||
295 | def __call__(self, env, respond): |
|
299 | def __call__(self, env, respond): | |
296 | """Run the WSGI application. |
|
300 | """Run the WSGI application. | |
297 |
|
301 | |||
298 | This may be called by multiple threads. |
|
302 | This may be called by multiple threads. | |
299 | """ |
|
303 | """ | |
300 | req = wsgirequest(env, respond) |
|
304 | req = wsgirequest(env, respond) | |
301 | return self.run_wsgi(req) |
|
305 | return self.run_wsgi(req) | |
302 |
|
306 | |||
303 | def run_wsgi(self, req): |
|
307 | def run_wsgi(self, req): | |
304 | """Internal method to run the WSGI application. |
|
308 | """Internal method to run the WSGI application. | |
305 |
|
309 | |||
306 | This is typically only called by Mercurial. External consumers |
|
310 | This is typically only called by Mercurial. External consumers | |
307 | should be using instances of this class as the WSGI application. |
|
311 | should be using instances of this class as the WSGI application. | |
308 | """ |
|
312 | """ | |
309 | with self._obtainrepo() as repo: |
|
313 | with self._obtainrepo() as repo: | |
310 | with profiling.maybeprofile(repo.ui): |
|
314 | with profiling.maybeprofile(repo.ui): | |
311 | for r in self._runwsgi(req, repo): |
|
315 | for r in self._runwsgi(req, repo): | |
312 | yield r |
|
316 | yield r | |
313 |
|
317 | |||
314 | def _runwsgi(self, req, repo): |
|
318 | def _runwsgi(self, req, repo): | |
315 | rctx = requestcontext(self, repo) |
|
319 | rctx = requestcontext(self, repo) | |
316 |
|
320 | |||
317 | # This state is global across all threads. |
|
321 | # This state is global across all threads. | |
318 | encoding.encoding = rctx.config('web', 'encoding', encoding.encoding) |
|
322 | encoding.encoding = rctx.config('web', 'encoding', encoding.encoding) | |
319 | rctx.repo.ui.environ = req.env |
|
323 | rctx.repo.ui.environ = req.env | |
320 |
|
324 | |||
|
325 | if rctx.csp: | |||
|
326 | # hgwebdir may have added CSP header. Since we generate our own, | |||
|
327 | # replace it. | |||
|
328 | req.headers = [h for h in req.headers | |||
|
329 | if h[0] != 'Content-Security-Policy'] | |||
|
330 | req.headers.append(('Content-Security-Policy', rctx.csp)) | |||
|
331 | ||||
321 | # work with CGI variables to create coherent structure |
|
332 | # work with CGI variables to create coherent structure | |
322 | # use SCRIPT_NAME, PATH_INFO and QUERY_STRING as well as our REPO_NAME |
|
333 | # use SCRIPT_NAME, PATH_INFO and QUERY_STRING as well as our REPO_NAME | |
323 |
|
334 | |||
324 | req.url = req.env['SCRIPT_NAME'] |
|
335 | req.url = req.env['SCRIPT_NAME'] | |
325 | if not req.url.endswith('/'): |
|
336 | if not req.url.endswith('/'): | |
326 | req.url += '/' |
|
337 | req.url += '/' | |
327 | if 'REPO_NAME' in req.env: |
|
338 | if 'REPO_NAME' in req.env: | |
328 | req.url += req.env['REPO_NAME'] + '/' |
|
339 | req.url += req.env['REPO_NAME'] + '/' | |
329 |
|
340 | |||
330 | if 'PATH_INFO' in req.env: |
|
341 | if 'PATH_INFO' in req.env: | |
331 | parts = req.env['PATH_INFO'].strip('/').split('/') |
|
342 | parts = req.env['PATH_INFO'].strip('/').split('/') | |
332 | repo_parts = req.env.get('REPO_NAME', '').split('/') |
|
343 | repo_parts = req.env.get('REPO_NAME', '').split('/') | |
333 | if parts[:len(repo_parts)] == repo_parts: |
|
344 | if parts[:len(repo_parts)] == repo_parts: | |
334 | parts = parts[len(repo_parts):] |
|
345 | parts = parts[len(repo_parts):] | |
335 | query = '/'.join(parts) |
|
346 | query = '/'.join(parts) | |
336 | else: |
|
347 | else: | |
337 | query = req.env['QUERY_STRING'].partition('&')[0] |
|
348 | query = req.env['QUERY_STRING'].partition('&')[0] | |
338 | query = query.partition(';')[0] |
|
349 | query = query.partition(';')[0] | |
339 |
|
350 | |||
340 | # process this if it's a protocol request |
|
351 | # process this if it's a protocol request | |
341 | # protocol bits don't need to create any URLs |
|
352 | # protocol bits don't need to create any URLs | |
342 | # and the clients always use the old URL structure |
|
353 | # and the clients always use the old URL structure | |
343 |
|
354 | |||
344 | cmd = req.form.get('cmd', [''])[0] |
|
355 | cmd = req.form.get('cmd', [''])[0] | |
345 | if protocol.iscmd(cmd): |
|
356 | if protocol.iscmd(cmd): | |
346 | try: |
|
357 | try: | |
347 | if query: |
|
358 | if query: | |
348 | raise ErrorResponse(HTTP_NOT_FOUND) |
|
359 | raise ErrorResponse(HTTP_NOT_FOUND) | |
349 | if cmd in perms: |
|
360 | if cmd in perms: | |
350 | self.check_perm(rctx, req, perms[cmd]) |
|
361 | self.check_perm(rctx, req, perms[cmd]) | |
351 | return protocol.call(rctx.repo, req, cmd) |
|
362 | return protocol.call(rctx.repo, req, cmd) | |
352 | except ErrorResponse as inst: |
|
363 | except ErrorResponse as inst: | |
353 | # A client that sends unbundle without 100-continue will |
|
364 | # A client that sends unbundle without 100-continue will | |
354 | # break if we respond early. |
|
365 | # break if we respond early. | |
355 | if (cmd == 'unbundle' and |
|
366 | if (cmd == 'unbundle' and | |
356 | (req.env.get('HTTP_EXPECT', |
|
367 | (req.env.get('HTTP_EXPECT', | |
357 | '').lower() != '100-continue') or |
|
368 | '').lower() != '100-continue') or | |
358 | req.env.get('X-HgHttp2', '')): |
|
369 | req.env.get('X-HgHttp2', '')): | |
359 | req.drain() |
|
370 | req.drain() | |
360 | else: |
|
371 | else: | |
361 | req.headers.append(('Connection', 'Close')) |
|
372 | req.headers.append(('Connection', 'Close')) | |
362 | req.respond(inst, protocol.HGTYPE, |
|
373 | req.respond(inst, protocol.HGTYPE, | |
363 | body='0\n%s\n' % inst) |
|
374 | body='0\n%s\n' % inst) | |
364 | return '' |
|
375 | return '' | |
365 |
|
376 | |||
366 | # translate user-visible url structure to internal structure |
|
377 | # translate user-visible url structure to internal structure | |
367 |
|
378 | |||
368 | args = query.split('/', 2) |
|
379 | args = query.split('/', 2) | |
369 | if 'cmd' not in req.form and args and args[0]: |
|
380 | if 'cmd' not in req.form and args and args[0]: | |
370 |
|
381 | |||
371 | cmd = args.pop(0) |
|
382 | cmd = args.pop(0) | |
372 | style = cmd.rfind('-') |
|
383 | style = cmd.rfind('-') | |
373 | if style != -1: |
|
384 | if style != -1: | |
374 | req.form['style'] = [cmd[:style]] |
|
385 | req.form['style'] = [cmd[:style]] | |
375 | cmd = cmd[style + 1:] |
|
386 | cmd = cmd[style + 1:] | |
376 |
|
387 | |||
377 | # avoid accepting e.g. style parameter as command |
|
388 | # avoid accepting e.g. style parameter as command | |
378 | if util.safehasattr(webcommands, cmd): |
|
389 | if util.safehasattr(webcommands, cmd): | |
379 | req.form['cmd'] = [cmd] |
|
390 | req.form['cmd'] = [cmd] | |
380 |
|
391 | |||
381 | if cmd == 'static': |
|
392 | if cmd == 'static': | |
382 | req.form['file'] = ['/'.join(args)] |
|
393 | req.form['file'] = ['/'.join(args)] | |
383 | else: |
|
394 | else: | |
384 | if args and args[0]: |
|
395 | if args and args[0]: | |
385 | node = args.pop(0).replace('%2F', '/') |
|
396 | node = args.pop(0).replace('%2F', '/') | |
386 | req.form['node'] = [node] |
|
397 | req.form['node'] = [node] | |
387 | if args: |
|
398 | if args: | |
388 | req.form['file'] = args |
|
399 | req.form['file'] = args | |
389 |
|
400 | |||
390 | ua = req.env.get('HTTP_USER_AGENT', '') |
|
401 | ua = req.env.get('HTTP_USER_AGENT', '') | |
391 | if cmd == 'rev' and 'mercurial' in ua: |
|
402 | if cmd == 'rev' and 'mercurial' in ua: | |
392 | req.form['style'] = ['raw'] |
|
403 | req.form['style'] = ['raw'] | |
393 |
|
404 | |||
394 | if cmd == 'archive': |
|
405 | if cmd == 'archive': | |
395 | fn = req.form['node'][0] |
|
406 | fn = req.form['node'][0] | |
396 | for type_, spec in rctx.archivespecs.iteritems(): |
|
407 | for type_, spec in rctx.archivespecs.iteritems(): | |
397 | ext = spec[2] |
|
408 | ext = spec[2] | |
398 | if fn.endswith(ext): |
|
409 | if fn.endswith(ext): | |
399 | req.form['node'] = [fn[:-len(ext)]] |
|
410 | req.form['node'] = [fn[:-len(ext)]] | |
400 | req.form['type'] = [type_] |
|
411 | req.form['type'] = [type_] | |
401 |
|
412 | |||
402 | # process the web interface request |
|
413 | # process the web interface request | |
403 |
|
414 | |||
404 | try: |
|
415 | try: | |
405 | tmpl = rctx.templater(req) |
|
416 | tmpl = rctx.templater(req) | |
406 | ctype = tmpl('mimetype', encoding=encoding.encoding) |
|
417 | ctype = tmpl('mimetype', encoding=encoding.encoding) | |
407 | ctype = templater.stringify(ctype) |
|
418 | ctype = templater.stringify(ctype) | |
408 |
|
419 | |||
409 | # check read permissions non-static content |
|
420 | # check read permissions non-static content | |
410 | if cmd != 'static': |
|
421 | if cmd != 'static': | |
411 | self.check_perm(rctx, req, None) |
|
422 | self.check_perm(rctx, req, None) | |
412 |
|
423 | |||
413 | if cmd == '': |
|
424 | if cmd == '': | |
414 | req.form['cmd'] = [tmpl.cache['default']] |
|
425 | req.form['cmd'] = [tmpl.cache['default']] | |
415 | cmd = req.form['cmd'][0] |
|
426 | cmd = req.form['cmd'][0] | |
416 |
|
427 | |||
417 | if rctx.configbool('web', 'cache', True): |
|
428 | # Don't enable caching if using a CSP nonce because then it wouldn't | |
|
429 | # be a nonce. | |||
|
430 | if rctx.configbool('web', 'cache', True) and not rctx.nonce: | |||
418 | caching(self, req) # sets ETag header or raises NOT_MODIFIED |
|
431 | caching(self, req) # sets ETag header or raises NOT_MODIFIED | |
419 | if cmd not in webcommands.__all__: |
|
432 | if cmd not in webcommands.__all__: | |
420 | msg = 'no such method: %s' % cmd |
|
433 | msg = 'no such method: %s' % cmd | |
421 | raise ErrorResponse(HTTP_BAD_REQUEST, msg) |
|
434 | raise ErrorResponse(HTTP_BAD_REQUEST, msg) | |
422 | elif cmd == 'file' and 'raw' in req.form.get('style', []): |
|
435 | elif cmd == 'file' and 'raw' in req.form.get('style', []): | |
423 | rctx.ctype = ctype |
|
436 | rctx.ctype = ctype | |
424 | content = webcommands.rawfile(rctx, req, tmpl) |
|
437 | content = webcommands.rawfile(rctx, req, tmpl) | |
425 | else: |
|
438 | else: | |
426 | content = getattr(webcommands, cmd)(rctx, req, tmpl) |
|
439 | content = getattr(webcommands, cmd)(rctx, req, tmpl) | |
427 | req.respond(HTTP_OK, ctype) |
|
440 | req.respond(HTTP_OK, ctype) | |
428 |
|
441 | |||
429 | return content |
|
442 | return content | |
430 |
|
443 | |||
431 | except (error.LookupError, error.RepoLookupError) as err: |
|
444 | except (error.LookupError, error.RepoLookupError) as err: | |
432 | req.respond(HTTP_NOT_FOUND, ctype) |
|
445 | req.respond(HTTP_NOT_FOUND, ctype) | |
433 | msg = str(err) |
|
446 | msg = str(err) | |
434 | if (util.safehasattr(err, 'name') and |
|
447 | if (util.safehasattr(err, 'name') and | |
435 | not isinstance(err, error.ManifestLookupError)): |
|
448 | not isinstance(err, error.ManifestLookupError)): | |
436 | msg = 'revision not found: %s' % err.name |
|
449 | msg = 'revision not found: %s' % err.name | |
437 | return tmpl('error', error=msg) |
|
450 | return tmpl('error', error=msg) | |
438 | except (error.RepoError, error.RevlogError) as inst: |
|
451 | except (error.RepoError, error.RevlogError) as inst: | |
439 | req.respond(HTTP_SERVER_ERROR, ctype) |
|
452 | req.respond(HTTP_SERVER_ERROR, ctype) | |
440 | return tmpl('error', error=str(inst)) |
|
453 | return tmpl('error', error=str(inst)) | |
441 | except ErrorResponse as inst: |
|
454 | except ErrorResponse as inst: | |
442 | req.respond(inst, ctype) |
|
455 | req.respond(inst, ctype) | |
443 | if inst.code == HTTP_NOT_MODIFIED: |
|
456 | if inst.code == HTTP_NOT_MODIFIED: | |
444 | # Not allowed to return a body on a 304 |
|
457 | # Not allowed to return a body on a 304 | |
445 | return [''] |
|
458 | return [''] | |
446 | return tmpl('error', error=str(inst)) |
|
459 | return tmpl('error', error=str(inst)) | |
447 |
|
460 | |||
448 | def check_perm(self, rctx, req, op): |
|
461 | def check_perm(self, rctx, req, op): | |
449 | for permhook in permhooks: |
|
462 | for permhook in permhooks: | |
450 | permhook(rctx, req, op) |
|
463 | permhook(rctx, req, op) | |
451 |
|
464 | |||
452 | def getwebview(repo): |
|
465 | def getwebview(repo): | |
453 | """The 'web.view' config controls changeset filter to hgweb. Possible |
|
466 | """The 'web.view' config controls changeset filter to hgweb. Possible | |
454 | values are ``served``, ``visible`` and ``all``. Default is ``served``. |
|
467 | values are ``served``, ``visible`` and ``all``. Default is ``served``. | |
455 | The ``served`` filter only shows changesets that can be pulled from the |
|
468 | The ``served`` filter only shows changesets that can be pulled from the | |
456 | hgweb instance. The``visible`` filter includes secret changesets but |
|
469 | hgweb instance. The``visible`` filter includes secret changesets but | |
457 | still excludes "hidden" one. |
|
470 | still excludes "hidden" one. | |
458 |
|
471 | |||
459 | See the repoview module for details. |
|
472 | See the repoview module for details. | |
460 |
|
473 | |||
461 | The option has been around undocumented since Mercurial 2.5, but no |
|
474 | The option has been around undocumented since Mercurial 2.5, but no | |
462 | user ever asked about it. So we better keep it undocumented for now.""" |
|
475 | user ever asked about it. So we better keep it undocumented for now.""" | |
463 | viewconfig = repo.ui.config('web', 'view', 'served', |
|
476 | viewconfig = repo.ui.config('web', 'view', 'served', | |
464 | untrusted=True) |
|
477 | untrusted=True) | |
465 | if viewconfig == 'all': |
|
478 | if viewconfig == 'all': | |
466 | return repo.unfiltered() |
|
479 | return repo.unfiltered() | |
467 | elif viewconfig in repoview.filtertable: |
|
480 | elif viewconfig in repoview.filtertable: | |
468 | return repo.filtered(viewconfig) |
|
481 | return repo.filtered(viewconfig) | |
469 | else: |
|
482 | else: | |
470 | return repo.filtered('served') |
|
483 | return repo.filtered('served') |
@@ -1,522 +1,528 b'' | |||||
1 | # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. |
|
1 | # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. | |
2 | # |
|
2 | # | |
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
|
3 | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | |
4 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
|
4 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from __future__ import absolute_import |
|
9 | from __future__ import absolute_import | |
10 |
|
10 | |||
11 | import os |
|
11 | import os | |
12 | import re |
|
12 | import re | |
13 | import time |
|
13 | import time | |
14 |
|
14 | |||
15 | from ..i18n import _ |
|
15 | from ..i18n import _ | |
16 |
|
16 | |||
17 | from .common import ( |
|
17 | from .common import ( | |
18 | ErrorResponse, |
|
18 | ErrorResponse, | |
19 | HTTP_NOT_FOUND, |
|
19 | HTTP_NOT_FOUND, | |
20 | HTTP_OK, |
|
20 | HTTP_OK, | |
21 | HTTP_SERVER_ERROR, |
|
21 | HTTP_SERVER_ERROR, | |
|
22 | cspvalues, | |||
22 | get_contact, |
|
23 | get_contact, | |
23 | get_mtime, |
|
24 | get_mtime, | |
24 | ismember, |
|
25 | ismember, | |
25 | paritygen, |
|
26 | paritygen, | |
26 | staticfile, |
|
27 | staticfile, | |
27 | ) |
|
28 | ) | |
28 | from .request import wsgirequest |
|
29 | from .request import wsgirequest | |
29 |
|
30 | |||
30 | from .. import ( |
|
31 | from .. import ( | |
31 | encoding, |
|
32 | encoding, | |
32 | error, |
|
33 | error, | |
33 | hg, |
|
34 | hg, | |
34 | profiling, |
|
35 | profiling, | |
35 | scmutil, |
|
36 | scmutil, | |
36 | templater, |
|
37 | templater, | |
37 | ui as uimod, |
|
38 | ui as uimod, | |
38 | util, |
|
39 | util, | |
39 | ) |
|
40 | ) | |
40 |
|
41 | |||
41 | from . import ( |
|
42 | from . import ( | |
42 | hgweb_mod, |
|
43 | hgweb_mod, | |
43 | webutil, |
|
44 | webutil, | |
44 | wsgicgi, |
|
45 | wsgicgi, | |
45 | ) |
|
46 | ) | |
46 |
|
47 | |||
47 | def cleannames(items): |
|
48 | def cleannames(items): | |
48 | return [(util.pconvert(name).strip('/'), path) for name, path in items] |
|
49 | return [(util.pconvert(name).strip('/'), path) for name, path in items] | |
49 |
|
50 | |||
50 | def findrepos(paths): |
|
51 | def findrepos(paths): | |
51 | repos = [] |
|
52 | repos = [] | |
52 | for prefix, root in cleannames(paths): |
|
53 | for prefix, root in cleannames(paths): | |
53 | roothead, roottail = os.path.split(root) |
|
54 | roothead, roottail = os.path.split(root) | |
54 | # "foo = /bar/*" or "foo = /bar/**" lets every repo /bar/N in or below |
|
55 | # "foo = /bar/*" or "foo = /bar/**" lets every repo /bar/N in or below | |
55 | # /bar/ be served as as foo/N . |
|
56 | # /bar/ be served as as foo/N . | |
56 | # '*' will not search inside dirs with .hg (except .hg/patches), |
|
57 | # '*' will not search inside dirs with .hg (except .hg/patches), | |
57 | # '**' will search inside dirs with .hg (and thus also find subrepos). |
|
58 | # '**' will search inside dirs with .hg (and thus also find subrepos). | |
58 | try: |
|
59 | try: | |
59 | recurse = {'*': False, '**': True}[roottail] |
|
60 | recurse = {'*': False, '**': True}[roottail] | |
60 | except KeyError: |
|
61 | except KeyError: | |
61 | repos.append((prefix, root)) |
|
62 | repos.append((prefix, root)) | |
62 | continue |
|
63 | continue | |
63 | roothead = os.path.normpath(os.path.abspath(roothead)) |
|
64 | roothead = os.path.normpath(os.path.abspath(roothead)) | |
64 | paths = scmutil.walkrepos(roothead, followsym=True, recurse=recurse) |
|
65 | paths = scmutil.walkrepos(roothead, followsym=True, recurse=recurse) | |
65 | repos.extend(urlrepos(prefix, roothead, paths)) |
|
66 | repos.extend(urlrepos(prefix, roothead, paths)) | |
66 | return repos |
|
67 | return repos | |
67 |
|
68 | |||
68 | def urlrepos(prefix, roothead, paths): |
|
69 | def urlrepos(prefix, roothead, paths): | |
69 | """yield url paths and filesystem paths from a list of repo paths |
|
70 | """yield url paths and filesystem paths from a list of repo paths | |
70 |
|
71 | |||
71 | >>> conv = lambda seq: [(v, util.pconvert(p)) for v,p in seq] |
|
72 | >>> conv = lambda seq: [(v, util.pconvert(p)) for v,p in seq] | |
72 | >>> conv(urlrepos('hg', '/opt', ['/opt/r', '/opt/r/r', '/opt'])) |
|
73 | >>> conv(urlrepos('hg', '/opt', ['/opt/r', '/opt/r/r', '/opt'])) | |
73 | [('hg/r', '/opt/r'), ('hg/r/r', '/opt/r/r'), ('hg', '/opt')] |
|
74 | [('hg/r', '/opt/r'), ('hg/r/r', '/opt/r/r'), ('hg', '/opt')] | |
74 | >>> conv(urlrepos('', '/opt', ['/opt/r', '/opt/r/r', '/opt'])) |
|
75 | >>> conv(urlrepos('', '/opt', ['/opt/r', '/opt/r/r', '/opt'])) | |
75 | [('r', '/opt/r'), ('r/r', '/opt/r/r'), ('', '/opt')] |
|
76 | [('r', '/opt/r'), ('r/r', '/opt/r/r'), ('', '/opt')] | |
76 | """ |
|
77 | """ | |
77 | for path in paths: |
|
78 | for path in paths: | |
78 | path = os.path.normpath(path) |
|
79 | path = os.path.normpath(path) | |
79 | yield (prefix + '/' + |
|
80 | yield (prefix + '/' + | |
80 | util.pconvert(path[len(roothead):]).lstrip('/')).strip('/'), path |
|
81 | util.pconvert(path[len(roothead):]).lstrip('/')).strip('/'), path | |
81 |
|
82 | |||
82 | def geturlcgivars(baseurl, port): |
|
83 | def geturlcgivars(baseurl, port): | |
83 | """ |
|
84 | """ | |
84 | Extract CGI variables from baseurl |
|
85 | Extract CGI variables from baseurl | |
85 |
|
86 | |||
86 | >>> geturlcgivars("http://host.org/base", "80") |
|
87 | >>> geturlcgivars("http://host.org/base", "80") | |
87 | ('host.org', '80', '/base') |
|
88 | ('host.org', '80', '/base') | |
88 | >>> geturlcgivars("http://host.org:8000/base", "80") |
|
89 | >>> geturlcgivars("http://host.org:8000/base", "80") | |
89 | ('host.org', '8000', '/base') |
|
90 | ('host.org', '8000', '/base') | |
90 | >>> geturlcgivars('/base', 8000) |
|
91 | >>> geturlcgivars('/base', 8000) | |
91 | ('', '8000', '/base') |
|
92 | ('', '8000', '/base') | |
92 | >>> geturlcgivars("base", '8000') |
|
93 | >>> geturlcgivars("base", '8000') | |
93 | ('', '8000', '/base') |
|
94 | ('', '8000', '/base') | |
94 | >>> geturlcgivars("http://host", '8000') |
|
95 | >>> geturlcgivars("http://host", '8000') | |
95 | ('host', '8000', '/') |
|
96 | ('host', '8000', '/') | |
96 | >>> geturlcgivars("http://host/", '8000') |
|
97 | >>> geturlcgivars("http://host/", '8000') | |
97 | ('host', '8000', '/') |
|
98 | ('host', '8000', '/') | |
98 | """ |
|
99 | """ | |
99 | u = util.url(baseurl) |
|
100 | u = util.url(baseurl) | |
100 | name = u.host or '' |
|
101 | name = u.host or '' | |
101 | if u.port: |
|
102 | if u.port: | |
102 | port = u.port |
|
103 | port = u.port | |
103 | path = u.path or "" |
|
104 | path = u.path or "" | |
104 | if not path.startswith('/'): |
|
105 | if not path.startswith('/'): | |
105 | path = '/' + path |
|
106 | path = '/' + path | |
106 |
|
107 | |||
107 | return name, str(port), path |
|
108 | return name, str(port), path | |
108 |
|
109 | |||
109 | class hgwebdir(object): |
|
110 | class hgwebdir(object): | |
110 | """HTTP server for multiple repositories. |
|
111 | """HTTP server for multiple repositories. | |
111 |
|
112 | |||
112 | Given a configuration, different repositories will be served depending |
|
113 | Given a configuration, different repositories will be served depending | |
113 | on the request path. |
|
114 | on the request path. | |
114 |
|
115 | |||
115 | Instances are typically used as WSGI applications. |
|
116 | Instances are typically used as WSGI applications. | |
116 | """ |
|
117 | """ | |
117 | def __init__(self, conf, baseui=None): |
|
118 | def __init__(self, conf, baseui=None): | |
118 | self.conf = conf |
|
119 | self.conf = conf | |
119 | self.baseui = baseui |
|
120 | self.baseui = baseui | |
120 | self.ui = None |
|
121 | self.ui = None | |
121 | self.lastrefresh = 0 |
|
122 | self.lastrefresh = 0 | |
122 | self.motd = None |
|
123 | self.motd = None | |
123 | self.refresh() |
|
124 | self.refresh() | |
124 |
|
125 | |||
125 | def refresh(self): |
|
126 | def refresh(self): | |
126 | refreshinterval = 20 |
|
127 | refreshinterval = 20 | |
127 | if self.ui: |
|
128 | if self.ui: | |
128 | refreshinterval = self.ui.configint('web', 'refreshinterval', |
|
129 | refreshinterval = self.ui.configint('web', 'refreshinterval', | |
129 | refreshinterval) |
|
130 | refreshinterval) | |
130 |
|
131 | |||
131 | # refreshinterval <= 0 means to always refresh. |
|
132 | # refreshinterval <= 0 means to always refresh. | |
132 | if (refreshinterval > 0 and |
|
133 | if (refreshinterval > 0 and | |
133 | self.lastrefresh + refreshinterval > time.time()): |
|
134 | self.lastrefresh + refreshinterval > time.time()): | |
134 | return |
|
135 | return | |
135 |
|
136 | |||
136 | if self.baseui: |
|
137 | if self.baseui: | |
137 | u = self.baseui.copy() |
|
138 | u = self.baseui.copy() | |
138 | else: |
|
139 | else: | |
139 | u = uimod.ui.load() |
|
140 | u = uimod.ui.load() | |
140 | u.setconfig('ui', 'report_untrusted', 'off', 'hgwebdir') |
|
141 | u.setconfig('ui', 'report_untrusted', 'off', 'hgwebdir') | |
141 | u.setconfig('ui', 'nontty', 'true', 'hgwebdir') |
|
142 | u.setconfig('ui', 'nontty', 'true', 'hgwebdir') | |
142 | # displaying bundling progress bar while serving feels wrong and may |
|
143 | # displaying bundling progress bar while serving feels wrong and may | |
143 | # break some wsgi implementations. |
|
144 | # break some wsgi implementations. | |
144 | u.setconfig('progress', 'disable', 'true', 'hgweb') |
|
145 | u.setconfig('progress', 'disable', 'true', 'hgweb') | |
145 |
|
146 | |||
146 | if not isinstance(self.conf, (dict, list, tuple)): |
|
147 | if not isinstance(self.conf, (dict, list, tuple)): | |
147 | map = {'paths': 'hgweb-paths'} |
|
148 | map = {'paths': 'hgweb-paths'} | |
148 | if not os.path.exists(self.conf): |
|
149 | if not os.path.exists(self.conf): | |
149 | raise error.Abort(_('config file %s not found!') % self.conf) |
|
150 | raise error.Abort(_('config file %s not found!') % self.conf) | |
150 | u.readconfig(self.conf, remap=map, trust=True) |
|
151 | u.readconfig(self.conf, remap=map, trust=True) | |
151 | paths = [] |
|
152 | paths = [] | |
152 | for name, ignored in u.configitems('hgweb-paths'): |
|
153 | for name, ignored in u.configitems('hgweb-paths'): | |
153 | for path in u.configlist('hgweb-paths', name): |
|
154 | for path in u.configlist('hgweb-paths', name): | |
154 | paths.append((name, path)) |
|
155 | paths.append((name, path)) | |
155 | elif isinstance(self.conf, (list, tuple)): |
|
156 | elif isinstance(self.conf, (list, tuple)): | |
156 | paths = self.conf |
|
157 | paths = self.conf | |
157 | elif isinstance(self.conf, dict): |
|
158 | elif isinstance(self.conf, dict): | |
158 | paths = self.conf.items() |
|
159 | paths = self.conf.items() | |
159 |
|
160 | |||
160 | repos = findrepos(paths) |
|
161 | repos = findrepos(paths) | |
161 | for prefix, root in u.configitems('collections'): |
|
162 | for prefix, root in u.configitems('collections'): | |
162 | prefix = util.pconvert(prefix) |
|
163 | prefix = util.pconvert(prefix) | |
163 | for path in scmutil.walkrepos(root, followsym=True): |
|
164 | for path in scmutil.walkrepos(root, followsym=True): | |
164 | repo = os.path.normpath(path) |
|
165 | repo = os.path.normpath(path) | |
165 | name = util.pconvert(repo) |
|
166 | name = util.pconvert(repo) | |
166 | if name.startswith(prefix): |
|
167 | if name.startswith(prefix): | |
167 | name = name[len(prefix):] |
|
168 | name = name[len(prefix):] | |
168 | repos.append((name.lstrip('/'), repo)) |
|
169 | repos.append((name.lstrip('/'), repo)) | |
169 |
|
170 | |||
170 | self.repos = repos |
|
171 | self.repos = repos | |
171 | self.ui = u |
|
172 | self.ui = u | |
172 | encoding.encoding = self.ui.config('web', 'encoding', |
|
173 | encoding.encoding = self.ui.config('web', 'encoding', | |
173 | encoding.encoding) |
|
174 | encoding.encoding) | |
174 | self.style = self.ui.config('web', 'style', 'paper') |
|
175 | self.style = self.ui.config('web', 'style', 'paper') | |
175 | self.templatepath = self.ui.config('web', 'templates', None) |
|
176 | self.templatepath = self.ui.config('web', 'templates', None) | |
176 | self.stripecount = self.ui.config('web', 'stripes', 1) |
|
177 | self.stripecount = self.ui.config('web', 'stripes', 1) | |
177 | if self.stripecount: |
|
178 | if self.stripecount: | |
178 | self.stripecount = int(self.stripecount) |
|
179 | self.stripecount = int(self.stripecount) | |
179 | self._baseurl = self.ui.config('web', 'baseurl') |
|
180 | self._baseurl = self.ui.config('web', 'baseurl') | |
180 | prefix = self.ui.config('web', 'prefix', '') |
|
181 | prefix = self.ui.config('web', 'prefix', '') | |
181 | if prefix.startswith('/'): |
|
182 | if prefix.startswith('/'): | |
182 | prefix = prefix[1:] |
|
183 | prefix = prefix[1:] | |
183 | if prefix.endswith('/'): |
|
184 | if prefix.endswith('/'): | |
184 | prefix = prefix[:-1] |
|
185 | prefix = prefix[:-1] | |
185 | self.prefix = prefix |
|
186 | self.prefix = prefix | |
186 | self.lastrefresh = time.time() |
|
187 | self.lastrefresh = time.time() | |
187 |
|
188 | |||
188 | def run(self): |
|
189 | def run(self): | |
189 | if not encoding.environ.get('GATEWAY_INTERFACE', |
|
190 | if not encoding.environ.get('GATEWAY_INTERFACE', | |
190 | '').startswith("CGI/1."): |
|
191 | '').startswith("CGI/1."): | |
191 | raise RuntimeError("This function is only intended to be " |
|
192 | raise RuntimeError("This function is only intended to be " | |
192 | "called while running as a CGI script.") |
|
193 | "called while running as a CGI script.") | |
193 | wsgicgi.launch(self) |
|
194 | wsgicgi.launch(self) | |
194 |
|
195 | |||
195 | def __call__(self, env, respond): |
|
196 | def __call__(self, env, respond): | |
196 | req = wsgirequest(env, respond) |
|
197 | req = wsgirequest(env, respond) | |
197 | return self.run_wsgi(req) |
|
198 | return self.run_wsgi(req) | |
198 |
|
199 | |||
199 | def read_allowed(self, ui, req): |
|
200 | def read_allowed(self, ui, req): | |
200 | """Check allow_read and deny_read config options of a repo's ui object |
|
201 | """Check allow_read and deny_read config options of a repo's ui object | |
201 | to determine user permissions. By default, with neither option set (or |
|
202 | to determine user permissions. By default, with neither option set (or | |
202 | both empty), allow all users to read the repo. There are two ways a |
|
203 | both empty), allow all users to read the repo. There are two ways a | |
203 | user can be denied read access: (1) deny_read is not empty, and the |
|
204 | user can be denied read access: (1) deny_read is not empty, and the | |
204 | user is unauthenticated or deny_read contains user (or *), and (2) |
|
205 | user is unauthenticated or deny_read contains user (or *), and (2) | |
205 | allow_read is not empty and the user is not in allow_read. Return True |
|
206 | allow_read is not empty and the user is not in allow_read. Return True | |
206 | if user is allowed to read the repo, else return False.""" |
|
207 | if user is allowed to read the repo, else return False.""" | |
207 |
|
208 | |||
208 | user = req.env.get('REMOTE_USER') |
|
209 | user = req.env.get('REMOTE_USER') | |
209 |
|
210 | |||
210 | deny_read = ui.configlist('web', 'deny_read', untrusted=True) |
|
211 | deny_read = ui.configlist('web', 'deny_read', untrusted=True) | |
211 | if deny_read and (not user or ismember(ui, user, deny_read)): |
|
212 | if deny_read and (not user or ismember(ui, user, deny_read)): | |
212 | return False |
|
213 | return False | |
213 |
|
214 | |||
214 | allow_read = ui.configlist('web', 'allow_read', untrusted=True) |
|
215 | allow_read = ui.configlist('web', 'allow_read', untrusted=True) | |
215 | # by default, allow reading if no allow_read option has been set |
|
216 | # by default, allow reading if no allow_read option has been set | |
216 | if (not allow_read) or ismember(ui, user, allow_read): |
|
217 | if (not allow_read) or ismember(ui, user, allow_read): | |
217 | return True |
|
218 | return True | |
218 |
|
219 | |||
219 | return False |
|
220 | return False | |
220 |
|
221 | |||
221 | def run_wsgi(self, req): |
|
222 | def run_wsgi(self, req): | |
222 | with profiling.maybeprofile(self.ui): |
|
223 | with profiling.maybeprofile(self.ui): | |
223 | for r in self._runwsgi(req): |
|
224 | for r in self._runwsgi(req): | |
224 | yield r |
|
225 | yield r | |
225 |
|
226 | |||
226 | def _runwsgi(self, req): |
|
227 | def _runwsgi(self, req): | |
227 | try: |
|
228 | try: | |
228 | self.refresh() |
|
229 | self.refresh() | |
229 |
|
230 | |||
|
231 | csp, nonce = cspvalues(self.ui) | |||
|
232 | if csp: | |||
|
233 | req.headers.append(('Content-Security-Policy', csp)) | |||
|
234 | ||||
230 | virtual = req.env.get("PATH_INFO", "").strip('/') |
|
235 | virtual = req.env.get("PATH_INFO", "").strip('/') | |
231 | tmpl = self.templater(req) |
|
236 | tmpl = self.templater(req, nonce) | |
232 | ctype = tmpl('mimetype', encoding=encoding.encoding) |
|
237 | ctype = tmpl('mimetype', encoding=encoding.encoding) | |
233 | ctype = templater.stringify(ctype) |
|
238 | ctype = templater.stringify(ctype) | |
234 |
|
239 | |||
235 | # a static file |
|
240 | # a static file | |
236 | if virtual.startswith('static/') or 'static' in req.form: |
|
241 | if virtual.startswith('static/') or 'static' in req.form: | |
237 | if virtual.startswith('static/'): |
|
242 | if virtual.startswith('static/'): | |
238 | fname = virtual[7:] |
|
243 | fname = virtual[7:] | |
239 | else: |
|
244 | else: | |
240 | fname = req.form['static'][0] |
|
245 | fname = req.form['static'][0] | |
241 | static = self.ui.config("web", "static", None, |
|
246 | static = self.ui.config("web", "static", None, | |
242 | untrusted=False) |
|
247 | untrusted=False) | |
243 | if not static: |
|
248 | if not static: | |
244 | tp = self.templatepath or templater.templatepaths() |
|
249 | tp = self.templatepath or templater.templatepaths() | |
245 | if isinstance(tp, str): |
|
250 | if isinstance(tp, str): | |
246 | tp = [tp] |
|
251 | tp = [tp] | |
247 | static = [os.path.join(p, 'static') for p in tp] |
|
252 | static = [os.path.join(p, 'static') for p in tp] | |
248 | staticfile(static, fname, req) |
|
253 | staticfile(static, fname, req) | |
249 | return [] |
|
254 | return [] | |
250 |
|
255 | |||
251 | # top-level index |
|
256 | # top-level index | |
252 | elif not virtual: |
|
257 | elif not virtual: | |
253 | req.respond(HTTP_OK, ctype) |
|
258 | req.respond(HTTP_OK, ctype) | |
254 | return self.makeindex(req, tmpl) |
|
259 | return self.makeindex(req, tmpl) | |
255 |
|
260 | |||
256 | # nested indexes and hgwebs |
|
261 | # nested indexes and hgwebs | |
257 |
|
262 | |||
258 | repos = dict(self.repos) |
|
263 | repos = dict(self.repos) | |
259 | virtualrepo = virtual |
|
264 | virtualrepo = virtual | |
260 | while virtualrepo: |
|
265 | while virtualrepo: | |
261 | real = repos.get(virtualrepo) |
|
266 | real = repos.get(virtualrepo) | |
262 | if real: |
|
267 | if real: | |
263 | req.env['REPO_NAME'] = virtualrepo |
|
268 | req.env['REPO_NAME'] = virtualrepo | |
264 | try: |
|
269 | try: | |
265 | # ensure caller gets private copy of ui |
|
270 | # ensure caller gets private copy of ui | |
266 | repo = hg.repository(self.ui.copy(), real) |
|
271 | repo = hg.repository(self.ui.copy(), real) | |
267 | return hgweb_mod.hgweb(repo).run_wsgi(req) |
|
272 | return hgweb_mod.hgweb(repo).run_wsgi(req) | |
268 | except IOError as inst: |
|
273 | except IOError as inst: | |
269 | msg = inst.strerror |
|
274 | msg = inst.strerror | |
270 | raise ErrorResponse(HTTP_SERVER_ERROR, msg) |
|
275 | raise ErrorResponse(HTTP_SERVER_ERROR, msg) | |
271 | except error.RepoError as inst: |
|
276 | except error.RepoError as inst: | |
272 | raise ErrorResponse(HTTP_SERVER_ERROR, str(inst)) |
|
277 | raise ErrorResponse(HTTP_SERVER_ERROR, str(inst)) | |
273 |
|
278 | |||
274 | up = virtualrepo.rfind('/') |
|
279 | up = virtualrepo.rfind('/') | |
275 | if up < 0: |
|
280 | if up < 0: | |
276 | break |
|
281 | break | |
277 | virtualrepo = virtualrepo[:up] |
|
282 | virtualrepo = virtualrepo[:up] | |
278 |
|
283 | |||
279 | # browse subdirectories |
|
284 | # browse subdirectories | |
280 | subdir = virtual + '/' |
|
285 | subdir = virtual + '/' | |
281 | if [r for r in repos if r.startswith(subdir)]: |
|
286 | if [r for r in repos if r.startswith(subdir)]: | |
282 | req.respond(HTTP_OK, ctype) |
|
287 | req.respond(HTTP_OK, ctype) | |
283 | return self.makeindex(req, tmpl, subdir) |
|
288 | return self.makeindex(req, tmpl, subdir) | |
284 |
|
289 | |||
285 | # prefixes not found |
|
290 | # prefixes not found | |
286 | req.respond(HTTP_NOT_FOUND, ctype) |
|
291 | req.respond(HTTP_NOT_FOUND, ctype) | |
287 | return tmpl("notfound", repo=virtual) |
|
292 | return tmpl("notfound", repo=virtual) | |
288 |
|
293 | |||
289 | except ErrorResponse as err: |
|
294 | except ErrorResponse as err: | |
290 | req.respond(err, ctype) |
|
295 | req.respond(err, ctype) | |
291 | return tmpl('error', error=err.message or '') |
|
296 | return tmpl('error', error=err.message or '') | |
292 | finally: |
|
297 | finally: | |
293 | tmpl = None |
|
298 | tmpl = None | |
294 |
|
299 | |||
295 | def makeindex(self, req, tmpl, subdir=""): |
|
300 | def makeindex(self, req, tmpl, subdir=""): | |
296 |
|
301 | |||
297 | def archivelist(ui, nodeid, url): |
|
302 | def archivelist(ui, nodeid, url): | |
298 | allowed = ui.configlist("web", "allow_archive", untrusted=True) |
|
303 | allowed = ui.configlist("web", "allow_archive", untrusted=True) | |
299 | archives = [] |
|
304 | archives = [] | |
300 | for typ, spec in hgweb_mod.archivespecs.iteritems(): |
|
305 | for typ, spec in hgweb_mod.archivespecs.iteritems(): | |
301 | if typ in allowed or ui.configbool("web", "allow" + typ, |
|
306 | if typ in allowed or ui.configbool("web", "allow" + typ, | |
302 | untrusted=True): |
|
307 | untrusted=True): | |
303 | archives.append({"type" : typ, "extension": spec[2], |
|
308 | archives.append({"type" : typ, "extension": spec[2], | |
304 | "node": nodeid, "url": url}) |
|
309 | "node": nodeid, "url": url}) | |
305 | return archives |
|
310 | return archives | |
306 |
|
311 | |||
307 | def rawentries(subdir="", **map): |
|
312 | def rawentries(subdir="", **map): | |
308 |
|
313 | |||
309 | descend = self.ui.configbool('web', 'descend', True) |
|
314 | descend = self.ui.configbool('web', 'descend', True) | |
310 | collapse = self.ui.configbool('web', 'collapse', False) |
|
315 | collapse = self.ui.configbool('web', 'collapse', False) | |
311 | seenrepos = set() |
|
316 | seenrepos = set() | |
312 | seendirs = set() |
|
317 | seendirs = set() | |
313 | for name, path in self.repos: |
|
318 | for name, path in self.repos: | |
314 |
|
319 | |||
315 | if not name.startswith(subdir): |
|
320 | if not name.startswith(subdir): | |
316 | continue |
|
321 | continue | |
317 | name = name[len(subdir):] |
|
322 | name = name[len(subdir):] | |
318 | directory = False |
|
323 | directory = False | |
319 |
|
324 | |||
320 | if '/' in name: |
|
325 | if '/' in name: | |
321 | if not descend: |
|
326 | if not descend: | |
322 | continue |
|
327 | continue | |
323 |
|
328 | |||
324 | nameparts = name.split('/') |
|
329 | nameparts = name.split('/') | |
325 | rootname = nameparts[0] |
|
330 | rootname = nameparts[0] | |
326 |
|
331 | |||
327 | if not collapse: |
|
332 | if not collapse: | |
328 | pass |
|
333 | pass | |
329 | elif rootname in seendirs: |
|
334 | elif rootname in seendirs: | |
330 | continue |
|
335 | continue | |
331 | elif rootname in seenrepos: |
|
336 | elif rootname in seenrepos: | |
332 | pass |
|
337 | pass | |
333 | else: |
|
338 | else: | |
334 | directory = True |
|
339 | directory = True | |
335 | name = rootname |
|
340 | name = rootname | |
336 |
|
341 | |||
337 | # redefine the path to refer to the directory |
|
342 | # redefine the path to refer to the directory | |
338 | discarded = '/'.join(nameparts[1:]) |
|
343 | discarded = '/'.join(nameparts[1:]) | |
339 |
|
344 | |||
340 | # remove name parts plus accompanying slash |
|
345 | # remove name parts plus accompanying slash | |
341 | path = path[:-len(discarded) - 1] |
|
346 | path = path[:-len(discarded) - 1] | |
342 |
|
347 | |||
343 | try: |
|
348 | try: | |
344 | r = hg.repository(self.ui, path) |
|
349 | r = hg.repository(self.ui, path) | |
345 | directory = False |
|
350 | directory = False | |
346 | except (IOError, error.RepoError): |
|
351 | except (IOError, error.RepoError): | |
347 | pass |
|
352 | pass | |
348 |
|
353 | |||
349 | parts = [name] |
|
354 | parts = [name] | |
350 | if 'PATH_INFO' in req.env: |
|
355 | if 'PATH_INFO' in req.env: | |
351 | parts.insert(0, req.env['PATH_INFO'].rstrip('/')) |
|
356 | parts.insert(0, req.env['PATH_INFO'].rstrip('/')) | |
352 | if req.env['SCRIPT_NAME']: |
|
357 | if req.env['SCRIPT_NAME']: | |
353 | parts.insert(0, req.env['SCRIPT_NAME']) |
|
358 | parts.insert(0, req.env['SCRIPT_NAME']) | |
354 | url = re.sub(r'/+', '/', '/'.join(parts) + '/') |
|
359 | url = re.sub(r'/+', '/', '/'.join(parts) + '/') | |
355 |
|
360 | |||
356 | # show either a directory entry or a repository |
|
361 | # show either a directory entry or a repository | |
357 | if directory: |
|
362 | if directory: | |
358 | # get the directory's time information |
|
363 | # get the directory's time information | |
359 | try: |
|
364 | try: | |
360 | d = (get_mtime(path), util.makedate()[1]) |
|
365 | d = (get_mtime(path), util.makedate()[1]) | |
361 | except OSError: |
|
366 | except OSError: | |
362 | continue |
|
367 | continue | |
363 |
|
368 | |||
364 | # add '/' to the name to make it obvious that |
|
369 | # add '/' to the name to make it obvious that | |
365 | # the entry is a directory, not a regular repository |
|
370 | # the entry is a directory, not a regular repository | |
366 | row = {'contact': "", |
|
371 | row = {'contact': "", | |
367 | 'contact_sort': "", |
|
372 | 'contact_sort': "", | |
368 | 'name': name + '/', |
|
373 | 'name': name + '/', | |
369 | 'name_sort': name, |
|
374 | 'name_sort': name, | |
370 | 'url': url, |
|
375 | 'url': url, | |
371 | 'description': "", |
|
376 | 'description': "", | |
372 | 'description_sort': "", |
|
377 | 'description_sort': "", | |
373 | 'lastchange': d, |
|
378 | 'lastchange': d, | |
374 | 'lastchange_sort': d[1]-d[0], |
|
379 | 'lastchange_sort': d[1]-d[0], | |
375 | 'archives': [], |
|
380 | 'archives': [], | |
376 | 'isdirectory': True, |
|
381 | 'isdirectory': True, | |
377 | 'labels': [], |
|
382 | 'labels': [], | |
378 | } |
|
383 | } | |
379 |
|
384 | |||
380 | seendirs.add(name) |
|
385 | seendirs.add(name) | |
381 | yield row |
|
386 | yield row | |
382 | continue |
|
387 | continue | |
383 |
|
388 | |||
384 | u = self.ui.copy() |
|
389 | u = self.ui.copy() | |
385 | try: |
|
390 | try: | |
386 | u.readconfig(os.path.join(path, '.hg', 'hgrc')) |
|
391 | u.readconfig(os.path.join(path, '.hg', 'hgrc')) | |
387 | except Exception as e: |
|
392 | except Exception as e: | |
388 | u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) |
|
393 | u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | |
389 | continue |
|
394 | continue | |
390 | def get(section, name, default=None): |
|
395 | def get(section, name, default=None): | |
391 | return u.config(section, name, default, untrusted=True) |
|
396 | return u.config(section, name, default, untrusted=True) | |
392 |
|
397 | |||
393 | if u.configbool("web", "hidden", untrusted=True): |
|
398 | if u.configbool("web", "hidden", untrusted=True): | |
394 | continue |
|
399 | continue | |
395 |
|
400 | |||
396 | if not self.read_allowed(u, req): |
|
401 | if not self.read_allowed(u, req): | |
397 | continue |
|
402 | continue | |
398 |
|
403 | |||
399 | # update time with local timezone |
|
404 | # update time with local timezone | |
400 | try: |
|
405 | try: | |
401 | r = hg.repository(self.ui, path) |
|
406 | r = hg.repository(self.ui, path) | |
402 | except IOError: |
|
407 | except IOError: | |
403 | u.warn(_('error accessing repository at %s\n') % path) |
|
408 | u.warn(_('error accessing repository at %s\n') % path) | |
404 | continue |
|
409 | continue | |
405 | except error.RepoError: |
|
410 | except error.RepoError: | |
406 | u.warn(_('error accessing repository at %s\n') % path) |
|
411 | u.warn(_('error accessing repository at %s\n') % path) | |
407 | continue |
|
412 | continue | |
408 | try: |
|
413 | try: | |
409 | d = (get_mtime(r.spath), util.makedate()[1]) |
|
414 | d = (get_mtime(r.spath), util.makedate()[1]) | |
410 | except OSError: |
|
415 | except OSError: | |
411 | continue |
|
416 | continue | |
412 |
|
417 | |||
413 | contact = get_contact(get) |
|
418 | contact = get_contact(get) | |
414 | description = get("web", "description", "") |
|
419 | description = get("web", "description", "") | |
415 | seenrepos.add(name) |
|
420 | seenrepos.add(name) | |
416 | name = get("web", "name", name) |
|
421 | name = get("web", "name", name) | |
417 | row = {'contact': contact or "unknown", |
|
422 | row = {'contact': contact or "unknown", | |
418 | 'contact_sort': contact.upper() or "unknown", |
|
423 | 'contact_sort': contact.upper() or "unknown", | |
419 | 'name': name, |
|
424 | 'name': name, | |
420 | 'name_sort': name, |
|
425 | 'name_sort': name, | |
421 | 'url': url, |
|
426 | 'url': url, | |
422 | 'description': description or "unknown", |
|
427 | 'description': description or "unknown", | |
423 | 'description_sort': description.upper() or "unknown", |
|
428 | 'description_sort': description.upper() or "unknown", | |
424 | 'lastchange': d, |
|
429 | 'lastchange': d, | |
425 | 'lastchange_sort': d[1]-d[0], |
|
430 | 'lastchange_sort': d[1]-d[0], | |
426 | 'archives': archivelist(u, "tip", url), |
|
431 | 'archives': archivelist(u, "tip", url), | |
427 | 'isdirectory': None, |
|
432 | 'isdirectory': None, | |
428 | 'labels': u.configlist('web', 'labels', untrusted=True), |
|
433 | 'labels': u.configlist('web', 'labels', untrusted=True), | |
429 | } |
|
434 | } | |
430 |
|
435 | |||
431 | yield row |
|
436 | yield row | |
432 |
|
437 | |||
433 | sortdefault = None, False |
|
438 | sortdefault = None, False | |
434 | def entries(sortcolumn="", descending=False, subdir="", **map): |
|
439 | def entries(sortcolumn="", descending=False, subdir="", **map): | |
435 | rows = rawentries(subdir=subdir, **map) |
|
440 | rows = rawentries(subdir=subdir, **map) | |
436 |
|
441 | |||
437 | if sortcolumn and sortdefault != (sortcolumn, descending): |
|
442 | if sortcolumn and sortdefault != (sortcolumn, descending): | |
438 | sortkey = '%s_sort' % sortcolumn |
|
443 | sortkey = '%s_sort' % sortcolumn | |
439 | rows = sorted(rows, key=lambda x: x[sortkey], |
|
444 | rows = sorted(rows, key=lambda x: x[sortkey], | |
440 | reverse=descending) |
|
445 | reverse=descending) | |
441 | for row, parity in zip(rows, paritygen(self.stripecount)): |
|
446 | for row, parity in zip(rows, paritygen(self.stripecount)): | |
442 | row['parity'] = parity |
|
447 | row['parity'] = parity | |
443 | yield row |
|
448 | yield row | |
444 |
|
449 | |||
445 | self.refresh() |
|
450 | self.refresh() | |
446 | sortable = ["name", "description", "contact", "lastchange"] |
|
451 | sortable = ["name", "description", "contact", "lastchange"] | |
447 | sortcolumn, descending = sortdefault |
|
452 | sortcolumn, descending = sortdefault | |
448 | if 'sort' in req.form: |
|
453 | if 'sort' in req.form: | |
449 | sortcolumn = req.form['sort'][0] |
|
454 | sortcolumn = req.form['sort'][0] | |
450 | descending = sortcolumn.startswith('-') |
|
455 | descending = sortcolumn.startswith('-') | |
451 | if descending: |
|
456 | if descending: | |
452 | sortcolumn = sortcolumn[1:] |
|
457 | sortcolumn = sortcolumn[1:] | |
453 | if sortcolumn not in sortable: |
|
458 | if sortcolumn not in sortable: | |
454 | sortcolumn = "" |
|
459 | sortcolumn = "" | |
455 |
|
460 | |||
456 | sort = [("sort_%s" % column, |
|
461 | sort = [("sort_%s" % column, | |
457 | "%s%s" % ((not descending and column == sortcolumn) |
|
462 | "%s%s" % ((not descending and column == sortcolumn) | |
458 | and "-" or "", column)) |
|
463 | and "-" or "", column)) | |
459 | for column in sortable] |
|
464 | for column in sortable] | |
460 |
|
465 | |||
461 | self.refresh() |
|
466 | self.refresh() | |
462 | self.updatereqenv(req.env) |
|
467 | self.updatereqenv(req.env) | |
463 |
|
468 | |||
464 | return tmpl("index", entries=entries, subdir=subdir, |
|
469 | return tmpl("index", entries=entries, subdir=subdir, | |
465 | pathdef=hgweb_mod.makebreadcrumb('/' + subdir, self.prefix), |
|
470 | pathdef=hgweb_mod.makebreadcrumb('/' + subdir, self.prefix), | |
466 | sortcolumn=sortcolumn, descending=descending, |
|
471 | sortcolumn=sortcolumn, descending=descending, | |
467 | **dict(sort)) |
|
472 | **dict(sort)) | |
468 |
|
473 | |||
469 | def templater(self, req): |
|
474 | def templater(self, req, nonce): | |
470 |
|
475 | |||
471 | def motd(**map): |
|
476 | def motd(**map): | |
472 | if self.motd is not None: |
|
477 | if self.motd is not None: | |
473 | yield self.motd |
|
478 | yield self.motd | |
474 | else: |
|
479 | else: | |
475 | yield config('web', 'motd', '') |
|
480 | yield config('web', 'motd', '') | |
476 |
|
481 | |||
477 | def config(section, name, default=None, untrusted=True): |
|
482 | def config(section, name, default=None, untrusted=True): | |
478 | return self.ui.config(section, name, default, untrusted) |
|
483 | return self.ui.config(section, name, default, untrusted) | |
479 |
|
484 | |||
480 | self.updatereqenv(req.env) |
|
485 | self.updatereqenv(req.env) | |
481 |
|
486 | |||
482 | url = req.env.get('SCRIPT_NAME', '') |
|
487 | url = req.env.get('SCRIPT_NAME', '') | |
483 | if not url.endswith('/'): |
|
488 | if not url.endswith('/'): | |
484 | url += '/' |
|
489 | url += '/' | |
485 |
|
490 | |||
486 | vars = {} |
|
491 | vars = {} | |
487 | styles = ( |
|
492 | styles = ( | |
488 | req.form.get('style', [None])[0], |
|
493 | req.form.get('style', [None])[0], | |
489 | config('web', 'style'), |
|
494 | config('web', 'style'), | |
490 | 'paper' |
|
495 | 'paper' | |
491 | ) |
|
496 | ) | |
492 | style, mapfile = templater.stylemap(styles, self.templatepath) |
|
497 | style, mapfile = templater.stylemap(styles, self.templatepath) | |
493 | if style == styles[0]: |
|
498 | if style == styles[0]: | |
494 | vars['style'] = style |
|
499 | vars['style'] = style | |
495 |
|
500 | |||
496 | start = url[-1] == '?' and '&' or '?' |
|
501 | start = url[-1] == '?' and '&' or '?' | |
497 | sessionvars = webutil.sessionvars(vars, start) |
|
502 | sessionvars = webutil.sessionvars(vars, start) | |
498 | logourl = config('web', 'logourl', 'https://mercurial-scm.org/') |
|
503 | logourl = config('web', 'logourl', 'https://mercurial-scm.org/') | |
499 | logoimg = config('web', 'logoimg', 'hglogo.png') |
|
504 | logoimg = config('web', 'logoimg', 'hglogo.png') | |
500 | staticurl = config('web', 'staticurl') or url + 'static/' |
|
505 | staticurl = config('web', 'staticurl') or url + 'static/' | |
501 | if not staticurl.endswith('/'): |
|
506 | if not staticurl.endswith('/'): | |
502 | staticurl += '/' |
|
507 | staticurl += '/' | |
503 |
|
508 | |||
504 | defaults = { |
|
509 | defaults = { | |
505 | "encoding": encoding.encoding, |
|
510 | "encoding": encoding.encoding, | |
506 | "motd": motd, |
|
511 | "motd": motd, | |
507 | "url": url, |
|
512 | "url": url, | |
508 | "logourl": logourl, |
|
513 | "logourl": logourl, | |
509 | "logoimg": logoimg, |
|
514 | "logoimg": logoimg, | |
510 | "staticurl": staticurl, |
|
515 | "staticurl": staticurl, | |
511 | "sessionvars": sessionvars, |
|
516 | "sessionvars": sessionvars, | |
512 | "style": style, |
|
517 | "style": style, | |
|
518 | "nonce": nonce, | |||
513 | } |
|
519 | } | |
514 | tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) |
|
520 | tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) | |
515 | return tmpl |
|
521 | return tmpl | |
516 |
|
522 | |||
517 | def updatereqenv(self, env): |
|
523 | def updatereqenv(self, env): | |
518 | if self._baseurl is not None: |
|
524 | if self._baseurl is not None: | |
519 | name, port, path = geturlcgivars(self._baseurl, env['SERVER_PORT']) |
|
525 | name, port, path = geturlcgivars(self._baseurl, env['SERVER_PORT']) | |
520 | env['SERVER_NAME'] = name |
|
526 | env['SERVER_NAME'] = name | |
521 | env['SERVER_PORT'] = port |
|
527 | env['SERVER_PORT'] = port | |
522 | env['SCRIPT_NAME'] = path |
|
528 | env['SCRIPT_NAME'] = path |
@@ -1,122 +1,122 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: Graph</title> |
|
2 | <title>{repo|escape}: Graph</title> | |
3 | <link rel="alternate" type="application/atom+xml" |
|
3 | <link rel="alternate" type="application/atom+xml" | |
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
|
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> | |
5 | <link rel="alternate" type="application/rss+xml" |
|
5 | <link rel="alternate" type="application/rss+xml" | |
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
|
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> | |
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> |
|
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> | |
8 | </head> |
|
8 | </head> | |
9 | <body> |
|
9 | <body> | |
10 |
|
10 | |||
11 | <div class="page_header"> |
|
11 | <div class="page_header"> | |
12 | <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> |
|
12 | <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> | |
13 | <a href="/">Mercurial</a> {pathdef%breadcrumb} / graph |
|
13 | <a href="/">Mercurial</a> {pathdef%breadcrumb} / graph | |
14 | </div> |
|
14 | </div> | |
15 |
|
15 | |||
16 | <form action="{url|urlescape}log"> |
|
16 | <form action="{url|urlescape}log"> | |
17 | {sessionvars%hiddenformentry} |
|
17 | {sessionvars%hiddenformentry} | |
18 | <div class="search"> |
|
18 | <div class="search"> | |
19 | <input type="text" name="rev" /> |
|
19 | <input type="text" name="rev" /> | |
20 | </div> |
|
20 | </div> | |
21 | </form> |
|
21 | </form> | |
22 | <div class="page_nav"> |
|
22 | <div class="page_nav"> | |
23 | <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | |
|
23 | <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | | |
24 | <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> | |
|
24 | <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> | | |
25 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | |
|
25 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | | |
26 | graph | |
|
26 | graph | | |
27 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | |
|
27 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | | |
28 | <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | |
|
28 | <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | | |
29 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | |
|
29 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | | |
30 | <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> | |
|
30 | <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> | | |
31 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
|
31 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> | |
32 | <br/> |
|
32 | <br/> | |
33 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> |
|
33 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> | |
34 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> |
|
34 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> | |
35 | | {changenav%navgraph}<br/> |
|
35 | | {changenav%navgraph}<br/> | |
36 | </div> |
|
36 | </div> | |
37 |
|
37 | |||
38 | <div class="title"> </div> |
|
38 | <div class="title"> </div> | |
39 |
|
39 | |||
40 | <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> |
|
40 | <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> | |
41 |
|
41 | |||
42 | <div id="wrapper"> |
|
42 | <div id="wrapper"> | |
43 | <ul id="nodebgs"></ul> |
|
43 | <ul id="nodebgs"></ul> | |
44 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> |
|
44 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> | |
45 | <ul id="graphnodes"></ul> |
|
45 | <ul id="graphnodes"></ul> | |
46 | </div> |
|
46 | </div> | |
47 |
|
47 | |||
48 | <script> |
|
48 | <script{if(nonce, ' nonce="{nonce}"')}> | |
49 | <!-- hide script content |
|
49 | <!-- hide script content | |
50 |
|
50 | |||
51 | var data = {jsdata|json}; |
|
51 | var data = {jsdata|json}; | |
52 | var graph = new Graph(); |
|
52 | var graph = new Graph(); | |
53 | graph.scale({bg_height}); |
|
53 | graph.scale({bg_height}); | |
54 |
|
54 | |||
55 | graph.vertex = function(x, y, color, parity, cur) \{ |
|
55 | graph.vertex = function(x, y, color, parity, cur) \{ | |
56 |
|
56 | |||
57 | this.ctx.beginPath(); |
|
57 | this.ctx.beginPath(); | |
58 | color = this.setColor(color, 0.25, 0.75); |
|
58 | color = this.setColor(color, 0.25, 0.75); | |
59 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); |
|
59 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); | |
60 | this.ctx.fill(); |
|
60 | this.ctx.fill(); | |
61 |
|
61 | |||
62 | var bg = '<li class="bg parity' + parity + '"></li>'; |
|
62 | var bg = '<li class="bg parity' + parity + '"></li>'; | |
63 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; |
|
63 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; | |
64 | var nstyle = 'padding-left: ' + left + 'px;'; |
|
64 | var nstyle = 'padding-left: ' + left + 'px;'; | |
65 |
|
65 | |||
66 | var tagspan = ''; |
|
66 | var tagspan = ''; | |
67 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ |
|
67 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ | |
68 | tagspan = '<span class="logtags">'; |
|
68 | tagspan = '<span class="logtags">'; | |
69 | if (cur[6][1]) \{ |
|
69 | if (cur[6][1]) \{ | |
70 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; |
|
70 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; | |
71 | tagspan += cur[6][0] + '</span> '; |
|
71 | tagspan += cur[6][0] + '</span> '; | |
72 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ |
|
72 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ | |
73 | tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; |
|
73 | tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; | |
74 | tagspan += cur[6][0] + '</span> '; |
|
74 | tagspan += cur[6][0] + '</span> '; | |
75 | } |
|
75 | } | |
76 | if (cur[7].length) \{ |
|
76 | if (cur[7].length) \{ | |
77 | for (var t in cur[7]) \{ |
|
77 | for (var t in cur[7]) \{ | |
78 | var tag = cur[7][t]; |
|
78 | var tag = cur[7][t]; | |
79 | tagspan += '<span class="tagtag">' + tag + '</span> '; |
|
79 | tagspan += '<span class="tagtag">' + tag + '</span> '; | |
80 | } |
|
80 | } | |
81 | } |
|
81 | } | |
82 | if (cur[8].length) \{ |
|
82 | if (cur[8].length) \{ | |
83 | for (var t in cur[8]) \{ |
|
83 | for (var t in cur[8]) \{ | |
84 | var bookmark = cur[8][t]; |
|
84 | var bookmark = cur[8][t]; | |
85 | tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; |
|
85 | tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; | |
86 | } |
|
86 | } | |
87 | } |
|
87 | } | |
88 | tagspan += '</span>'; |
|
88 | tagspan += '</span>'; | |
89 | } |
|
89 | } | |
90 |
|
90 | |||
91 | var item = '<li style="' + nstyle + '"><span class="desc">'; |
|
91 | var item = '<li style="' + nstyle + '"><span class="desc">'; | |
92 | item += '<a class="list" href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>'; |
|
92 | item += '<a class="list" href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>'; | |
93 | item += '</span> ' + tagspan + ''; |
|
93 | item += '</span> ' + tagspan + ''; | |
94 | item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; |
|
94 | item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; | |
95 |
|
95 | |||
96 | return [bg, item]; |
|
96 | return [bg, item]; | |
97 |
|
97 | |||
98 | } |
|
98 | } | |
99 |
|
99 | |||
100 | graph.render(data); |
|
100 | graph.render(data); | |
101 |
|
101 | |||
102 | // stop hiding script --> |
|
102 | // stop hiding script --> | |
103 | </script> |
|
103 | </script> | |
104 |
|
104 | |||
105 | <div class="page_nav"> |
|
105 | <div class="page_nav"> | |
106 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> |
|
106 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> | |
107 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> |
|
107 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> | |
108 | | {changenav%navgraph} |
|
108 | | {changenav%navgraph} | |
109 | </div> |
|
109 | </div> | |
110 |
|
110 | |||
111 | <script type="text/javascript"> |
|
111 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
112 | ajaxScrollInit( |
|
112 | ajaxScrollInit( | |
113 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', |
|
113 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', | |
114 | {revcount}+60, |
|
114 | {revcount}+60, | |
115 | function (htmlText, previousVal) \{ return previousVal + 60; }, |
|
115 | function (htmlText, previousVal) \{ return previousVal + 60; }, | |
116 | '#wrapper', |
|
116 | '#wrapper', | |
117 | '<div class="%class%" style="text-align: center;">%text%</div>', |
|
117 | '<div class="%class%" style="text-align: center;">%text%</div>', | |
118 | 'graph' |
|
118 | 'graph' | |
119 | ); |
|
119 | ); | |
120 | </script> |
|
120 | </script> | |
121 |
|
121 | |||
122 | {footer} |
|
122 | {footer} |
@@ -1,58 +1,58 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: Shortlog</title> |
|
2 | <title>{repo|escape}: Shortlog</title> | |
3 | <link rel="alternate" type="application/atom+xml" |
|
3 | <link rel="alternate" type="application/atom+xml" | |
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
|
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> | |
5 | <link rel="alternate" type="application/rss+xml" |
|
5 | <link rel="alternate" type="application/rss+xml" | |
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
|
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> | |
7 | </head> |
|
7 | </head> | |
8 | <body> |
|
8 | <body> | |
9 |
|
9 | |||
10 | <div class="page_header"> |
|
10 | <div class="page_header"> | |
11 | <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> |
|
11 | <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> | |
12 | <a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog |
|
12 | <a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog | |
13 | </div> |
|
13 | </div> | |
14 |
|
14 | |||
15 | <form action="{url|urlescape}log"> |
|
15 | <form action="{url|urlescape}log"> | |
16 | {sessionvars%hiddenformentry} |
|
16 | {sessionvars%hiddenformentry} | |
17 | <div class="search"> |
|
17 | <div class="search"> | |
18 | <input type="text" name="rev" /> |
|
18 | <input type="text" name="rev" /> | |
19 | </div> |
|
19 | </div> | |
20 | </form> |
|
20 | </form> | |
21 | <div class="page_nav"> |
|
21 | <div class="page_nav"> | |
22 | <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | |
|
22 | <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | | |
23 | shortlog | |
|
23 | shortlog | | |
24 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | |
|
24 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | | |
25 | <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> | |
|
25 | <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> | | |
26 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | |
|
26 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | | |
27 | <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | |
|
27 | <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | | |
28 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | |
|
28 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | | |
29 | <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} | |
|
29 | <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} | | |
30 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
|
30 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> | |
31 | <br/>{changenav%navshort}<br/> |
|
31 | <br/>{changenav%navshort}<br/> | |
32 | </div> |
|
32 | </div> | |
33 |
|
33 | |||
34 | <div class="title"> </div> |
|
34 | <div class="title"> </div> | |
35 | <table class="shortlogtable" cellspacing="0"> |
|
35 | <table class="shortlogtable" cellspacing="0"> | |
36 | {entries%shortlogentry} |
|
36 | {entries%shortlogentry} | |
37 | </table> |
|
37 | </table> | |
38 |
|
38 | |||
39 | <div class="page_nav"> |
|
39 | <div class="page_nav"> | |
40 | {changenav%navshort} |
|
40 | {changenav%navshort} | |
41 | </div> |
|
41 | </div> | |
42 |
|
42 | |||
43 | <script type="text/javascript"> |
|
43 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
44 | ajaxScrollInit( |
|
44 | ajaxScrollInit( | |
45 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', |
|
45 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', | |
46 | '{nextentry%"{node}"}', <!-- NEXTHASH |
|
46 | '{nextentry%"{node}"}', <!-- NEXTHASH | |
47 | function (htmlText, previousVal) \{ |
|
47 | function (htmlText, previousVal) \{ | |
48 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); |
|
48 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); | |
49 | return m ? m[1] : null; |
|
49 | return m ? m[1] : null; | |
50 | }, |
|
50 | }, | |
51 | '.shortlogtable > tbody:nth-of-type(1)', |
|
51 | '.shortlogtable > tbody:nth-of-type(1)', | |
52 | '<tr class="%class%">\ |
|
52 | '<tr class="%class%">\ | |
53 | <td colspan="4" style="text-align: center;">%text%</td>\ |
|
53 | <td colspan="4" style="text-align: center;">%text%</td>\ | |
54 | </tr>' |
|
54 | </tr>' | |
55 | ); |
|
55 | ); | |
56 | </script> |
|
56 | </script> | |
57 |
|
57 | |||
58 | {footer} |
|
58 | {footer} |
@@ -1,118 +1,118 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: graph</title> |
|
2 | <title>{repo|escape}: graph</title> | |
3 | <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
|
3 | <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> | |
4 | <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
|
4 | <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> | |
5 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> |
|
5 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> | |
6 | </head> |
|
6 | </head> | |
7 |
|
7 | |||
8 | <body> |
|
8 | <body> | |
9 | <div id="container"> |
|
9 | <div id="container"> | |
10 | <div class="page-header"> |
|
10 | <div class="page-header"> | |
11 | <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1> |
|
11 | <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1> | |
12 |
|
12 | |||
13 | <form action="{url|urlescape}log"> |
|
13 | <form action="{url|urlescape}log"> | |
14 | {sessionvars%hiddenformentry} |
|
14 | {sessionvars%hiddenformentry} | |
15 | <dl class="search"> |
|
15 | <dl class="search"> | |
16 | <dt><label>Search: </label></dt> |
|
16 | <dt><label>Search: </label></dt> | |
17 | <dd><input type="text" name="rev" /></dd> |
|
17 | <dd><input type="text" name="rev" /></dd> | |
18 | </dl> |
|
18 | </dl> | |
19 | </form> |
|
19 | </form> | |
20 |
|
20 | |||
21 | <ul class="page-nav"> |
|
21 | <ul class="page-nav"> | |
22 | <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> |
|
22 | <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> | |
23 | <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li> |
|
23 | <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li> | |
24 | <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li> |
|
24 | <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li> | |
25 | <li class="current">graph</li> |
|
25 | <li class="current">graph</li> | |
26 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
|
26 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> | |
27 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
|
27 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
28 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> |
|
28 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> | |
29 | <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li> |
|
29 | <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li> | |
30 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> |
|
30 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> | |
31 | </ul> |
|
31 | </ul> | |
32 | </div> |
|
32 | </div> | |
33 |
|
33 | |||
34 | <h2 class="no-link no-border">graph</h2> |
|
34 | <h2 class="no-link no-border">graph</h2> | |
35 |
|
35 | |||
36 | <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div> |
|
36 | <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div> | |
37 | <div id="wrapper"> |
|
37 | <div id="wrapper"> | |
38 | <ul id="nodebgs"></ul> |
|
38 | <ul id="nodebgs"></ul> | |
39 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> |
|
39 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> | |
40 | <ul id="graphnodes"></ul> |
|
40 | <ul id="graphnodes"></ul> | |
41 | </div> |
|
41 | </div> | |
42 |
|
42 | |||
43 | <script> |
|
43 | <script{if(nonce, ' nonce="{nonce}"')}> | |
44 | <!-- hide script content |
|
44 | <!-- hide script content | |
45 |
|
45 | |||
46 | document.getElementById('noscript').style.display = 'none'; |
|
46 | document.getElementById('noscript').style.display = 'none'; | |
47 |
|
47 | |||
48 | var data = {jsdata|json}; |
|
48 | var data = {jsdata|json}; | |
49 | var graph = new Graph(); |
|
49 | var graph = new Graph(); | |
50 | graph.scale({bg_height}); |
|
50 | graph.scale({bg_height}); | |
51 |
|
51 | |||
52 | graph.vertex = function(x, y, color, parity, cur) \{ |
|
52 | graph.vertex = function(x, y, color, parity, cur) \{ | |
53 |
|
53 | |||
54 | this.ctx.beginPath(); |
|
54 | this.ctx.beginPath(); | |
55 | color = this.setColor(color, 0.25, 0.75); |
|
55 | color = this.setColor(color, 0.25, 0.75); | |
56 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); |
|
56 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); | |
57 | this.ctx.fill(); |
|
57 | this.ctx.fill(); | |
58 |
|
58 | |||
59 | var bg = '<li class="bg parity' + parity + '"></li>'; |
|
59 | var bg = '<li class="bg parity' + parity + '"></li>'; | |
60 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; |
|
60 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; | |
61 | var nstyle = 'padding-left: ' + left + 'px;'; |
|
61 | var nstyle = 'padding-left: ' + left + 'px;'; | |
62 |
|
62 | |||
63 | var tagspan = ''; |
|
63 | var tagspan = ''; | |
64 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ |
|
64 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ | |
65 | tagspan = '<span class="logtags">'; |
|
65 | tagspan = '<span class="logtags">'; | |
66 | if (cur[6][1]) \{ |
|
66 | if (cur[6][1]) \{ | |
67 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; |
|
67 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; | |
68 | tagspan += cur[6][0] + '</span> '; |
|
68 | tagspan += cur[6][0] + '</span> '; | |
69 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ |
|
69 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ | |
70 | tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; |
|
70 | tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; | |
71 | tagspan += cur[6][0] + '</span> '; |
|
71 | tagspan += cur[6][0] + '</span> '; | |
72 | } |
|
72 | } | |
73 | if (cur[7].length) \{ |
|
73 | if (cur[7].length) \{ | |
74 | for (var t in cur[7]) \{ |
|
74 | for (var t in cur[7]) \{ | |
75 | var tag = cur[7][t]; |
|
75 | var tag = cur[7][t]; | |
76 | tagspan += '<span class="tagtag">' + tag + '</span> '; |
|
76 | tagspan += '<span class="tagtag">' + tag + '</span> '; | |
77 | } |
|
77 | } | |
78 | } |
|
78 | } | |
79 | if (cur[8].length) \{ |
|
79 | if (cur[8].length) \{ | |
80 | for (var t in cur[8]) \{ |
|
80 | for (var t in cur[8]) \{ | |
81 | var bookmark = cur[8][t]; |
|
81 | var bookmark = cur[8][t]; | |
82 | tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; |
|
82 | tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; | |
83 | } |
|
83 | } | |
84 | } |
|
84 | } | |
85 | tagspan += '</span>'; |
|
85 | tagspan += '</span>'; | |
86 | } |
|
86 | } | |
87 |
|
87 | |||
88 | var item = '<li style="' + nstyle + '"><span class="desc">'; |
|
88 | var item = '<li style="' + nstyle + '"><span class="desc">'; | |
89 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; |
|
89 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; | |
90 | item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; |
|
90 | item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; | |
91 |
|
91 | |||
92 | return [bg, item]; |
|
92 | return [bg, item]; | |
93 |
|
93 | |||
94 | } |
|
94 | } | |
95 |
|
95 | |||
96 | graph.render(data); |
|
96 | graph.render(data); | |
97 |
|
97 | |||
98 | // stop hiding script --> |
|
98 | // stop hiding script --> | |
99 | </script> |
|
99 | </script> | |
100 |
|
100 | |||
101 | <div class="page-path"> |
|
101 | <div class="page-path"> | |
102 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> |
|
102 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> | |
103 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> |
|
103 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> | |
104 | | {changenav%navgraph} |
|
104 | | {changenav%navgraph} | |
105 | </div> |
|
105 | </div> | |
106 |
|
106 | |||
107 | <script type="text/javascript"> |
|
107 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
108 | ajaxScrollInit( |
|
108 | ajaxScrollInit( | |
109 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', |
|
109 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', | |
110 | {revcount}+60, |
|
110 | {revcount}+60, | |
111 | function (htmlText, previousVal) \{ return previousVal + 60; }, |
|
111 | function (htmlText, previousVal) \{ return previousVal + 60; }, | |
112 | '#wrapper', |
|
112 | '#wrapper', | |
113 | '<div class="%class%" style="text-align: center;">%text%</div>', |
|
113 | '<div class="%class%" style="text-align: center;">%text%</div>', | |
114 | 'graph' |
|
114 | 'graph' | |
115 | ); |
|
115 | ); | |
116 | </script> |
|
116 | </script> | |
117 |
|
117 | |||
118 | {footer} |
|
118 | {footer} |
@@ -1,59 +1,59 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: shortlog</title> |
|
2 | <title>{repo|escape}: shortlog</title> | |
3 | <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
|
3 | <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> | |
4 | <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
|
4 | <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> | |
5 | </head> |
|
5 | </head> | |
6 |
|
6 | |||
7 | <body> |
|
7 | <body> | |
8 | <div id="container"> |
|
8 | <div id="container"> | |
9 | <div class="page-header"> |
|
9 | <div class="page-header"> | |
10 | <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog</h1> |
|
10 | <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog</h1> | |
11 |
|
11 | |||
12 | <form action="{url|urlescape}log"> |
|
12 | <form action="{url|urlescape}log"> | |
13 | {sessionvars%hiddenformentry} |
|
13 | {sessionvars%hiddenformentry} | |
14 | <dl class="search"> |
|
14 | <dl class="search"> | |
15 | <dt><label>Search: </label></dt> |
|
15 | <dt><label>Search: </label></dt> | |
16 | <dd><input type="text" name="rev" /></dd> |
|
16 | <dd><input type="text" name="rev" /></dd> | |
17 | </dl> |
|
17 | </dl> | |
18 | </form> |
|
18 | </form> | |
19 |
|
19 | |||
20 | <ul class="page-nav"> |
|
20 | <ul class="page-nav"> | |
21 | <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> |
|
21 | <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> | |
22 | <li class="current">shortlog</li> |
|
22 | <li class="current">shortlog</li> | |
23 | <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li> |
|
23 | <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li> | |
24 | <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li> |
|
24 | <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li> | |
25 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
|
25 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> | |
26 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
|
26 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
27 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> |
|
27 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> | |
28 | <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li> |
|
28 | <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li> | |
29 | {archives%archiveentry} |
|
29 | {archives%archiveentry} | |
30 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> |
|
30 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> | |
31 | </ul> |
|
31 | </ul> | |
32 | </div> |
|
32 | </div> | |
33 |
|
33 | |||
34 | <h2 class="no-link no-border">shortlog</h2> |
|
34 | <h2 class="no-link no-border">shortlog</h2> | |
35 |
|
35 | |||
36 | <table class="shortlogtable"> |
|
36 | <table class="shortlogtable"> | |
37 | {entries%shortlogentry} |
|
37 | {entries%shortlogentry} | |
38 | </table> |
|
38 | </table> | |
39 |
|
39 | |||
40 | <div class="page-path"> |
|
40 | <div class="page-path"> | |
41 | {changenav%navshort} |
|
41 | {changenav%navshort} | |
42 | </div> |
|
42 | </div> | |
43 |
|
43 | |||
44 | <script type="text/javascript"> |
|
44 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
45 | ajaxScrollInit( |
|
45 | ajaxScrollInit( | |
46 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', |
|
46 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', | |
47 | '{nextentry%"{node}"}', <!-- NEXTHASH |
|
47 | '{nextentry%"{node}"}', <!-- NEXTHASH | |
48 | function (htmlText, previousVal) \{ |
|
48 | function (htmlText, previousVal) \{ | |
49 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); |
|
49 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); | |
50 | return m ? m[1] : null; |
|
50 | return m ? m[1] : null; | |
51 | }, |
|
51 | }, | |
52 | '.shortlogtable > tbody:nth-of-type(1)', |
|
52 | '.shortlogtable > tbody:nth-of-type(1)', | |
53 | '<tr class="%class%">\ |
|
53 | '<tr class="%class%">\ | |
54 | <td colspan="4" style="text-align: center;">%text%</td>\ |
|
54 | <td colspan="4" style="text-align: center;">%text%</td>\ | |
55 | </tr>' |
|
55 | </tr>' | |
56 | ); |
|
56 | ); | |
57 | </script> |
|
57 | </script> | |
58 |
|
58 | |||
59 | {footer} |
|
59 | {footer} |
@@ -1,138 +1,138 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: revision graph</title> |
|
2 | <title>{repo|escape}: revision graph</title> | |
3 | <link rel="alternate" type="application/atom+xml" |
|
3 | <link rel="alternate" type="application/atom+xml" | |
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}: log" /> |
|
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}: log" /> | |
5 | <link rel="alternate" type="application/rss+xml" |
|
5 | <link rel="alternate" type="application/rss+xml" | |
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}: log" /> |
|
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}: log" /> | |
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> |
|
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> | |
8 | </head> |
|
8 | </head> | |
9 | <body> |
|
9 | <body> | |
10 |
|
10 | |||
11 | <div class="container"> |
|
11 | <div class="container"> | |
12 | <div class="menu"> |
|
12 | <div class="menu"> | |
13 | <div class="logo"> |
|
13 | <div class="logo"> | |
14 | <a href="{logourl}"> |
|
14 | <a href="{logourl}"> | |
15 | <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a> |
|
15 | <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a> | |
16 | </div> |
|
16 | </div> | |
17 | <ul> |
|
17 | <ul> | |
18 | <li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li> |
|
18 | <li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li> | |
19 | <li class="active">graph</li> |
|
19 | <li class="active">graph</li> | |
20 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> | |
21 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
|
21 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
22 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> |
|
22 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> | |
23 | </ul> |
|
23 | </ul> | |
24 | <ul> |
|
24 | <ul> | |
25 | <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li> |
|
25 | <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li> | |
26 | <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> |
|
26 | <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> | |
27 | </ul> |
|
27 | </ul> | |
28 | <ul> |
|
28 | <ul> | |
29 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> |
|
29 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> | |
30 | </ul> |
|
30 | </ul> | |
31 | <div class="atom-logo"> |
|
31 | <div class="atom-logo"> | |
32 | <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> |
|
32 | <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> | |
33 | <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" /> |
|
33 | <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" /> | |
34 | </a> |
|
34 | </a> | |
35 | </div> |
|
35 | </div> | |
36 | </div> |
|
36 | </div> | |
37 |
|
37 | |||
38 | <div class="main"> |
|
38 | <div class="main"> | |
39 | <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> |
|
39 | <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> | |
40 | <h3>graph</h3> |
|
40 | <h3>graph</h3> | |
41 |
|
41 | |||
42 | <form class="search" action="{url|urlescape}log"> |
|
42 | <form class="search" action="{url|urlescape}log"> | |
43 | {sessionvars%hiddenformentry} |
|
43 | {sessionvars%hiddenformentry} | |
44 | <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
44 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |
45 | <div id="hint">{searchhint}</div> |
|
45 | <div id="hint">{searchhint}</div> | |
46 | </form> |
|
46 | </form> | |
47 |
|
47 | |||
48 | <div class="navigate"> |
|
48 | <div class="navigate"> | |
49 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> |
|
49 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> | |
50 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> |
|
50 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> | |
51 | | rev {rev}: {changenav%navgraph} |
|
51 | | rev {rev}: {changenav%navgraph} | |
52 | </div> |
|
52 | </div> | |
53 |
|
53 | |||
54 | <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript> |
|
54 | <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript> | |
55 |
|
55 | |||
56 | <div id="wrapper"> |
|
56 | <div id="wrapper"> | |
57 | <ul id="nodebgs" class="stripes2"></ul> |
|
57 | <ul id="nodebgs" class="stripes2"></ul> | |
58 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> |
|
58 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> | |
59 | <ul id="graphnodes"></ul> |
|
59 | <ul id="graphnodes"></ul> | |
60 | </div> |
|
60 | </div> | |
61 |
|
61 | |||
62 | <script type="text/javascript"> |
|
62 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
63 | <!-- hide script content |
|
63 | <!-- hide script content | |
64 |
|
64 | |||
65 | var data = {jsdata|json}; |
|
65 | var data = {jsdata|json}; | |
66 | var graph = new Graph(); |
|
66 | var graph = new Graph(); | |
67 | graph.scale({bg_height}); |
|
67 | graph.scale({bg_height}); | |
68 |
|
68 | |||
69 | graph.vertex = function(x, y, color, parity, cur) \{ |
|
69 | graph.vertex = function(x, y, color, parity, cur) \{ | |
70 |
|
70 | |||
71 | this.ctx.beginPath(); |
|
71 | this.ctx.beginPath(); | |
72 | color = this.setColor(color, 0.25, 0.75); |
|
72 | color = this.setColor(color, 0.25, 0.75); | |
73 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); |
|
73 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); | |
74 | this.ctx.fill(); |
|
74 | this.ctx.fill(); | |
75 |
|
75 | |||
76 | var bg = '<li class="bg"></li>'; |
|
76 | var bg = '<li class="bg"></li>'; | |
77 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; |
|
77 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; | |
78 | var nstyle = 'padding-left: ' + left + 'px;'; |
|
78 | var nstyle = 'padding-left: ' + left + 'px;'; | |
79 |
|
79 | |||
80 | var tagspan = ''; |
|
80 | var tagspan = ''; | |
81 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ |
|
81 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ | |
82 | tagspan = '<span class="logtags">'; |
|
82 | tagspan = '<span class="logtags">'; | |
83 | if (cur[6][1]) \{ |
|
83 | if (cur[6][1]) \{ | |
84 | tagspan += '<span class="branchhead" title="' + cur[6][0] + '">'; |
|
84 | tagspan += '<span class="branchhead" title="' + cur[6][0] + '">'; | |
85 | tagspan += cur[6][0] + '</span> '; |
|
85 | tagspan += cur[6][0] + '</span> '; | |
86 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ |
|
86 | } else if (!cur[6][1] && cur[6][0] != 'default') \{ | |
87 | tagspan += '<span class="branchname" title="' + cur[6][0] + '">'; |
|
87 | tagspan += '<span class="branchname" title="' + cur[6][0] + '">'; | |
88 | tagspan += cur[6][0] + '</span> '; |
|
88 | tagspan += cur[6][0] + '</span> '; | |
89 | } |
|
89 | } | |
90 | if (cur[7].length) \{ |
|
90 | if (cur[7].length) \{ | |
91 | for (var t in cur[7]) \{ |
|
91 | for (var t in cur[7]) \{ | |
92 | var tag = cur[7][t]; |
|
92 | var tag = cur[7][t]; | |
93 | tagspan += '<span class="tag">' + tag + '</span> '; |
|
93 | tagspan += '<span class="tag">' + tag + '</span> '; | |
94 | } |
|
94 | } | |
95 | } |
|
95 | } | |
96 | if (cur[8].length) \{ |
|
96 | if (cur[8].length) \{ | |
97 | for (var b in cur[8]) \{ |
|
97 | for (var b in cur[8]) \{ | |
98 | var bookmark = cur[8][b]; |
|
98 | var bookmark = cur[8][b]; | |
99 | tagspan += '<span class="tag">' + bookmark + '</span> '; |
|
99 | tagspan += '<span class="tag">' + bookmark + '</span> '; | |
100 | } |
|
100 | } | |
101 | } |
|
101 | } | |
102 | tagspan += '</span>'; |
|
102 | tagspan += '</span>'; | |
103 | } |
|
103 | } | |
104 |
|
104 | |||
105 | var item = '<li style="' + nstyle + '"><span class="desc">'; |
|
105 | var item = '<li style="' + nstyle + '"><span class="desc">'; | |
106 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; |
|
106 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; | |
107 | item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; |
|
107 | item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; | |
108 |
|
108 | |||
109 | return [bg, item]; |
|
109 | return [bg, item]; | |
110 |
|
110 | |||
111 | } |
|
111 | } | |
112 |
|
112 | |||
113 | graph.render(data); |
|
113 | graph.render(data); | |
114 |
|
114 | |||
115 | // stop hiding script --> |
|
115 | // stop hiding script --> | |
116 | </script> |
|
116 | </script> | |
117 |
|
117 | |||
118 | <div class="navigate"> |
|
118 | <div class="navigate"> | |
119 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> |
|
119 | <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> | |
120 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> |
|
120 | <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> | |
121 | | rev {rev}: {changenav%navgraph} |
|
121 | | rev {rev}: {changenav%navgraph} | |
122 | </div> |
|
122 | </div> | |
123 |
|
123 | |||
124 | <script type="text/javascript"> |
|
124 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
125 | ajaxScrollInit( |
|
125 | ajaxScrollInit( | |
126 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', |
|
126 | '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', | |
127 | {revcount}+60, |
|
127 | {revcount}+60, | |
128 | function (htmlText, previousVal) \{ return previousVal + 60; }, |
|
128 | function (htmlText, previousVal) \{ return previousVal + 60; }, | |
129 | '#wrapper', |
|
129 | '#wrapper', | |
130 | '<div class="%class%" style="text-align: center;">%text%</div>', |
|
130 | '<div class="%class%" style="text-align: center;">%text%</div>', | |
131 | 'graph' |
|
131 | 'graph' | |
132 | ); |
|
132 | ); | |
133 | </script> |
|
133 | </script> | |
134 |
|
134 | |||
135 | </div> |
|
135 | </div> | |
136 | </div> |
|
136 | </div> | |
137 |
|
137 | |||
138 | {footer} |
|
138 | {footer} |
@@ -1,93 +1,93 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: log</title> |
|
2 | <title>{repo|escape}: log</title> | |
3 | <link rel="alternate" type="application/atom+xml" |
|
3 | <link rel="alternate" type="application/atom+xml" | |
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}" /> |
|
4 | href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}" /> | |
5 | <link rel="alternate" type="application/rss+xml" |
|
5 | <link rel="alternate" type="application/rss+xml" | |
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}" /> |
|
6 | href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}" /> | |
7 | </head> |
|
7 | </head> | |
8 | <body> |
|
8 | <body> | |
9 |
|
9 | |||
10 | <div class="container"> |
|
10 | <div class="container"> | |
11 | <div class="menu"> |
|
11 | <div class="menu"> | |
12 | <div class="logo"> |
|
12 | <div class="logo"> | |
13 | <a href="{logourl}"> |
|
13 | <a href="{logourl}"> | |
14 | <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a> |
|
14 | <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a> | |
15 | </div> |
|
15 | </div> | |
16 | <ul> |
|
16 | <ul> | |
17 | <li class="active">log</li> |
|
17 | <li class="active">log</li> | |
18 | <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li> |
|
18 | <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li> | |
19 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
|
19 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> | |
20 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
|
20 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
21 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> | |
22 | </ul> |
|
22 | </ul> | |
23 | <ul> |
|
23 | <ul> | |
24 | <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li> |
|
24 | <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li> | |
25 | <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> |
|
25 | <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> | |
26 | </ul> |
|
26 | </ul> | |
27 | <ul> |
|
27 | <ul> | |
28 | {archives%archiveentry} |
|
28 | {archives%archiveentry} | |
29 | </ul> |
|
29 | </ul> | |
30 | <ul> |
|
30 | <ul> | |
31 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> |
|
31 | <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> | |
32 | </ul> |
|
32 | </ul> | |
33 | <div class="atom-logo"> |
|
33 | <div class="atom-logo"> | |
34 | <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> |
|
34 | <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> | |
35 | <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" /> |
|
35 | <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" /> | |
36 | </a> |
|
36 | </a> | |
37 | </div> |
|
37 | </div> | |
38 | </div> |
|
38 | </div> | |
39 |
|
39 | |||
40 | <div class="main"> |
|
40 | <div class="main"> | |
41 | <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> |
|
41 | <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> | |
42 | <h3>log</h3> |
|
42 | <h3>log</h3> | |
43 |
|
43 | |||
44 | <form class="search" action="{url|urlescape}log"> |
|
44 | <form class="search" action="{url|urlescape}log"> | |
45 | {sessionvars%hiddenformentry} |
|
45 | {sessionvars%hiddenformentry} | |
46 | <p><input name="rev" id="search1" type="text" size="30" value="{query|escape}" /></p> |
|
46 | <p><input name="rev" id="search1" type="text" size="30" value="{query|escape}" /></p> | |
47 | <div id="hint">{searchhint}</div> |
|
47 | <div id="hint">{searchhint}</div> | |
48 | </form> |
|
48 | </form> | |
49 |
|
49 | |||
50 | <div class="navigate"> |
|
50 | <div class="navigate"> | |
51 | <a href="{url|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a> |
|
51 | <a href="{url|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a> | |
52 | <a href="{url|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a> |
|
52 | <a href="{url|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a> | |
53 | | rev {rev}: {changenav%navshort} |
|
53 | | rev {rev}: {changenav%navshort} | |
54 | </div> |
|
54 | </div> | |
55 |
|
55 | |||
56 | <table class="bigtable"> |
|
56 | <table class="bigtable"> | |
57 | <thead> |
|
57 | <thead> | |
58 | <tr> |
|
58 | <tr> | |
59 | <th class="age">age</th> |
|
59 | <th class="age">age</th> | |
60 | <th class="author">author</th> |
|
60 | <th class="author">author</th> | |
61 | <th class="description">description</th> |
|
61 | <th class="description">description</th> | |
62 | </tr> |
|
62 | </tr> | |
63 | </thead> |
|
63 | </thead> | |
64 | <tbody class="stripes2"> |
|
64 | <tbody class="stripes2"> | |
65 | {entries%shortlogentry} |
|
65 | {entries%shortlogentry} | |
66 | </tbody> |
|
66 | </tbody> | |
67 | </table> |
|
67 | </table> | |
68 |
|
68 | |||
69 | <div class="navigate"> |
|
69 | <div class="navigate"> | |
70 | <a href="{url|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a> |
|
70 | <a href="{url|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a> | |
71 | <a href="{url|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a> |
|
71 | <a href="{url|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a> | |
72 | | rev {rev}: {changenav%navshort} |
|
72 | | rev {rev}: {changenav%navshort} | |
73 | </div> |
|
73 | </div> | |
74 |
|
74 | |||
75 | <script type="text/javascript"> |
|
75 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
76 | ajaxScrollInit( |
|
76 | ajaxScrollInit( | |
77 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', |
|
77 | '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}', | |
78 | '{nextentry%"{node}"}', <!-- NEXTHASH |
|
78 | '{nextentry%"{node}"}', <!-- NEXTHASH | |
79 | function (htmlText, previousVal) \{ |
|
79 | function (htmlText, previousVal) \{ | |
80 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); |
|
80 | var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/); | |
81 | return m ? m[1] : null; |
|
81 | return m ? m[1] : null; | |
82 | }, |
|
82 | }, | |
83 | '.bigtable > tbody', |
|
83 | '.bigtable > tbody', | |
84 | '<tr class="%class%">\\ |
|
84 | '<tr class="%class%">\\ | |
85 | <td colspan="3" style="text-align: center;">%text%</td>\\ |
|
85 | <td colspan="3" style="text-align: center;">%text%</td>\\ | |
86 | </tr>' |
|
86 | </tr>' | |
87 | ); |
|
87 | ); | |
88 | </script> |
|
88 | </script> | |
89 |
|
89 | |||
90 | </div> |
|
90 | </div> | |
91 | </div> |
|
91 | </div> | |
92 |
|
92 | |||
93 | {footer} |
|
93 | {footer} |
@@ -1,78 +1,78 b'' | |||||
1 | {header} |
|
1 | {header} | |
2 | <title>{repo|escape}: graph</title> |
|
2 | <title>{repo|escape}: graph</title> | |
3 | <link rel="alternate" type="application/atom+xml" |
|
3 | <link rel="alternate" type="application/atom+xml" | |
4 | href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags"> |
|
4 | href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags"> | |
5 | <link rel="alternate" type="application/rss+xml" |
|
5 | <link rel="alternate" type="application/rss+xml" | |
6 | href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags"> |
|
6 | href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags"> | |
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> |
|
7 | <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]--> | |
8 | </head> |
|
8 | </head> | |
9 | <body> |
|
9 | <body> | |
10 |
|
10 | |||
11 | <div class="buttons"> |
|
11 | <div class="buttons"> | |
12 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> |
|
12 | <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | |
13 | <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> |
|
13 | <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> | |
14 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
|
14 | <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | |
15 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
|
15 | <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | |
16 | <a href="{url|urlescape}file/{symrev}/{sessionvars%urlparameter}">files</a> |
|
16 | <a href="{url|urlescape}file/{symrev}/{sessionvars%urlparameter}">files</a> | |
17 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
|
17 | <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> | |
18 | </div> |
|
18 | </div> | |
19 |
|
19 | |||
20 | <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h2> |
|
20 | <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h2> | |
21 |
|
21 | |||
22 | <form action="{url|urlescape}log"> |
|
22 | <form action="{url|urlescape}log"> | |
23 | {sessionvars%hiddenformentry} |
|
23 | {sessionvars%hiddenformentry} | |
24 | <p> |
|
24 | <p> | |
25 | <label for="search1">search:</label> |
|
25 | <label for="search1">search:</label> | |
26 | <input name="rev" id="search1" type="text" size="30"> |
|
26 | <input name="rev" id="search1" type="text" size="30"> | |
27 | navigate: <small class="navigate">{changenav%navgraph}</small> |
|
27 | navigate: <small class="navigate">{changenav%navgraph}</small> | |
28 | </p> |
|
28 | </p> | |
29 | </form> |
|
29 | </form> | |
30 |
|
30 | |||
31 | <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> |
|
31 | <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> | |
32 |
|
32 | |||
33 | <div id="wrapper"> |
|
33 | <div id="wrapper"> | |
34 | <ul id="nodebgs"></ul> |
|
34 | <ul id="nodebgs"></ul> | |
35 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> |
|
35 | <canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas> | |
36 | <ul id="graphnodes"></ul> |
|
36 | <ul id="graphnodes"></ul> | |
37 | </div> |
|
37 | </div> | |
38 |
|
38 | |||
39 | <script type="text/javascript"> |
|
39 | <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> | |
40 | <!-- hide script content |
|
40 | <!-- hide script content | |
41 |
|
41 | |||
42 | var data = {jsdata|json}; |
|
42 | var data = {jsdata|json}; | |
43 | var graph = new Graph(); |
|
43 | var graph = new Graph(); | |
44 | graph.scale({bg_height}); |
|
44 | graph.scale({bg_height}); | |
45 |
|
45 | |||
46 | graph.vertex = function(x, y, color, parity, cur) \{ |
|
46 | graph.vertex = function(x, y, color, parity, cur) \{ | |
47 |
|
47 | |||
48 | this.ctx.beginPath(); |
|
48 | this.ctx.beginPath(); | |
49 | color = this.setColor(color, 0.25, 0.75); |
|
49 | color = this.setColor(color, 0.25, 0.75); | |
50 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); |
|
50 | this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); | |
51 | this.ctx.fill(); |
|
51 | this.ctx.fill(); | |
52 |
|
52 | |||
53 | var bg = '<li class="bg parity' + parity + '"></li>'; |
|
53 | var bg = '<li class="bg parity' + parity + '"></li>'; | |
54 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; |
|
54 | var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; | |
55 | var nstyle = 'padding-left: ' + left + 'px;'; |
|
55 | var nstyle = 'padding-left: ' + left + 'px;'; | |
56 | var item = '<li style="' + nstyle + '"><span class="desc">'; |
|
56 | var item = '<li style="' + nstyle + '"><span class="desc">'; | |
57 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; |
|
57 | item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; | |
58 | item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; |
|
58 | item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; | |
59 |
|
59 | |||
60 | return [bg, item]; |
|
60 | return [bg, item]; | |
61 |
|
61 | |||
62 | } |
|
62 | } | |
63 |
|
63 | |||
64 | graph.render(data); |
|
64 | graph.render(data); | |
65 |
|
65 | |||
66 | // stop hiding script --> |
|
66 | // stop hiding script --> | |
67 | </script> |
|
67 | </script> | |
68 |
|
68 | |||
69 | <form action="{url|urlescape}log"> |
|
69 | <form action="{url|urlescape}log"> | |
70 | {sessionvars%hiddenformentry} |
|
70 | {sessionvars%hiddenformentry} | |
71 | <p> |
|
71 | <p> | |
72 | <label for="search1">search:</label> |
|
72 | <label for="search1">search:</label> | |
73 | <input name="rev" id="search1" type="text" size="30"> |
|
73 | <input name="rev" id="search1" type="text" size="30"> | |
74 | navigate: <small class="navigate">{changenav%navgraph}</small> |
|
74 | navigate: <small class="navigate">{changenav%navgraph}</small> | |
75 | </p> |
|
75 | </p> | |
76 | </form> |
|
76 | </form> | |
77 |
|
77 | |||
78 | {footer} |
|
78 | {footer} |
General Comments 0
You need to be logged in to leave comments.
Login now