Mercurial > public > mercurial-scm > hg

comparison mercurial/mdiff.py @ 30023:ff17dff99295

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdiff: remove unused parameter 'refine' from allblocks()
author Philippe Pepiot <philippe.pepiot@logilab.fr>
date Tue, 27 Sep 2016 14:46:34 +0200
parents 30789efb1e5e
children 3eeb8e138e5c
comparison
equal deleted inserted replaced
30022:26a4e46af2bc 30023:ff17dff99295
111 i2 += 1 111 i2 += 1
112 yield [base1 + s1, base1 + i1, base2 + s2, base2 + i2], btype 112 yield [base1 + s1, base1 + i1, base2 + s2, base2 + i2], btype
113 s1 = i1 113 s1 = i1
114 s2 = i2 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 """Return (block, type) tuples, where block is an mdiff.blocks 117 """Return (block, type) tuples, where block is an mdiff.blocks
118 line entry. type is '=' for blocks matching exactly one another 118 line entry. type is '=' for blocks matching exactly one another
119 (bdiff blocks), '!' for non-matching blocks and '~' for blocks 119 (bdiff blocks), '!' for non-matching blocks and '~' for blocks
120 matching only after having filtered blank lines. If refine is True, 120 matching only after having filtered blank lines.
121 then '~' blocks are refined and are only made of blank lines.
122 line1 and line2 are text1 and text2 split with splitnewlines() if 121 line1 and line2 are text1 and text2 split with splitnewlines() if
123 they are already available. 122 they are already available.
124 """ 123 """
125 if opts is None: 124 if opts is None:
126 opts = defaultopts 125 opts = defaultopts