Patchwork mdiff: remove unused parameter 'refine' from allblocks()

login
register
mail settings
Submitter Philippe Pepiot
Date Sept. 27, 2016, 1:46 p.m.
Message ID <a65b4327cae4881e4f71.1474984001@sh71.tls.logilab.fr>
Download mbox | patch
Permalink /patch/16790/
State Accepted
Headers show

Comments

Philippe Pepiot - Sept. 27, 2016, 1:46 p.m.
# HG changeset patch
# User Philippe Pepiot <philippe.pepiot@logilab.fr>
# Date 1474980394 -7200
#      Tue Sep 27 14:46:34 2016 +0200
# Node ID a65b4327cae4881e4f71ba9bf2dec77f9f5c9112
# Parent  e83f89d3b1f733d0ee5f23f6a2293279a17fbbfb
mdiff: remove unused parameter 'refine' from allblocks()
Pierre-Yves David - Sept. 27, 2016, 3:25 p.m.
On 09/27/2016 03:46 PM, Philippe Pepiot wrote:
> # HG changeset patch
> # User Philippe Pepiot <philippe.pepiot@logilab.fr>
> # Date 1474980394 -7200
> #      Tue Sep 27 14:46:34 2016 +0200
> # Node ID a65b4327cae4881e4f71ba9bf2dec77f9f5c9112
> # Parent  e83f89d3b1f733d0ee5f23f6a2293279a17fbbfb
> mdiff: remove unused parameter 'refine' from allblocks()

Pushed, thanks.

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -940,8 +940,7 @@  class basefilectx(object):
                 return ([(rev, False)] * lines(text), text)
 
         def pair(parent, child):
-            blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts,
-                                     refine=True)
+            blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts)
             for (a1, a2, b1, b2), t in blocks:
                 # Changed blocks ('!') or blocks made only of blank lines ('~')
                 # belong to the child.
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -113,12 +113,11 @@  def splitblock(base1, lines1, base2, lin
         s1 = i1
         s2 = i2
 
-def allblocks(text1, text2, opts=None, lines1=None, lines2=None, refine=False):
+def allblocks(text1, text2, opts=None, lines1=None, lines2=None):
     """Return (block, type) tuples, where block is an mdiff.blocks
     line entry. type is '=' for blocks matching exactly one another
     (bdiff blocks), '!' for non-matching blocks and '~' for blocks
-    matching only after having filtered blank lines. If refine is True,
-    then '~' blocks are refined and are only made of blank lines.
+    matching only after having filtered blank lines.
     line1 and line2 are text1 and text2 split with splitnewlines() if
     they are already available.
     """