--- a/components/mercurial/patches/rst.patch Fri May 15 11:21:43 2015 -0700
+++ b/components/mercurial/patches/rst.patch Wed May 06 10:05:59 2015 -0700
@@ -36,8 +36,8 @@
Some commands (e.g. revert) produce backup files ending in ``.orig``,
if the ``.orig`` file already exists and is not tracked by Mercurial,
it will be overwritten.
---- mercurial-3.2.3/mercurial/help/config.txt Thu Dec 18 12:59:22 2014
-+++ mercurial-3.2.3/mercurial/help/config.txt Thu Dec 18 18:19:37 2014
+--- mercurial-3.4/mercurial/help/config.txt Fri May 1 14:48:51 2015
++++ mercurial-3.4/mercurial/help/config.txt Mon May 4 14:54:54 2015
@@ -18,8 +18,7 @@
Mercurial reads configuration data from several files, if they exist.
These files do not exist by default and you will have to create the
@@ -57,25 +57,14 @@
- ``<repo>/.hg/hgrc`` (per-repository)
- ``$HOME/.hgrc`` (per-user)
-@@ -39,49 +38,19 @@
- - ``/etc/mercurial/hgrc`` (per-system)
+@@ -40,47 +39,16 @@
- ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
+ - ``<internal>/default.d/*.rc`` (defaults)
-.. container:: verbose.windows
-+Per-repository configuration options only apply in a particular
-+repository. This file is not version-controlled, and will not get
-+transferred during a "clone" operation. Options in this file override
-+options in all other configuration files. Most of this file will be
-+ignored if it doesn't belong to a trusted user or to a trusted group.
-+See the documentation for the ``[trusted]`` section below for more
-+details.
-
+-
- On Windows, the following files are consulted:
-+Per-user configuration file(s) are for the user running Mercurial.
-+Options in these files apply to all Mercurial commands executed by
-+this user in any directory. Options in these files override per-system
-+and per-installation options.
-
+-
- - ``<repo>/.hg/hgrc`` (per-repository)
- - ``%USERPROFILE%\.hgrc`` (per-user)
- - ``%USERPROFILE%\Mercurial.ini`` (per-user)
@@ -84,6 +73,7 @@
- - ``<install-dir>\Mercurial.ini`` (per-installation)
- - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
- - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
+- - ``<internal>/default.d/*.rc`` (defaults)
-
- .. note::
-
@@ -100,25 +90,39 @@
- - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
- - ``/lib/mercurial/hgrc`` (per-system)
- - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
+- - ``<internal>/default.d/*.rc`` (defaults)
-
--Per-repository configuration options only apply in a
--particular repository. This file is not version-controlled, and
--will not get transferred during a "clone" operation. Options in
+ Per-repository configuration options only apply in a
+ particular repository. This file is not version-controlled, and
+ will not get transferred during a "clone" operation. Options in
-this file override options in all other configuration files. On
-Plan 9 and Unix, most of this file will be ignored if it doesn't
--belong to a trusted user or to a trusted group. See the documentation
--for the ``[trusted]`` section below for more details.
--
++this file override options in all other configuration files.
++Most of this file will be ignored if it doesn't
+ belong to a trusted user or to a trusted group. See the documentation
+ for the ``[trusted]`` section below for more details.
+
-Per-user configuration file(s) are for the user running Mercurial. On
-Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these
--files apply to all Mercurial commands executed by this user in any
--directory. Options in these files override per-system and per-installation
--options.
--
- Per-installation configuration files are searched for in the
- directory where Mercurial is installed. ``<install-root>`` is the
- parent directory of the **hg** executable (or symlink) being run. For
-@@ -490,12 +459,6 @@
++Per-user configuration file(s) are for the user running Mercurial.
++Options in these
+ files apply to all Mercurial commands executed by this user in any
+ directory. Options in these files override per-system and per-installation
+ options.
+@@ -94,10 +62,8 @@
+
+ Per-installation configuration files are for the system on
+ which Mercurial is running. Options in these files apply to all
+-Mercurial commands executed by any user in any directory. Registry
+-keys contain PATH-like strings, every part of which must reference
+-a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
+-be read. Mercurial checks each of these locations in the specified
++Mercurial commands executed by any user in any directory.
++Mercurial checks each of these locations in the specified
+ order until one or more configuration files are detected.
+
+ Per-system configuration files are for the system on which Mercurial
+@@ -500,12 +466,6 @@
of an empty temporary file, where the filtered data must be written by
the command.
@@ -131,7 +135,7 @@
This filter mechanism is used internally by the ``eol`` extension to
translate line ending characters between Windows (CRLF) and Unix (LF)
format. We suggest you use the ``eol`` extension for convenience.
-@@ -849,13 +812,6 @@
+@@ -891,13 +851,6 @@
Also, hooks like "commit" will be called in all contexts that
generate a commit (e.g. tag) and not just the commit command.
@@ -145,7 +149,7 @@
The syntax for Python hooks is as follows::
hookname = python:modulename.submodule.callable
-@@ -951,7 +907,6 @@
+@@ -993,7 +946,6 @@
# Define new tool
myHtmlTool.args = -m $local $other $base $output
@@ -153,7 +157,7 @@
myHtmlTool.priority = 1
Supported arguments:
-@@ -961,9 +916,7 @@
+@@ -1003,9 +955,7 @@
Default: 0.
``executable``
@@ -164,7 +168,7 @@
``args``
The arguments to pass to the tool executable. You can refer to the
-@@ -1011,29 +964,6 @@
+@@ -1053,29 +1003,6 @@
``gui``
This tool requires a graphical interface to run. Default: False