bdiff: deal better with duplicate lines The longest_match code compares all the possible positions in two files to find the best match. Given a pair of sequences, it effectively searches a grid like this: a b b b c . d e . f 0 1 2 3 4 5 6 7 8 9 a 1 - - - - - - - - - b - 2 1 1 - - - - - - b - 1 3 2 - - - - - - b - 1 2 4 - - - - - - . - - - - - 1 - - 1 - Here, the 4 in the middle says "the first four lines of the file match", which it can compute be comparing the fourth lines and then adding one to the result found when comparing the third lines in the entry to the upper left. We generally avoid the quadratic worst case by only looking at lines that match, which is precomputed. We also avoid quadratic storage by only keeping a single column vector and then keeping track of the best match. Unfortunately, this can get us into trouble with the sequences above. Because we want to reuse the '3' value when calculating the '4', we need to be careful not to overwrite it with the '2' we calculate immediately before. If we scan left to right, top to bottom, we're going to have a problem: we'll overwrite our 3 before we use it and calculate a suboptimal best match. To address this, we can either keep two column vectors and swap between them (which significantly complicates bookkeeping), or change our scanning order. If we instead scan from left to right, bottom to top, we'll avoid ever overwriting values we'll need in the future. This unfortunately needs several changes to be made simultaneously: - change the order we build the initial hash chains for the b sequence - change the sentinel values from INT_MAX to -1 - change the visit order in the longest_match inner loop - add a tie-breaker preference for earlier matches This last is needed because we previously had an implicit tie-breaker from our visitation order that our test suite relies on. Later matches can also trigger a bug in the normalization code in diff().

     1

from __future__ import absolute_import, print_function

     2

import struct

     3

from mercurial import (

     4

    bdiff,

     5

    mpatch,

     6

)

     7

     8

def test1(a, b):

     9

    d = bdiff.bdiff(a, b)

    10

    c = a

    11

    if d:

    12

        c = mpatch.patches(a, [d])

    13

    if c != b:

    14

        print("***", repr(a), repr(b))

    15

        print("bad:")

    16

        print(repr(c)[:200])

    17

        print(repr(d))

    18

    19

def test(a, b):

    20

    print("***", repr(a), repr(b))

    21

    test1(a, b)

    22

    test1(b, a)

    23

    24

test("a\nc\n\n\n\n", "a\nb\n\n\n")

    25

test("a\nb\nc\n", "a\nc\n")

    26

test("", "")

    27

test("a\nb\nc", "a\nb\nc")

    28

test("a\nb\nc\nd\n", "a\nd\n")

    29

test("a\nb\nc\nd\n", "a\nc\ne\n")

    30

test("a\nb\nc\n", "a\nc\n")

    31

test("a\n", "c\na\nb\n")

    32

test("a\n", "")

    33

test("a\n", "b\nc\n")

    34

test("a\n", "c\na\n")

    35

test("", "adjfkjdjksdhfksj")

    36

test("", "ab")

    37

test("", "abc")

    38

test("a", "a")

    39

test("ab", "ab")

    40

test("abc", "abc")

    41

test("a\n", "a\n")

    42

test("a\nb", "a\nb")

    43

    44

#issue1295

    45

def showdiff(a, b):

    46

    bin = bdiff.bdiff(a, b)

    47

    pos = 0

    48

    while pos < len(bin):

    49

        p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])

    50

        pos += 12

    51

        print(p1, p2, repr(bin[pos:pos + l]))

    52

        pos += l

    53

showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n")

    54

showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n")

    55

# we should pick up abbbc. rather than bc.de as the longest match

    56

showdiff("a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n",

    57

         "a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n")

    58

    59

print("done")

    60

    61

def testfixws(a, b, allws):

    62

    c = bdiff.fixws(a, allws)

    63

    if c != b:

    64

        print("*** fixws", repr(a), repr(b), allws)

    65

        print("got:")

    66

        print(repr(c))

    67

    68

testfixws(" \ta\r b\t\n", "ab\n", 1)

    69

testfixws(" \ta\r b\t\n", " a b\n", 0)

    70

testfixws("", "", 1)

    71

testfixws("", "", 0)

    72

    73

print("done")