author | Danek Duvall <danek.duvall@oracle.com> |
Wed, 02 Apr 2014 14:52:38 -0700 | |
branch | s11-update |
changeset 3045 | 0121e7323666 |
child 1981 | 66b174f4707e |
child 3748 | 4e3605a7e3c0 |
permissions | -rw-r--r-- |
3045
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Rewrite some sections of the documentation to match what we deliver on |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
Solaris, or remove sections that are of no relevance to Solaris. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
--- mercurial-2.7/hgext/hgk.py Mon Aug 19 14:57:23 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
+++ mercurial-2.7/hgext/hgk.py Mon Aug 19 15:04:11 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
@@ -13,13 +13,12 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
hgk consists of two parts: a Tcl script that does the displaying and |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
querying of information, and an extension to Mercurial named hgk.py, |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
-which provides hooks for hgk to get information. hgk can be found in |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
-the contrib directory, and the extension is shipped in the hgext |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
-repository, and needs to be enabled. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
+which provides hooks for hgk to get information. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
-The :hg:`view` command will launch the hgk Tcl script. For this command |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
-to work, hgk must be in your search path. Alternately, you can specify |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
-the path to hgk in your configuration file:: |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
+The :hg:`view` command will launch the hgk Tcl script. The script is |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
+shipped in /usr/demo/mercurial, and hgk needs no configuration to find |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
+it. You can specify the path to an alternate hgk in your configuration |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
+file:: |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
[hgk] |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
path=/location/of/hgk |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
--- mercurial-2.7/mercurial/help/hg.1.txt Thu Aug 1 20:37:39 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
+++ mercurial-2.7/mercurial/help/hg.1.txt Mon Aug 19 15:14:00 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
@@ -85,6 +85,11 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
repositories. The file format is the same as for ``.hgtags``, but it is |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
encoded using the local system encoding. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
+``/usr/demo/mercurial`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
+ This directory contains assorted files which are part of the Mercurial |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
+ distribution, but not core to its functionality. They will generally |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
+ need to be copied elsewhere to be of use. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
+ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
36 |
Some commands (e.g. revert) produce backup files ending in ``.orig``, |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
37 |
if the ``.orig`` file already exists and is not tracked by Mercurial, |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
38 |
it will be overwritten. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
39 |
--- mercurial-2.7/mercurial/help/config.txt.orig Thu Aug 1 20:37:39 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
40 |
+++ mercurial-2.7/mercurial/help/config.txt Mon Aug 19 16:28:22 2013 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
41 |
@@ -18,8 +18,7 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
42 |
Mercurial reads configuration data from several files, if they exist. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
43 |
These files do not exist by default and you will have to create the |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
44 |
appropriate configuration files yourself: global configuration like |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
45 |
-the username setting is typically put into |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
46 |
-``%USERPROFILE%\mercurial.ini`` or ``$HOME/.hgrc`` and local |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
47 |
+the username setting is typically put into ``$HOME/.hgrc`` and local |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
48 |
configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
49 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
50 |
The names of these files depend on the system on which Mercurial is |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
51 |
@@ -28,33 +27,25 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
52 |
paths are given below, settings from earlier paths override later |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
53 |
ones. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
54 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
55 |
-| (All) ``<repo>/.hg/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
56 |
+| ``<repo>/.hg/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
57 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
58 |
Per-repository configuration options that only apply in a |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
59 |
particular repository. This file is not version-controlled, and |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
60 |
will not get transferred during a "clone" operation. Options in |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
61 |
- this file override options in all other configuration files. On |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
62 |
- Plan 9 and Unix, most of this file will be ignored if it doesn't |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
63 |
+ this file override options in all other configuration files. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
64 |
+ Most of this file will be ignored if it doesn't |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
65 |
belong to a trusted user or to a trusted group. See the documentation |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
66 |
for the ``[trusted]`` section below for more details. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
67 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
68 |
-| (Plan 9) ``$home/lib/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
69 |
-| (Unix) ``$HOME/.hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
70 |
-| (Windows) ``%USERPROFILE%\.hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
71 |
-| (Windows) ``%USERPROFILE%\Mercurial.ini`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
72 |
-| (Windows) ``%HOME%\.hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
73 |
-| (Windows) ``%HOME%\Mercurial.ini`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
74 |
+| ``$HOME/.hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
75 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
76 |
- Per-user configuration file(s), for the user running Mercurial. On |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
77 |
- Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
78 |
- files apply to all Mercurial commands executed by this user in any |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
79 |
- directory. Options in these files override per-system and per-installation |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
80 |
+ Per-user configuration file, for the user running Mercurial. Options in this |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
81 |
+ file apply to all Mercurial commands executed by this user in any |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
82 |
+ directory. Options in this file override per-system and per-installation |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
83 |
options. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
84 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
85 |
-| (Plan 9) ``/lib/mercurial/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
86 |
-| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
87 |
-| (Unix) ``/etc/mercurial/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
88 |
-| (Unix) ``/etc/mercurial/hgrc.d/*.rc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
89 |
+| ``/etc/mercurial/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
90 |
+| ``/etc/mercurial/hgrc.d/*.rc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
91 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
92 |
Per-system configuration files, for the system on which Mercurial |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
93 |
is running. Options in these files apply to all Mercurial commands |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
94 |
@@ -61,33 +52,6 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
95 |
executed by any user in any directory. Options in these files |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
96 |
override per-installation options. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
97 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
98 |
-| (Plan 9) ``<install-root>/lib/mercurial/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
99 |
-| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
100 |
-| (Unix) ``<install-root>/etc/mercurial/hgrc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
101 |
-| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
102 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
103 |
- Per-installation configuration files, searched for in the |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
104 |
- directory where Mercurial is installed. ``<install-root>`` is the |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
105 |
- parent directory of the **hg** executable (or symlink) being run. For |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
106 |
- example, if installed in ``/shared/tools/bin/hg``, Mercurial will look |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
107 |
- in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
108 |
- to all Mercurial commands executed by any user in any directory. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
109 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
110 |
-| (Windows) ``<install-dir>\Mercurial.ini`` **or** |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
111 |
-| (Windows) ``<install-dir>\hgrc.d\*.rc`` **or** |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
112 |
-| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
113 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
114 |
- Per-installation/system configuration files, for the system on |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
115 |
- which Mercurial is running. Options in these files apply to all |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
116 |
- Mercurial commands executed by any user in any directory. Registry |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
117 |
- keys contain PATH-like strings, every part of which must reference |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
118 |
- a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
119 |
- be read. Mercurial checks each of these locations in the specified |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
120 |
- order until one or more configuration files are detected. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
121 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
122 |
-.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
123 |
- is used when running 32-bit Python on 64-bit Windows. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
124 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
125 |
Syntax |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
126 |
====== |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
127 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
128 |
@@ -362,10 +326,6 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
129 |
of an empty temporary file, where the filtered data must be written by |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
130 |
the command. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
131 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
132 |
-.. note:: The tempfile mechanism is recommended for Windows systems, |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
133 |
- where the standard shell I/O redirection operators often have |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
134 |
- strange effects and may corrupt the contents of your files. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
135 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
136 |
This filter mechanism is used internally by the ``eol`` extension to |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
137 |
translate line ending characters between Windows (CRLF) and Unix (LF) |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
138 |
format. We suggest you use the ``eol`` extension for convenience. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
139 |
@@ -714,11 +674,6 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
140 |
Also, hooks like "commit" will be called in all contexts that |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
141 |
generate a commit (e.g. tag) and not just the commit command. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
142 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
143 |
-.. note:: Environment variables with empty values may not be passed to |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
144 |
- hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
145 |
- will have an empty value under Unix-like platforms for non-merge |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
146 |
- changesets, while it will not be available at all under Windows. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
147 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
148 |
The syntax for Python hooks is as follows:: |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
149 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
150 |
hookname = python:modulename.submodule.callable |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
151 |
@@ -809,7 +764,6 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
152 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
153 |
# Define new tool |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
154 |
myHtmlTool.args = -m $local $other $base $output |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
155 |
- myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
156 |
myHtmlTool.priority = 1 |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
157 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
158 |
Supported arguments: |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
159 |
@@ -819,9 +773,7 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
160 |
Default: 0. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
161 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
162 |
``executable`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
163 |
- Either just the name of the executable or its pathname. On Windows, |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
164 |
- the path can use environment variables with ${ProgramFiles} syntax. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
165 |
- Default: the tool name. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
166 |
+ Either just the name of the executable or its pathname. Default: the tool name. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
167 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
168 |
``args`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
169 |
The arguments to pass to the tool executable. You can refer to the |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
170 |
@@ -860,29 +812,6 @@ |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
171 |
``gui`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
172 |
This tool requires a graphical interface to run. Default: False |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
173 |
|
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
174 |
-``regkey`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
175 |
- Windows registry key which describes install location of this |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
176 |
- tool. Mercurial will search for this key first under |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
177 |
- ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
178 |
- Default: None |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
179 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
180 |
-``regkeyalt`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
181 |
- An alternate Windows registry key to try if the first key is not |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
182 |
- found. The alternate key uses the same ``regname`` and ``regappend`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
183 |
- semantics of the primary key. The most common use for this key |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
184 |
- is to search for 32bit applications on 64bit operating systems. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
185 |
- Default: None |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
186 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
187 |
-``regname`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
188 |
- Name of value to read from specified registry key. Defaults to the |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
189 |
- unnamed (default) value. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
190 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
191 |
-``regappend`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
192 |
- String to append to the value read from the registry, typically |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
193 |
- the executable name of the tool. |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
194 |
- Default: None |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
195 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
196 |
- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
197 |
``patch`` |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
198 |
--------- |
0121e7323666
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
199 |