comparison mercurial/mdiff.py @ 15529:b35cf47286a6

mdiff: split lines in allblocks() only when necessary

These are only required to handle the --ignore-blank-lines case

15528:a84698badf0b

    line1 and line2 are text1 and text2 split with splitnewlines() if
    they are already available.
    """
    if opts is None:
        opts = defaultopts
    if lines1 is None:
        lines1 = splitnewlines(text1)
    if lines2 is None:
        lines2 = splitnewlines(text2)
    if opts.ignorews or opts.ignorewsamount:
        text1 = wsclean(opts, text1, False)
        text2 = wsclean(opts, text2, False)
    diff = bdiff.blocks(text1, text2)
    for i, s1 in enumerate(diff):

        if i > 0:
            s = diff[i - 1]
        else:
            s = [0, 0, 0, 0]
        s = [s[1], s1[0], s[3], s1[2]]
        old = lines1[s[0]:s[1]]
        new = lines2[s[2]:s[3]]

        # bdiff sometimes gives huge matches past eof, this check eats them,
        # and deals with the special first match case described above
        if old or new:
            type = '!'
            if opts.ignoreblanklines:
                cold = wsclean(opts, "".join(old))
                cnew = wsclean(opts, "".join(new))
                if cold == cnew:
                    type = '~'
            yield s, type
        yield s1, '='

def diffline(revs, a, b, opts):

15529:b35cf47286a6

    line1 and line2 are text1 and text2 split with splitnewlines() if
    they are already available.
    """
    if opts is None:
        opts = defaultopts
    if opts.ignorews or opts.ignorewsamount:
        text1 = wsclean(opts, text1, False)
        text2 = wsclean(opts, text2, False)
    diff = bdiff.blocks(text1, text2)
    for i, s1 in enumerate(diff):

        if i > 0:
            s = diff[i - 1]
        else:
            s = [0, 0, 0, 0]
        s = [s[1], s1[0], s[3], s1[2]]

        # bdiff sometimes gives huge matches past eof, this check eats them,
        # and deals with the special first match case described above
        if s[0] != s[1] or s[2] != s[3]:
            type = '!'
            if opts.ignoreblanklines:
                if lines1 is None:
                    lines1 = splitnewlines(text1)
                if lines2 is None:
                    lines2 = splitnewlines(text2)
                old = wsclean(opts, "".join(lines1[s[0]:s[1]]))
                new = wsclean(opts, "".join(lines2[s[2]:s[3]]))
                if old == new:
                    type = '~'
            yield s, type
        yield s1, '='

def diffline(revs, a, b, opts):