34 + need to be copied elsewhere to be of use. |
34 + need to be copied elsewhere to be of use. |
35 + |
35 + |
36 Some commands (e.g. revert) produce backup files ending in ``.orig``, |
36 Some commands (e.g. revert) produce backup files ending in ``.orig``, |
37 if the ``.orig`` file already exists and is not tracked by Mercurial, |
37 if the ``.orig`` file already exists and is not tracked by Mercurial, |
38 it will be overwritten. |
38 it will be overwritten. |
39 --- mercurial-3.4/mercurial/help/config.txt Fri May 1 14:48:51 2015 |
39 --- a/mercurial/help/config.txt |
40 +++ mercurial-3.4/mercurial/help/config.txt Mon May 4 14:54:54 2015 |
40 +++ b/mercurial/help/config.txt |
41 @@ -18,8 +18,7 @@ |
41 @@ -36,10 +36,6 @@ Local configuration is put into the per- |
42 Mercurial reads configuration data from several files, if they exist. |
42 |
43 These files do not exist by default and you will have to create the |
43 Global configuration like the username setting is typically put into: |
44 appropriate configuration files yourself: global configuration like |
44 |
45 -the username setting is typically put into |
45 -.. container:: windows |
46 -``%USERPROFILE%\mercurial.ini`` or ``$HOME/.hgrc`` and local |
46 - |
47 +the username setting is typically put into ``$HOME/.hgrc`` and local |
47 - - ``%USERPROFILE%\mercurial.ini`` (on Windows) |
48 configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
48 - |
49 |
49 .. container:: unix.plan9 |
50 The names of these files depend on the system on which Mercurial is |
50 |
51 @@ -30,7 +29,7 @@ |
51 - ``$HOME/.hgrc`` (on Unix, Plan9) |
|
52 @@ -52,7 +48,7 @@ ones. |
52 |
53 |
53 .. container:: verbose.unix |
54 .. container:: verbose.unix |
54 |
55 |
55 - On Unix, the following files are consulted: |
56 - On Unix, the following files are consulted: |
56 + The following files are consulted: |
57 + The following files are consulted: |
57 |
58 |
58 - ``<repo>/.hg/hgrc`` (per-repository) |
59 - ``<repo>/.hg/hgrc`` (per-repository) |
59 - ``$HOME/.hgrc`` (per-user) |
60 - ``$HOME/.hgrc`` (per-user) |
60 @@ -40,47 +39,16 @@ |
61 @@ -62,41 +58,6 @@ ones. |
61 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
62 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
62 - ``<internal>/default.d/*.rc`` (defaults) |
63 - ``<internal>/default.d/*.rc`` (defaults) |
63 |
64 |
64 -.. container:: verbose.windows |
65 -.. container:: verbose.windows |
65 - |
66 - |
68 - - ``<repo>/.hg/hgrc`` (per-repository) |
69 - - ``<repo>/.hg/hgrc`` (per-repository) |
69 - - ``%USERPROFILE%\.hgrc`` (per-user) |
70 - - ``%USERPROFILE%\.hgrc`` (per-user) |
70 - - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
71 - - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
71 - - ``%HOME%\.hgrc`` (per-user) |
72 - - ``%HOME%\.hgrc`` (per-user) |
72 - - ``%HOME%\Mercurial.ini`` (per-user) |
73 - - ``%HOME%\Mercurial.ini`` (per-user) |
|
74 - - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
75 - - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
73 - - ``<install-dir>\Mercurial.ini`` (per-installation) |
76 - - ``<install-dir>\Mercurial.ini`` (per-installation) |
74 - - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
|
75 - - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
76 - - ``<internal>/default.d/*.rc`` (defaults) |
77 - - ``<internal>/default.d/*.rc`` (defaults) |
77 - |
78 - |
78 - .. note:: |
79 - .. note:: |
79 - |
80 - |
80 - The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
81 - The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
81 - is used when running 32-bit Python on 64-bit Windows. |
82 - is used when running 32-bit Python on 64-bit Windows. |
|
83 - |
|
84 -.. container:: windows |
|
85 - |
|
86 - On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. |
82 - |
87 - |
83 -.. container:: verbose.plan9 |
88 -.. container:: verbose.plan9 |
84 - |
89 - |
85 - On Plan9, the following files are consulted: |
90 - On Plan9, the following files are consulted: |
86 - |
91 - |
93 - - ``<internal>/default.d/*.rc`` (defaults) |
98 - - ``<internal>/default.d/*.rc`` (defaults) |
94 - |
99 - |
95 Per-repository configuration options only apply in a |
100 Per-repository configuration options only apply in a |
96 particular repository. This file is not version-controlled, and |
101 particular repository. This file is not version-controlled, and |
97 will not get transferred during a "clone" operation. Options in |
102 will not get transferred during a "clone" operation. Options in |
98 -this file override options in all other configuration files. On |
103 @@ -104,7 +65,7 @@ this file override options in all other |
99 -Plan 9 and Unix, most of this file will be ignored if it doesn't |
104 |
100 +this file override options in all other configuration files. |
105 .. container:: unix.plan9 |
101 +Most of this file will be ignored if it doesn't |
106 |
102 belong to a trusted user or to a trusted group. See the documentation |
107 - On Plan 9 and Unix, most of this file will be ignored if it doesn't |
103 for the ``[trusted]`` section below for more details. |
108 + On Unix, most of this file will be ignored if it doesn't |
104 |
109 belong to a trusted user or to a trusted group. See |
105 -Per-user configuration file(s) are for the user running Mercurial. On |
110 :hg:`help config.trusted` for more details. |
106 -Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
111 |
107 +Per-user configuration file(s) are for the user running Mercurial. |
112 @@ -126,10 +87,8 @@ parent directory of the **hg** executabl |
108 +Options in these |
|
109 files apply to all Mercurial commands executed by this user in any |
|
110 directory. Options in these files override per-system and per-installation |
|
111 options. |
|
112 @@ -94,10 +62,8 @@ |
|
113 |
113 |
114 Per-installation configuration files are for the system on |
114 Per-installation configuration files are for the system on |
115 which Mercurial is running. Options in these files apply to all |
115 which Mercurial is running. Options in these files apply to all |
116 -Mercurial commands executed by any user in any directory. Registry |
116 -Mercurial commands executed by any user in any directory. Registry |
117 -keys contain PATH-like strings, every part of which must reference |
117 -keys contain PATH-like strings, every part of which must reference |
120 +Mercurial commands executed by any user in any directory. |
120 +Mercurial commands executed by any user in any directory. |
121 +Mercurial checks each of these locations in the specified |
121 +Mercurial checks each of these locations in the specified |
122 order until one or more configuration files are detected. |
122 order until one or more configuration files are detected. |
123 |
123 |
124 Per-system configuration files are for the system on which Mercurial |
124 Per-system configuration files are for the system on which Mercurial |
125 @@ -500,12 +466,6 @@ |
125 @@ -535,14 +494,6 @@ filtered by the command. The string ``OU |
126 of an empty temporary file, where the filtered data must be written by |
126 of an empty temporary file, where the filtered data must be written by |
127 the command. |
127 the command. |
128 |
128 |
129 -.. note:: |
129 -.. container:: windows |
130 - |
130 - |
131 - The tempfile mechanism is recommended for Windows systems, |
131 - .. note:: |
132 - where the standard shell I/O redirection operators often have |
132 - |
133 - strange effects and may corrupt the contents of your files. |
133 - The tempfile mechanism is recommended for Windows systems, |
|
134 - where the standard shell I/O redirection operators often have |
|
135 - strange effects and may corrupt the contents of your files. |
134 - |
136 - |
135 This filter mechanism is used internally by the ``eol`` extension to |
137 This filter mechanism is used internally by the ``eol`` extension to |
136 translate line ending characters between Windows (CRLF) and Unix (LF) |
138 translate line ending characters between Windows (CRLF) and Unix (LF) |
137 format. We suggest you use the ``eol`` extension for convenience. |
139 format. We suggest you use the ``eol`` extension for convenience. |
138 @@ -891,13 +851,6 @@ |
140 @@ -941,13 +892,6 @@ variables it is passed are listed with n |
139 Also, hooks like "commit" will be called in all contexts that |
141 Also, hooks like "commit" will be called in all contexts that |
140 generate a commit (e.g. tag) and not just the commit command. |
142 generate a commit (e.g. tag) and not just the commit command. |
141 |
143 |
142 -.. note:: |
144 -.. note:: |
143 - |
145 - |
147 - changesets, while it will not be available at all under Windows. |
149 - changesets, while it will not be available at all under Windows. |
148 - |
150 - |
149 The syntax for Python hooks is as follows:: |
151 The syntax for Python hooks is as follows:: |
150 |
152 |
151 hookname = python:modulename.submodule.callable |
153 hookname = python:modulename.submodule.callable |
152 @@ -993,7 +946,6 @@ |
154 @@ -1046,7 +990,6 @@ Example ``~/.hgrc``:: |
153 |
155 |
154 # Define new tool |
156 # Define new tool |
155 myHtmlTool.args = -m $local $other $base $output |
157 myHtmlTool.args = -m $local $other $base $output |
156 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
158 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
157 myHtmlTool.priority = 1 |
159 myHtmlTool.priority = 1 |
158 |
160 |
159 Supported arguments: |
161 Supported arguments: |
160 @@ -1003,9 +955,7 @@ |
162 @@ -1058,11 +1001,6 @@ Supported arguments: |
161 Default: 0. |
|
162 |
|
163 ``executable`` |
163 ``executable`` |
164 - Either just the name of the executable or its pathname. On Windows, |
164 Either just the name of the executable or its pathname. |
165 - the path can use environment variables with ${ProgramFiles} syntax. |
165 |
166 - Default: the tool name. |
166 - .. container:: windows |
167 + Either just the name of the executable or its pathname. Default: the tool name. |
167 - |
|
168 - On Windows, the path can use environment variables with ${ProgramFiles} |
|
169 - syntax. |
|
170 - |
|
171 (default: the tool name) |
168 |
172 |
169 ``args`` |
173 ``args`` |
170 The arguments to pass to the tool executable. You can refer to the |
174 @@ -1110,30 +1048,6 @@ Supported arguments: |
171 @@ -1053,29 +1003,6 @@ |
|
172 ``gui`` |
175 ``gui`` |
173 This tool requires a graphical interface to run. Default: False |
176 This tool requires a graphical interface to run. (default: False) |
174 |
177 |
175 -``regkey`` |
178 -.. container:: windows |
176 - Windows registry key which describes install location of this |
179 - |
177 - tool. Mercurial will search for this key first under |
180 - ``regkey`` |
178 - ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
181 - Windows registry key which describes install location of this |
179 - Default: None |
182 - tool. Mercurial will search for this key first under |
180 - |
183 - ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
181 -``regkeyalt`` |
184 - (default: None) |
182 - An alternate Windows registry key to try if the first key is not |
185 - |
183 - found. The alternate key uses the same ``regname`` and ``regappend`` |
186 - ``regkeyalt`` |
184 - semantics of the primary key. The most common use for this key |
187 - An alternate Windows registry key to try if the first key is not |
185 - is to search for 32bit applications on 64bit operating systems. |
188 - found. The alternate key uses the same ``regname`` and ``regappend`` |
186 - Default: None |
189 - semantics of the primary key. The most common use for this key |
187 - |
190 - is to search for 32bit applications on 64bit operating systems. |
188 -``regname`` |
191 - (default: None) |
189 - Name of value to read from specified registry key. Defaults to the |
192 - |
190 - unnamed (default) value. |
193 - ``regname`` |
191 - |
194 - Name of value to read from specified registry key. |
192 -``regappend`` |
195 - (default: the unnamed (default) value) |
193 - String to append to the value read from the registry, typically |
196 - |
194 - the executable name of the tool. |
197 - ``regappend`` |
195 - Default: None |
198 - String to append to the value read from the registry, typically |
196 - |
199 - the executable name of the tool. |
197 - |
200 - (default: None) |
|
201 - |
|
202 |
198 ``patch`` |
203 ``patch`` |
199 --------- |
204 --------- |
200 |
205 @@ -1658,10 +1572,6 @@ User interface controls. |
|
206 ``false`` |
|
207 Alias for ``ignore``. |
|
208 |
|
209 - .. container:: windows |
|
210 - |
|
211 - On Windows, this configuration option is ignored and the command aborted. |
|
212 - |
|
213 ``quiet`` |
|
214 Reduce the amount of output printed. |
|
215 (default: False) |