comparison mercurial/pure/bdiff.py @ 7944:e9b48afd0e78

pure/bdiff: fix circular import

7943:c289c3fc5985

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

import struct, difflib
# mdiff import moved to bottom due to import cycle

def _normalizeblocks(a, b, blocks):
    prev = None
    for curr in blocks:
        if prev is None:

        lb = bm + size

    return "".join(bin)

def blocks(a, b):
    an = mdiff.splitnewlines(a)
    bn = mdiff.splitnewlines(b)
    d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks()
    d = _normalizeblocks(an, bn, d)
    return [(i, i + n, j, j + n) for (i, j, n) in d]

# this breaks an import cycle
import mdiff

7944:e9b48afd0e78

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

import struct, difflib

def splitnewlines(text):
    '''like str.splitlines, but only split on newlines.'''
    lines = [l + '\n' for l in text.split('\n')]
    if lines:
        if lines[-1] == '\n':
            lines.pop()
        else:
            lines[-1] = lines[-1][:-1]
    return lines

def _normalizeblocks(a, b, blocks):
    prev = None
    for curr in blocks:
        if prev is None:

        lb = bm + size

    return "".join(bin)

def blocks(a, b):
    an = splitnewlines(a)
    bn = splitnewlines(b)
    d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks()
    d = _normalizeblocks(an, bn, d)
    return [(i, i + n, j, j + n) for (i, j, n) in d]