changeset 30025:ff17dff99295

mdiff: remove unused parameter 'refine' from allblocks()
author Philippe Pepiot <philippe.pepiot@logilab.fr>
date Tue, 27 Sep 2016 14:46:34 +0200
parents 26a4e46af2bc
children f3c4edfd35e1
files mercurial/context.py mercurial/mdiff.py
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Mon Sep 26 23:28:57 2016 +0900
+++ b/mercurial/context.py	Tue Sep 27 14:46:34 2016 +0200
@@ -940,8 +940,7 @@
                 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.
--- a/mercurial/mdiff.py	Mon Sep 26 23:28:57 2016 +0900
+++ b/mercurial/mdiff.py	Tue Sep 27 14:46:34 2016 +0200
@@ -113,12 +113,11 @@
         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.
     """