2302N/ARewrite some sections of the documentation to match what we deliver on
2302N/ASolaris, or remove sections that are of no relevance to Solaris.
2302N/A
2302N/A--- mercurial-2.7/hgext/hgk.py Mon Aug 19 14:57:23 2013
2302N/A+++ mercurial-2.7/hgext/hgk.py Mon Aug 19 15:04:11 2013
2302N/A@@ -13,13 +13,12 @@
2302N/A
2302N/A hgk consists of two parts: a Tcl script that does the displaying and
2302N/A querying of information, and an extension to Mercurial named hgk.py,
2302N/A-which provides hooks for hgk to get information. hgk can be found in
2302N/A-the contrib directory, and the extension is shipped in the hgext
2302N/A-repository, and needs to be enabled.
2302N/A+which provides hooks for hgk to get information.
2302N/A
2302N/A-The :hg:`view` command will launch the hgk Tcl script. For this command
2302N/A-to work, hgk must be in your search path. Alternately, you can specify
2302N/A-the path to hgk in your configuration file::
2302N/A+The :hg:`view` command will launch the hgk Tcl script. The script is
2302N/A+shipped in /usr/demo/mercurial, and hgk needs no configuration to find
2302N/A+it. You can specify the path to an alternate hgk in your configuration
2302N/A+file::
2302N/A
2302N/A [hgk]
2302N/A path=/location/of/hgk
2302N/A--- mercurial-2.7/mercurial/help/hg.1.txt Thu Aug 1 20:37:39 2013
2302N/A+++ mercurial-2.7/mercurial/help/hg.1.txt Mon Aug 19 15:14:00 2013
2302N/A@@ -85,6 +85,11 @@
2302N/A repositories. The file format is the same as for ``.hgtags``, but it is
2302N/A encoded using the local system encoding.
2302N/A
2302N/A+``/usr/demo/mercurial``
2302N/A+ This directory contains assorted files which are part of the Mercurial
2302N/A+ distribution, but not core to its functionality. They will generally
2302N/A+ need to be copied elsewhere to be of use.
2302N/A+
2302N/A Some commands (e.g. revert) produce backup files ending in ``.orig``,
2302N/A if the ``.orig`` file already exists and is not tracked by Mercurial,
2302N/A it will be overwritten.
5479N/A--- a/mercurial/help/config.txt
5479N/A+++ b/mercurial/help/config.txt
5479N/A@@ -36,10 +36,6 @@ Local configuration is put into the per-
5479N/A
5479N/A Global configuration like the username setting is typically put into:
2302N/A
5479N/A-.. container:: windows
5479N/A-
5479N/A- - ``%USERPROFILE%\mercurial.ini`` (on Windows)
5479N/A-
5479N/A .. container:: unix.plan9
5479N/A
5479N/A - ``$HOME/.hgrc`` (on Unix, Plan9)
5479N/A@@ -52,7 +48,7 @@ ones.
2302N/A
3596N/A .. container:: verbose.unix
2302N/A
3596N/A- On Unix, the following files are consulted:
3596N/A+ The following files are consulted:
3596N/A
3596N/A - ``<repo>/.hg/hgrc`` (per-repository)
3596N/A - ``$HOME/.hgrc`` (per-user)
5479N/A@@ -62,41 +58,6 @@ ones.
3596N/A - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
4261N/A - ``<internal>/default.d/*.rc`` (defaults)
2302N/A
3596N/A-.. container:: verbose.windows
4261N/A-
3596N/A- On Windows, the following files are consulted:
4261N/A-
3596N/A- - ``<repo>/.hg/hgrc`` (per-repository)
3596N/A- - ``%USERPROFILE%\.hgrc`` (per-user)
3596N/A- - ``%USERPROFILE%\Mercurial.ini`` (per-user)
3596N/A- - ``%HOME%\.hgrc`` (per-user)
3596N/A- - ``%HOME%\Mercurial.ini`` (per-user)
5479N/A- - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
3596N/A- - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
5479N/A- - ``<install-dir>\Mercurial.ini`` (per-installation)
4261N/A- - ``<internal>/default.d/*.rc`` (defaults)
3596N/A-
3596N/A- .. note::
3596N/A-
3596N/A- The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
3596N/A- is used when running 32-bit Python on 64-bit Windows.
3596N/A-
5479N/A-.. container:: windows
5479N/A-
5479N/A- On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
5479N/A-
3596N/A-.. container:: verbose.plan9
3596N/A-
3596N/A- On Plan9, the following files are consulted:
2302N/A-
3596N/A- - ``<repo>/.hg/hgrc`` (per-repository)
3596N/A- - ``$home/lib/hgrc`` (per-user)
3596N/A- - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
3596N/A- - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
3596N/A- - ``/lib/mercurial/hgrc`` (per-system)
3596N/A- - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
4261N/A- - ``<internal>/default.d/*.rc`` (defaults)
2302N/A-
4261N/A Per-repository configuration options only apply in a
4261N/A particular repository. This file is not version-controlled, and
4261N/A will not get transferred during a "clone" operation. Options in
5479N/A@@ -104,7 +65,7 @@ this file override options in all other
5479N/A
5479N/A .. container:: unix.plan9
4261N/A
5479N/A- On Plan 9 and Unix, most of this file will be ignored if it doesn't
5479N/A+ On Unix, most of this file will be ignored if it doesn't
5479N/A belong to a trusted user or to a trusted group. See
5479N/A :hg:`help config.trusted` for more details.
5479N/A
5479N/A@@ -126,10 +87,8 @@ parent directory of the **hg** executabl
4261N/A
4261N/A Per-installation configuration files are for the system on
4261N/A which Mercurial is running. Options in these files apply to all
4261N/A-Mercurial commands executed by any user in any directory. Registry
4261N/A-keys contain PATH-like strings, every part of which must reference
4261N/A-a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
4261N/A-be read. Mercurial checks each of these locations in the specified
4261N/A+Mercurial commands executed by any user in any directory.
4261N/A+Mercurial checks each of these locations in the specified
4261N/A order until one or more configuration files are detected.
4261N/A
4261N/A Per-system configuration files are for the system on which Mercurial
5479N/A@@ -535,14 +494,6 @@ filtered by the command. The string ``OU
2302N/A of an empty temporary file, where the filtered data must be written by
2302N/A the command.
2302N/A
5479N/A-.. container:: windows
5479N/A-
5479N/A- .. note::
2951N/A-
5479N/A- The tempfile mechanism is recommended for Windows systems,
5479N/A- where the standard shell I/O redirection operators often have
5479N/A- strange effects and may corrupt the contents of your files.
2302N/A-
2302N/A This filter mechanism is used internally by the ``eol`` extension to
2302N/A translate line ending characters between Windows (CRLF) and Unix (LF)
2302N/A format. We suggest you use the ``eol`` extension for convenience.
5479N/A@@ -941,13 +892,6 @@ variables it is passed are listed with n
2302N/A Also, hooks like "commit" will be called in all contexts that
2302N/A generate a commit (e.g. tag) and not just the commit command.
2302N/A
2951N/A-.. note::
2951N/A-
2951N/A- Environment variables with empty values may not be passed to
2302N/A- hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
2302N/A- will have an empty value under Unix-like platforms for non-merge
2302N/A- changesets, while it will not be available at all under Windows.
2302N/A-
2302N/A The syntax for Python hooks is as follows::
2302N/A
2302N/A hookname = python:modulename.submodule.callable
5479N/A@@ -1046,7 +990,6 @@ Example ``~/.hgrc``::
2302N/A
2302N/A # Define new tool
2302N/A myHtmlTool.args = -m $local $other $base $output
2302N/A- myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
2302N/A myHtmlTool.priority = 1
2302N/A
2302N/A Supported arguments:
5479N/A@@ -1058,11 +1001,6 @@ Supported arguments:
2302N/A ``executable``
5479N/A Either just the name of the executable or its pathname.
5479N/A
5479N/A- .. container:: windows
5479N/A-
5479N/A- On Windows, the path can use environment variables with ${ProgramFiles}
5479N/A- syntax.
5479N/A-
5479N/A (default: the tool name)
2302N/A
2302N/A ``args``
5479N/A@@ -1110,30 +1048,6 @@ Supported arguments:
2302N/A ``gui``
5479N/A This tool requires a graphical interface to run. (default: False)
2302N/A
5479N/A-.. container:: windows
5479N/A-
5479N/A- ``regkey``
5479N/A- Windows registry key which describes install location of this
5479N/A- tool. Mercurial will search for this key first under
5479N/A- ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
5479N/A- (default: None)
2302N/A-
5479N/A- ``regkeyalt``
5479N/A- An alternate Windows registry key to try if the first key is not
5479N/A- found. The alternate key uses the same ``regname`` and ``regappend``
5479N/A- semantics of the primary key. The most common use for this key
5479N/A- is to search for 32bit applications on 64bit operating systems.
5479N/A- (default: None)
2302N/A-
5479N/A- ``regname``
5479N/A- Name of value to read from specified registry key.
5479N/A- (default: the unnamed (default) value)
2302N/A-
5479N/A- ``regappend``
5479N/A- String to append to the value read from the registry, typically
5479N/A- the executable name of the tool.
5479N/A- (default: None)
2302N/A-
5479N/A
2302N/A ``patch``
2302N/A ---------
5479N/A@@ -1658,10 +1572,6 @@ User interface controls.
5479N/A ``false``
5479N/A Alias for ``ignore``.
2302N/A
5479N/A- .. container:: windows
5479N/A-
5479N/A- On Windows, this configuration option is ignored and the command aborted.
5479N/A-
5479N/A ``quiet``
5479N/A Reduce the amount of output printed.
5479N/A (default: False)