Show More
@@ -940,8 +940,7 b' class basefilectx(object):' | |||||
940 | return ([(rev, False)] * lines(text), text) |
|
940 | return ([(rev, False)] * lines(text), text) | |
941 |
|
941 | |||
942 | def pair(parent, child): |
|
942 | def pair(parent, child): | |
943 |
blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts |
|
943 | blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts) | |
944 | refine=True) |
|
|||
945 | for (a1, a2, b1, b2), t in blocks: |
|
944 | for (a1, a2, b1, b2), t in blocks: | |
946 | # Changed blocks ('!') or blocks made only of blank lines ('~') |
|
945 | # Changed blocks ('!') or blocks made only of blank lines ('~') | |
947 | # belong to the child. |
|
946 | # belong to the child. |
@@ -113,12 +113,11 b' def splitblock(base1, lines1, base2, lin' | |||||
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 |
|
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. |
|
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 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now