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-2.7/mercurial/help/config.txt.orig Thu Aug 1 20:37:39 2013 |
39 --- mercurial-3.2.3/mercurial/help/config.txt Thu Dec 18 12:59:22 2014 |
40 +++ mercurial-2.7/mercurial/help/config.txt Mon Aug 19 16:28:22 2013 |
40 +++ mercurial-3.2.3/mercurial/help/config.txt Thu Dec 18 18:19:37 2014 |
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 |
46 -``%USERPROFILE%\mercurial.ini`` or ``$HOME/.hgrc`` and local |
46 -``%USERPROFILE%\mercurial.ini`` or ``$HOME/.hgrc`` and local |
47 +the username setting is typically put into ``$HOME/.hgrc`` and local |
47 +the username setting is typically put into ``$HOME/.hgrc`` and local |
48 configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
48 configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
49 |
49 |
50 The names of these files depend on the system on which Mercurial is |
50 The names of these files depend on the system on which Mercurial is |
51 @@ -28,33 +27,25 @@ |
51 @@ -30,7 +29,7 @@ |
52 paths are given below, settings from earlier paths override later |
|
53 ones. |
|
54 |
52 |
55 -| (All) ``<repo>/.hg/hgrc`` |
53 .. container:: verbose.unix |
56 +| ``<repo>/.hg/hgrc`` |
|
57 |
54 |
58 Per-repository configuration options that only apply in a |
55 - On Unix, the following files are consulted: |
59 particular repository. This file is not version-controlled, and |
56 + The following files are consulted: |
60 will not get transferred during a "clone" operation. Options in |
|
61 - this file override options in all other configuration files. On |
|
62 - Plan 9 and Unix, most of this file will be ignored if it doesn't |
|
63 + this file override options in all other configuration files. |
|
64 + Most of this file will be ignored if it doesn't |
|
65 belong to a trusted user or to a trusted group. See the documentation |
|
66 for the ``[trusted]`` section below for more details. |
|
67 |
57 |
68 -| (Plan 9) ``$home/lib/hgrc`` |
58 - ``<repo>/.hg/hgrc`` (per-repository) |
69 -| (Unix) ``$HOME/.hgrc`` |
59 - ``$HOME/.hgrc`` (per-user) |
70 -| (Windows) ``%USERPROFILE%\.hgrc`` |
60 @@ -39,49 +38,19 @@ |
71 -| (Windows) ``%USERPROFILE%\Mercurial.ini`` |
61 - ``/etc/mercurial/hgrc`` (per-system) |
72 -| (Windows) ``%HOME%\.hgrc`` |
62 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
73 -| (Windows) ``%HOME%\Mercurial.ini`` |
|
74 +| ``$HOME/.hgrc`` |
|
75 |
63 |
76 - Per-user configuration file(s), for the user running Mercurial. On |
64 -.. container:: verbose.windows |
77 - Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
65 +Per-repository configuration options only apply in a particular |
78 - files apply to all Mercurial commands executed by this user in any |
66 +repository. This file is not version-controlled, and will not get |
79 - directory. Options in these files override per-system and per-installation |
67 +transferred during a "clone" operation. Options in this file override |
80 + Per-user configuration file, for the user running Mercurial. Options in this |
68 +options in all other configuration files. Most of this file will be |
81 + file apply to all Mercurial commands executed by this user in any |
69 +ignored if it doesn't belong to a trusted user or to a trusted group. |
82 + directory. Options in this file override per-system and per-installation |
70 +See the documentation for the ``[trusted]`` section below for more |
83 options. |
71 +details. |
84 |
72 |
85 -| (Plan 9) ``/lib/mercurial/hgrc`` |
73 - On Windows, the following files are consulted: |
86 -| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc`` |
74 +Per-user configuration file(s) are for the user running Mercurial. |
87 -| (Unix) ``/etc/mercurial/hgrc`` |
75 +Options in these files apply to all Mercurial commands executed by |
88 -| (Unix) ``/etc/mercurial/hgrc.d/*.rc`` |
76 +this user in any directory. Options in these files override per-system |
89 +| ``/etc/mercurial/hgrc`` |
77 +and per-installation options. |
90 +| ``/etc/mercurial/hgrc.d/*.rc`` |
|
91 |
78 |
92 Per-system configuration files, for the system on which Mercurial |
79 - - ``<repo>/.hg/hgrc`` (per-repository) |
93 is running. Options in these files apply to all Mercurial commands |
80 - - ``%USERPROFILE%\.hgrc`` (per-user) |
94 @@ -61,33 +52,6 @@ |
81 - - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
95 executed by any user in any directory. Options in these files |
82 - - ``%HOME%\.hgrc`` (per-user) |
96 override per-installation options. |
83 - - ``%HOME%\Mercurial.ini`` (per-user) |
97 |
84 - - ``<install-dir>\Mercurial.ini`` (per-installation) |
98 -| (Plan 9) ``<install-root>/lib/mercurial/hgrc`` |
85 - - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
99 -| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc`` |
86 - - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
100 -| (Unix) ``<install-root>/etc/mercurial/hgrc`` |
|
101 -| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc`` |
|
102 - |
87 - |
103 - Per-installation configuration files, searched for in the |
88 - .. note:: |
104 - directory where Mercurial is installed. ``<install-root>`` is the |
|
105 - parent directory of the **hg** executable (or symlink) being run. For |
|
106 - example, if installed in ``/shared/tools/bin/hg``, Mercurial will look |
|
107 - in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply |
|
108 - to all Mercurial commands executed by any user in any directory. |
|
109 - |
89 - |
110 -| (Windows) ``<install-dir>\Mercurial.ini`` **or** |
90 - The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
111 -| (Windows) ``<install-dir>\hgrc.d\*.rc`` **or** |
|
112 -| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` |
|
113 - |
|
114 - Per-installation/system configuration files, 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 - order until one or more configuration files are detected. |
|
121 - |
|
122 -.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
|
123 - is used when running 32-bit Python on 64-bit Windows. |
91 - is used when running 32-bit Python on 64-bit Windows. |
124 - |
92 - |
125 Syntax |
93 -.. container:: verbose.plan9 |
126 ====== |
94 - |
127 |
95 - On Plan9, the following files are consulted: |
128 @@ -362,10 +326,6 @@ |
96 - |
|
97 - - ``<repo>/.hg/hgrc`` (per-repository) |
|
98 - - ``$home/lib/hgrc`` (per-user) |
|
99 - - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
|
100 - - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
|
101 - - ``/lib/mercurial/hgrc`` (per-system) |
|
102 - - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
|
103 - |
|
104 -Per-repository configuration options only apply in a |
|
105 -particular repository. This file is not version-controlled, and |
|
106 -will not get transferred during a "clone" operation. Options in |
|
107 -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 |
|
109 -belong to a trusted user or to a trusted group. See the documentation |
|
110 -for the ``[trusted]`` section below for more details. |
|
111 - |
|
112 -Per-user configuration file(s) are for the user running Mercurial. On |
|
113 -Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
|
114 -files apply to all Mercurial commands executed by this user in any |
|
115 -directory. Options in these files override per-system and per-installation |
|
116 -options. |
|
117 - |
|
118 Per-installation configuration files are searched for in the |
|
119 directory where Mercurial is installed. ``<install-root>`` is the |
|
120 parent directory of the **hg** executable (or symlink) being run. For |
|
121 @@ -490,12 +459,6 @@ |
129 of an empty temporary file, where the filtered data must be written by |
122 of an empty temporary file, where the filtered data must be written by |
130 the command. |
123 the command. |
131 |
124 |
132 -.. note:: The tempfile mechanism is recommended for Windows systems, |
125 -.. note:: |
|
126 - |
|
127 - The tempfile mechanism is recommended for Windows systems, |
133 - where the standard shell I/O redirection operators often have |
128 - where the standard shell I/O redirection operators often have |
134 - strange effects and may corrupt the contents of your files. |
129 - strange effects and may corrupt the contents of your files. |
135 - |
130 - |
136 This filter mechanism is used internally by the ``eol`` extension to |
131 This filter mechanism is used internally by the ``eol`` extension to |
137 translate line ending characters between Windows (CRLF) and Unix (LF) |
132 translate line ending characters between Windows (CRLF) and Unix (LF) |
138 format. We suggest you use the ``eol`` extension for convenience. |
133 format. We suggest you use the ``eol`` extension for convenience. |
139 @@ -714,11 +674,6 @@ |
134 @@ -849,13 +812,6 @@ |
140 Also, hooks like "commit" will be called in all contexts that |
135 Also, hooks like "commit" will be called in all contexts that |
141 generate a commit (e.g. tag) and not just the commit command. |
136 generate a commit (e.g. tag) and not just the commit command. |
142 |
137 |
143 -.. note:: Environment variables with empty values may not be passed to |
138 -.. note:: |
|
139 - |
|
140 - Environment variables with empty values may not be passed to |
144 - hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
141 - hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
145 - will have an empty value under Unix-like platforms for non-merge |
142 - will have an empty value under Unix-like platforms for non-merge |
146 - changesets, while it will not be available at all under Windows. |
143 - changesets, while it will not be available at all under Windows. |
147 - |
144 - |
148 The syntax for Python hooks is as follows:: |
145 The syntax for Python hooks is as follows:: |
149 |
146 |
150 hookname = python:modulename.submodule.callable |
147 hookname = python:modulename.submodule.callable |
151 @@ -809,7 +764,6 @@ |
148 @@ -951,7 +907,6 @@ |
152 |
149 |
153 # Define new tool |
150 # Define new tool |
154 myHtmlTool.args = -m $local $other $base $output |
151 myHtmlTool.args = -m $local $other $base $output |
155 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
152 - myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
156 myHtmlTool.priority = 1 |
153 myHtmlTool.priority = 1 |
157 |
154 |
158 Supported arguments: |
155 Supported arguments: |
159 @@ -819,9 +773,7 @@ |
156 @@ -961,9 +916,7 @@ |
160 Default: 0. |
157 Default: 0. |
161 |
158 |
162 ``executable`` |
159 ``executable`` |
163 - Either just the name of the executable or its pathname. On Windows, |
160 - Either just the name of the executable or its pathname. On Windows, |
164 - the path can use environment variables with ${ProgramFiles} syntax. |
161 - the path can use environment variables with ${ProgramFiles} syntax. |
165 - Default: the tool name. |
162 - Default: the tool name. |
166 + Either just the name of the executable or its pathname. Default: the tool name. |
163 + Either just the name of the executable or its pathname. Default: the tool name. |
167 |
164 |
168 ``args`` |
165 ``args`` |
169 The arguments to pass to the tool executable. You can refer to the |
166 The arguments to pass to the tool executable. You can refer to the |
170 @@ -860,29 +812,6 @@ |
167 @@ -1011,29 +964,6 @@ |
171 ``gui`` |
168 ``gui`` |
172 This tool requires a graphical interface to run. Default: False |
169 This tool requires a graphical interface to run. Default: False |
173 |
170 |
174 -``regkey`` |
171 -``regkey`` |
175 - Windows registry key which describes install location of this |
172 - Windows registry key which describes install location of this |