##// END OF EJS Templates
mdiff: remove unused parameter 'refine' from allblocks()
Philippe Pepiot -
r30023:ff17dff9 default
parent child Browse files
Show More
@@ -940,8 +940,7 b' class basefilectx(object):'
940 940 return ([(rev, False)] * lines(text), text)
941 941
942 942 def pair(parent, child):
943 blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts,
944 refine=True)
943 blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts)
945 944 for (a1, a2, b1, b2), t in blocks:
946 945 # Changed blocks ('!') or blocks made only of blank lines ('~')
947 946 # belong to the child.
@@ -113,12 +113,11 b' def splitblock(base1, lines1, base2, lin'
113 113 s1 = i1
114 114 s2 = i2
115 115
116 def allblocks(text1, text2, opts=None, lines1=None, lines2=None, refine=False):
116 def allblocks(text1, text2, opts=None, lines1=None, lines2=None):
117 117 """Return (block, type) tuples, where block is an mdiff.blocks
118 118 line entry. type is '=' for blocks matching exactly one another
119 119 (bdiff blocks), '!' for non-matching blocks and '~' for blocks
120 matching only after having filtered blank lines. If refine is True,
121 then '~' blocks are refined and are only made of blank lines.
120 matching only after having filtered blank lines.
122 121 line1 and line2 are text1 and text2 split with splitnewlines() if
123 122 they are already available.
124 123 """
General Comments 0
You need to be logged in to leave comments. Login now