diff --git a/mercurial/context.py b/mercurial/context.py index 26a4e46af2bc87e3ccf96f27bbc0dcc115fae0dc_bWVyY3VyaWFsL2NvbnRleHQucHk=..ff17dff99295e0781b3f147da2c5e5b14d3436e4_bWVyY3VyaWFsL2NvbnRleHQucHk= 100644 --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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. diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py index 26a4e46af2bc87e3ccf96f27bbc0dcc115fae0dc_bWVyY3VyaWFsL21kaWZmLnB5..ff17dff99295e0781b3f147da2c5e5b14d3436e4_bWVyY3VyaWFsL21kaWZmLnB5 100644 --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -113,7 +113,7 @@ 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 @@ -117,8 +117,7 @@ """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. """