Patchwork [1,of,3] doc: document the ui.patch option

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date June 23, 2015, 5:59 p.m.
Message ID <452d3c9b0041c5a44efb.1435082363@Iris>
Download mbox | patch
Permalink /patch/9761/
State Accepted
Commit a8e8d0dda156e05dac0ada2aaf0a61a68fc8635b
Headers show

Comments

Jordi Gutiérrez Hermoso - June 23, 2015, 5:59 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1435081662 14400
#      Tue Jun 23 13:47:42 2015 -0400
# Node ID 452d3c9b0041c5a44efbb8327863599b6da27342
# Parent  7fdd1782fc4ee9da87d8af13e806dc9055db2c38
doc: document the ui.patch option

This option has been undocumented since e56c7e05c7e6 (July 2007).

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -1451,6 +1451,19 @@  User interface controls.
     markers is different from the encoding of the merged files,
     serious problems may occur.
 
+``patch``
+    An optional external tool that ``hg import`` and some extensions
+    will use for applying patches. By default Mercurial uses an
+    internal patch utility. The external tool must work as the common
+    Unix ``patch`` program. In particular, it must accept a ``-p``
+    argument to strip patch headers, a ``-d`` argument to specify the
+    current directory, a file name to patch, and a patch file to take
+    from stdin.
+
+    It is possible to specify a patch tool together with extra
+    arguments. For example, setting this option to ``patch --merge``
+    will use the ``patch`` program with its 2-way merge option.
+
 ``portablefilenames``
     Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
     Default is ``warn``.