2016-04-03 06:16:17 +03:00
|
|
|
from __future__ import absolute_import, print_function
|
2016-12-15 18:50:06 +03:00
|
|
|
import collections
|
2009-05-31 01:20:30 +04:00
|
|
|
import struct
|
2016-12-15 18:10:15 +03:00
|
|
|
import unittest
|
|
|
|
|
|
|
|
import silenttestrunner
|
|
|
|
|
2016-04-03 06:12:18 +03:00
|
|
|
from mercurial import (
|
|
|
|
bdiff,
|
|
|
|
mpatch,
|
|
|
|
)
|
2005-06-22 05:27:58 +04:00
|
|
|
|
2016-12-15 18:50:06 +03:00
|
|
|
class diffreplace(
|
|
|
|
collections.namedtuple('diffreplace', 'start end from_ to')):
|
|
|
|
def __repr__(self):
|
|
|
|
return 'diffreplace(%r, %r, %r, %r)' % self
|
|
|
|
|
2016-12-15 18:10:15 +03:00
|
|
|
class BdiffTests(unittest.TestCase):
|
2005-06-22 05:27:58 +04:00
|
|
|
|
2016-12-15 18:10:15 +03:00
|
|
|
def assert_bdiff_applies(self, a, b):
|
|
|
|
d = bdiff.bdiff(a, b)
|
|
|
|
c = a
|
|
|
|
if d:
|
|
|
|
c = mpatch.patches(a, [d])
|
|
|
|
self.assertEqual(
|
|
|
|
c, b, ("bad diff+patch result from\n %r to\n "
|
|
|
|
"%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200])))
|
2005-06-22 05:27:58 +04:00
|
|
|
|
2016-12-15 18:10:15 +03:00
|
|
|
def assert_bdiff(self, a, b):
|
|
|
|
self.assert_bdiff_applies(a, b)
|
|
|
|
self.assert_bdiff_applies(b, a)
|
|
|
|
|
|
|
|
def test_bdiff_basic(self):
|
|
|
|
cases = [
|
|
|
|
("a\nc\n\n\n\n", "a\nb\n\n\n"),
|
|
|
|
("a\nb\nc\n", "a\nc\n"),
|
|
|
|
("", ""),
|
|
|
|
("a\nb\nc", "a\nb\nc"),
|
|
|
|
("a\nb\nc\nd\n", "a\nd\n"),
|
|
|
|
("a\nb\nc\nd\n", "a\nc\ne\n"),
|
|
|
|
("a\nb\nc\n", "a\nc\n"),
|
|
|
|
("a\n", "c\na\nb\n"),
|
|
|
|
("a\n", ""),
|
|
|
|
("a\n", "b\nc\n"),
|
|
|
|
("a\n", "c\na\n"),
|
|
|
|
("", "adjfkjdjksdhfksj"),
|
|
|
|
("", "ab"),
|
|
|
|
("", "abc"),
|
|
|
|
("a", "a"),
|
|
|
|
("ab", "ab"),
|
|
|
|
("abc", "abc"),
|
|
|
|
("a\n", "a\n"),
|
|
|
|
("a\nb", "a\nb"),
|
|
|
|
]
|
|
|
|
for a, b in cases:
|
|
|
|
self.assert_bdiff(a, b)
|
2005-06-22 05:27:58 +04:00
|
|
|
|
2016-12-15 18:50:06 +03:00
|
|
|
def showdiff(self, a, b):
|
|
|
|
bin = bdiff.bdiff(a, b)
|
|
|
|
pos = 0
|
|
|
|
q = 0
|
|
|
|
actions = []
|
|
|
|
while pos < len(bin):
|
|
|
|
p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
|
|
|
|
pos += 12
|
|
|
|
if p1:
|
|
|
|
actions.append(a[q:p1])
|
|
|
|
actions.append(diffreplace(p1, p2, a[p1:p2], bin[pos:pos + l]))
|
|
|
|
pos += l
|
|
|
|
q = p2
|
|
|
|
if q < len(a):
|
|
|
|
actions.append(a[q:])
|
|
|
|
return actions
|
|
|
|
|
|
|
|
def test_issue1295(self):
|
|
|
|
cases = [
|
|
|
|
("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n",
|
|
|
|
['x\n\nx\n\n', diffreplace(6, 6, '', 'y\n\n'), 'x\n\nx\n\nz\n']),
|
|
|
|
("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n",
|
|
|
|
['x\n\nx\n\n',
|
|
|
|
diffreplace(6, 6, '', 'y\n\n'),
|
|
|
|
'x\n\n',
|
|
|
|
diffreplace(9, 9, '', 'y\n\n'),
|
|
|
|
'x\n\nz\n']),
|
|
|
|
# we should pick up abbbc. rather than bc.de as the longest match
|
|
|
|
("a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n",
|
|
|
|
"a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n",
|
|
|
|
['a\nb\nb\n',
|
|
|
|
diffreplace(6, 6, '', 'a\nb\nb\nb\nc\n.\n'),
|
|
|
|
'b\nc\n.\nd\ne\n',
|
|
|
|
diffreplace(16, 18, '.\n', ''),
|
|
|
|
'f\n']),
|
|
|
|
]
|
|
|
|
for old, new, want in cases:
|
|
|
|
self.assertEqual(self.showdiff(old, new), want)
|
|
|
|
|
2016-12-15 18:56:26 +03:00
|
|
|
def test_fixws(self):
|
|
|
|
cases = [
|
|
|
|
(" \ta\r b\t\n", "ab\n", 1),
|
|
|
|
(" \ta\r b\t\n", " a b\n", 0),
|
|
|
|
("", "", 1),
|
|
|
|
("", "", 0),
|
|
|
|
]
|
|
|
|
for a, b, allws in cases:
|
|
|
|
c = bdiff.fixws(a, allws)
|
|
|
|
self.assertEqual(
|
|
|
|
c, b, 'fixws(%r) want %r got %r (allws=%r)' % (a, b, c, allws))
|
|
|
|
|
2008-10-14 22:13:53 +04:00
|
|
|
def showdiff(a, b):
|
2016-11-15 23:56:49 +03:00
|
|
|
print('showdiff(\n %r,\n %r):' % (a, b))
|
2008-10-14 22:13:53 +04:00
|
|
|
bin = bdiff.bdiff(a, b)
|
|
|
|
pos = 0
|
2016-11-15 23:56:49 +03:00
|
|
|
q = 0
|
2008-10-14 22:13:53 +04:00
|
|
|
while pos < len(bin):
|
|
|
|
p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
|
|
|
|
pos += 12
|
2016-11-15 23:56:49 +03:00
|
|
|
if p1:
|
|
|
|
print('', repr(a[q:p1]))
|
|
|
|
print('', p1, p2, repr(a[p1:p2]), '->', repr(bin[pos:pos + l]))
|
2008-10-14 22:13:53 +04:00
|
|
|
pos += l
|
2016-11-15 23:56:49 +03:00
|
|
|
q = p2
|
|
|
|
if q < len(a):
|
|
|
|
print('', repr(a[q:]))
|
|
|
|
|
2016-11-08 20:37:33 +03:00
|
|
|
print("Nice diff for a trivial change:")
|
2016-11-08 20:37:33 +03:00
|
|
|
showdiff(
|
|
|
|
''.join('<%s\n-\n' % i for i in range(5)),
|
|
|
|
''.join('>%s\n-\n' % i for i in range(5)))
|
|
|
|
|
2016-11-15 23:56:49 +03:00
|
|
|
print("Diff 1 to 3 lines - preference for appending:")
|
2016-11-08 20:37:33 +03:00
|
|
|
showdiff('a\n', 'a\n' * 3)
|
2016-11-15 23:56:49 +03:00
|
|
|
print("Diff 1 to 5 lines - preference for appending:")
|
2016-11-08 20:37:33 +03:00
|
|
|
showdiff('a\n', 'a\n' * 5)
|
2016-11-15 23:56:49 +03:00
|
|
|
print("Diff 3 to 1 lines - preference for removing trailing lines:")
|
2016-11-08 20:37:33 +03:00
|
|
|
showdiff('a\n' * 3, 'a\n')
|
2016-11-15 23:56:49 +03:00
|
|
|
print("Diff 5 to 1 lines - preference for removing trailing lines:")
|
2016-11-08 20:37:33 +03:00
|
|
|
showdiff('a\n' * 5, 'a\n')
|
2016-12-15 18:10:15 +03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
silenttestrunner.main(__name__)
|