Patchwork [3,of,3] import: cross-reference patch.fuzz option from `hg help import`

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date June 23, 2015, 5:59 p.m.
Message ID <73c9aa7cb2cc334f5e35.1435082365@Iris>
Download mbox | patch
Permalink /patch/9759/
State Accepted
Commit e508952cad0a8a9bb2157f6b885fbb211ef90ddd
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 1435082213 14400
#      Tue Jun 23 13:56:53 2015 -0400
# Node ID 73c9aa7cb2cc334f5e35c560c5e2dd3779d8ebd0
# Parent  64c3c8ec068b6cc6fd1fb19abe930e4fea828506
import: cross-reference patch.fuzz option from `hg help import`
Augie Fackler - June 23, 2015, 7:26 p.m.
On Tue, Jun 23, 2015 at 01:59:25PM -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1435082213 14400
> #      Tue Jun 23 13:56:53 2015 -0400
> # Node ID 73c9aa7cb2cc334f5e35c560c5e2dd3779d8ebd0
> # Parent  64c3c8ec068b6cc6fd1fb19abe930e4fea828506
> import: cross-reference patch.fuzz option from `hg help import`

Queued these, thanks!

>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4174,9 +4174,10 @@ def import_(ui, repo, patch1=None, *patc
>      importing only the patch metadata.
>
>      It is possible to use external patch programs to perform the patch
> -    by setting the ``ui.patch`` configuration option.
> +    by setting the ``ui.patch`` configuration option. For the default
> +    internal tool, the fuzz can also be configured via ``patch.fuzz``.
>      See :hg:`help config` for more information about configuration
> -    files and how to use this option.
> +    files and how to use these options.
>
>      To read a patch from standard input, use "-" as the patch name. If
>      a URL is specified, the patch will be downloaded from it.
> @@ -4208,6 +4209,10 @@ def import_(ui, repo, patch1=None, *patc
>
>            hg import --config ui.patch="patch --merge" fuzzy.patch
>
> +      - change the default fuzzing from 2 to a less strict 7
> +
> +          hg import --config ui.fuzz=7 fuzz.patch
> +
>      Returns 0 on success, 1 on partial success (see --partial).
>      """
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4174,9 +4174,10 @@  def import_(ui, repo, patch1=None, *patc
     importing only the patch metadata.
 
     It is possible to use external patch programs to perform the patch
-    by setting the ``ui.patch`` configuration option.
+    by setting the ``ui.patch`` configuration option. For the default
+    internal tool, the fuzz can also be configured via ``patch.fuzz``.
     See :hg:`help config` for more information about configuration
-    files and how to use this option.
+    files and how to use these options.
 
     To read a patch from standard input, use "-" as the patch name. If
     a URL is specified, the patch will be downloaded from it.
@@ -4208,6 +4209,10 @@  def import_(ui, repo, patch1=None, *patc
 
           hg import --config ui.patch="patch --merge" fuzzy.patch
 
+      - change the default fuzzing from 2 to a less strict 7
+
+          hg import --config ui.fuzz=7 fuzz.patch
+
     Returns 0 on success, 1 on partial success (see --partial).
     """