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.2.3/mercurial/help/config.txt Thu Dec 18 12:59:22 2014 |
39 --- mercurial-3.4/mercurial/help/config.txt Fri May 1 14:48:51 2015 |
40 +++ mercurial-3.2.3/mercurial/help/config.txt Thu Dec 18 18:19:37 2014 |
40 +++ mercurial-3.4/mercurial/help/config.txt Mon May 4 14:54:54 2015 |
41 @@ -18,8 +18,7 @@ |
41 @@ -18,8 +18,7 @@ |
42 Mercurial reads configuration data from several files, if they exist. |
42 Mercurial reads configuration data from several files, if they exist. |
43 These files do not exist by default and you will have to create the |
43 These files do not exist by default and you will have to create the |
44 appropriate configuration files yourself: global configuration like |
44 appropriate configuration files yourself: global configuration like |
45 -the username setting is typically put into |
45 -the username setting is typically put into |
55 - On Unix, the following files are consulted: |
55 - On Unix, the following files are consulted: |
56 + The following files are consulted: |
56 + The following files are consulted: |
57 |
57 |
58 - ``<repo>/.hg/hgrc`` (per-repository) |
58 - ``<repo>/.hg/hgrc`` (per-repository) |
59 - ``$HOME/.hgrc`` (per-user) |
59 - ``$HOME/.hgrc`` (per-user) |
60 @@ -39,49 +38,19 @@ |
60 @@ -40,47 +39,16 @@ |
61 - ``/etc/mercurial/hgrc`` (per-system) |
|
62 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
61 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
|
62 - ``<internal>/default.d/*.rc`` (defaults) |
63 |
63 |
64 -.. container:: verbose.windows |
64 -.. container:: verbose.windows |
65 +Per-repository configuration options only apply in a particular |
65 - |
66 +repository. This file is not version-controlled, and will not get |
|
67 +transferred during a "clone" operation. Options in this file override |
|
68 +options in all other configuration files. Most of this file will be |
|
69 +ignored if it doesn't belong to a trusted user or to a trusted group. |
|
70 +See the documentation for the ``[trusted]`` section below for more |
|
71 +details. |
|
72 |
|
73 - On Windows, the following files are consulted: |
66 - On Windows, the following files are consulted: |
74 +Per-user configuration file(s) are for the user running Mercurial. |
67 - |
75 +Options in these files apply to all Mercurial commands executed by |
|
76 +this user in any directory. Options in these files override per-system |
|
77 +and per-installation options. |
|
78 |
|
79 - - ``<repo>/.hg/hgrc`` (per-repository) |
68 - - ``<repo>/.hg/hgrc`` (per-repository) |
80 - - ``%USERPROFILE%\.hgrc`` (per-user) |
69 - - ``%USERPROFILE%\.hgrc`` (per-user) |
81 - - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
70 - - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
82 - - ``%HOME%\.hgrc`` (per-user) |
71 - - ``%HOME%\.hgrc`` (per-user) |
83 - - ``%HOME%\Mercurial.ini`` (per-user) |
72 - - ``%HOME%\Mercurial.ini`` (per-user) |
84 - - ``<install-dir>\Mercurial.ini`` (per-installation) |
73 - - ``<install-dir>\Mercurial.ini`` (per-installation) |
85 - - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
74 - - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
86 - - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
75 - - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
76 - - ``<internal>/default.d/*.rc`` (defaults) |
87 - |
77 - |
88 - .. note:: |
78 - .. note:: |
89 - |
79 - |
90 - The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
80 - The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
91 - is used when running 32-bit Python on 64-bit Windows. |
81 - is used when running 32-bit Python on 64-bit Windows. |
98 - - ``$home/lib/hgrc`` (per-user) |
88 - - ``$home/lib/hgrc`` (per-user) |
99 - - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
89 - - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
100 - - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
90 - - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
101 - - ``/lib/mercurial/hgrc`` (per-system) |
91 - - ``/lib/mercurial/hgrc`` (per-system) |
102 - - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
92 - - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
103 - |
93 - - ``<internal>/default.d/*.rc`` (defaults) |
104 -Per-repository configuration options only apply in a |
94 - |
105 -particular repository. This file is not version-controlled, and |
95 Per-repository configuration options only apply in a |
106 -will not get transferred during a "clone" operation. Options in |
96 particular repository. This file is not version-controlled, and |
|
97 will not get transferred during a "clone" operation. Options in |
107 -this file override options in all other configuration files. On |
98 -this file override options in all other configuration files. On |
108 -Plan 9 and Unix, most of this file will be ignored if it doesn't |
99 -Plan 9 and Unix, most of this file will be ignored if it doesn't |
109 -belong to a trusted user or to a trusted group. See the documentation |
100 +this file override options in all other configuration files. |
110 -for the ``[trusted]`` section below for more details. |
101 +Most of this file will be ignored if it doesn't |
111 - |
102 belong to a trusted user or to a trusted group. See the documentation |
|
103 for the ``[trusted]`` section below for more details. |
|
104 |
112 -Per-user configuration file(s) are for the user running Mercurial. On |
105 -Per-user configuration file(s) are for the user running Mercurial. On |
113 -Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
106 -Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
114 -files apply to all Mercurial commands executed by this user in any |
107 +Per-user configuration file(s) are for the user running Mercurial. |
115 -directory. Options in these files override per-system and per-installation |
108 +Options in these |
116 -options. |
109 files apply to all Mercurial commands executed by this user in any |
117 - |
110 directory. Options in these files override per-system and per-installation |
118 Per-installation configuration files are searched for in the |
111 options. |
119 directory where Mercurial is installed. ``<install-root>`` is the |
112 @@ -94,10 +62,8 @@ |
120 parent directory of the **hg** executable (or symlink) being run. For |
113 |
121 @@ -490,12 +459,6 @@ |
114 Per-installation configuration files are for the system on |
|
115 which Mercurial is running. Options in these files apply to all |
|
116 -Mercurial commands executed by any user in any directory. Registry |
|
117 -keys contain PATH-like strings, every part of which must reference |
|
118 -a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will |
|
119 -be read. Mercurial checks each of these locations in the specified |
|
120 +Mercurial commands executed by any user in any directory. |
|
121 +Mercurial checks each of these locations in the specified |
|
122 order until one or more configuration files are detected. |
|
123 |
|
124 Per-system configuration files are for the system on which Mercurial |
|
125 @@ -500,12 +466,6 @@ |
122 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 |
123 the command. |
127 the command. |
124 |
128 |
125 -.. note:: |
129 -.. note:: |
126 - |
130 - |
129 - strange effects and may corrupt the contents of your files. |
133 - strange effects and may corrupt the contents of your files. |
130 - |
134 - |
131 This filter mechanism is used internally by the ``eol`` extension to |
135 This filter mechanism is used internally by the ``eol`` extension to |
132 translate line ending characters between Windows (CRLF) and Unix (LF) |
136 translate line ending characters between Windows (CRLF) and Unix (LF) |
133 format. We suggest you use the ``eol`` extension for convenience. |
137 format. We suggest you use the ``eol`` extension for convenience. |
134 @@ -849,13 +812,6 @@ |
138 @@ -891,13 +851,6 @@ |
135 Also, hooks like "commit" will be called in all contexts that |
139 Also, hooks like "commit" will be called in all contexts that |
136 generate a commit (e.g. tag) and not just the commit command. |
140 generate a commit (e.g. tag) and not just the commit command. |
137 |
141 |
138 -.. note:: |
142 -.. note:: |
139 - |
143 - |
143 - changesets, while it will not be available at all under Windows. |
147 - changesets, while it will not be available at all under Windows. |
144 - |
148 - |
145 The syntax for Python hooks is as follows:: |
149 The syntax for Python hooks is as follows:: |
146 |
150 |
147 hookname = python:modulename.submodule.callable |
151 hookname = python:modulename.submodule.callable |
148 @@ -951,7 +907,6 @@ |
152 @@ -993,7 +946,6 @@ |
149 |
153 |
150 # Define new tool |
154 # Define new tool |
151 myHtmlTool.args = -m $local $other $base $output |
155 myHtmlTool.args = -m $local $other $base $output |
152 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
156 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
153 myHtmlTool.priority = 1 |
157 myHtmlTool.priority = 1 |
154 |
158 |
155 Supported arguments: |
159 Supported arguments: |
156 @@ -961,9 +916,7 @@ |
160 @@ -1003,9 +955,7 @@ |
157 Default: 0. |
161 Default: 0. |
158 |
162 |
159 ``executable`` |
163 ``executable`` |
160 - Either just the name of the executable or its pathname. On Windows, |
164 - Either just the name of the executable or its pathname. On Windows, |
161 - the path can use environment variables with ${ProgramFiles} syntax. |
165 - the path can use environment variables with ${ProgramFiles} syntax. |
162 - Default: the tool name. |
166 - Default: the tool name. |
163 + Either just the name of the executable or its pathname. Default: the tool name. |
167 + Either just the name of the executable or its pathname. Default: the tool name. |
164 |
168 |
165 ``args`` |
169 ``args`` |
166 The arguments to pass to the tool executable. You can refer to the |
170 The arguments to pass to the tool executable. You can refer to the |
167 @@ -1011,29 +964,6 @@ |
171 @@ -1053,29 +1003,6 @@ |
168 ``gui`` |
172 ``gui`` |
169 This tool requires a graphical interface to run. Default: False |
173 This tool requires a graphical interface to run. Default: False |
170 |
174 |
171 -``regkey`` |
175 -``regkey`` |
172 - Windows registry key which describes install location of this |
176 - Windows registry key which describes install location of this |