Show More
@@ -1,142 +1,140 b'' | |||||
1 | from __future__ import absolute_import, print_function |
|
1 | from __future__ import absolute_import, print_function | |
2 | import collections |
|
2 | import collections | |
3 | import struct |
|
3 | import struct | |
4 | import unittest |
|
4 | import unittest | |
5 |
|
5 | |||
6 | import silenttestrunner |
|
6 | import silenttestrunner | |
7 |
|
7 | |||
8 | from mercurial import ( |
|
8 | from mercurial import ( | |
9 | bdiff, |
|
9 | bdiff, | |
10 | mpatch, |
|
10 | mpatch, | |
11 | ) |
|
11 | ) | |
12 |
|
12 | |||
13 | class diffreplace( |
|
13 | class diffreplace( | |
14 | collections.namedtuple('diffreplace', 'start end from_ to')): |
|
14 | collections.namedtuple('diffreplace', 'start end from_ to')): | |
15 | def __repr__(self): |
|
15 | def __repr__(self): | |
16 | return 'diffreplace(%r, %r, %r, %r)' % self |
|
16 | return 'diffreplace(%r, %r, %r, %r)' % self | |
17 |
|
17 | |||
18 | class BdiffTests(unittest.TestCase): |
|
18 | class BdiffTests(unittest.TestCase): | |
19 |
|
19 | |||
20 | def assert_bdiff_applies(self, a, b): |
|
20 | def assert_bdiff_applies(self, a, b): | |
21 | d = bdiff.bdiff(a, b) |
|
21 | d = bdiff.bdiff(a, b) | |
22 | c = a |
|
22 | c = a | |
23 | if d: |
|
23 | if d: | |
24 | c = mpatch.patches(a, [d]) |
|
24 | c = mpatch.patches(a, [d]) | |
25 | self.assertEqual( |
|
25 | self.assertEqual( | |
26 | c, b, ("bad diff+patch result from\n %r to\n " |
|
26 | c, b, ("bad diff+patch result from\n %r to\n " | |
27 | "%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200]))) |
|
27 | "%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200]))) | |
28 |
|
28 | |||
29 | def assert_bdiff(self, a, b): |
|
29 | def assert_bdiff(self, a, b): | |
30 | self.assert_bdiff_applies(a, b) |
|
30 | self.assert_bdiff_applies(a, b) | |
31 | self.assert_bdiff_applies(b, a) |
|
31 | self.assert_bdiff_applies(b, a) | |
32 |
|
32 | |||
33 | def test_bdiff_basic(self): |
|
33 | def test_bdiff_basic(self): | |
34 | cases = [ |
|
34 | cases = [ | |
35 | ("a\nc\n\n\n\n", "a\nb\n\n\n"), |
|
35 | ("a\nc\n\n\n\n", "a\nb\n\n\n"), | |
36 | ("a\nb\nc\n", "a\nc\n"), |
|
36 | ("a\nb\nc\n", "a\nc\n"), | |
37 | ("", ""), |
|
37 | ("", ""), | |
38 | ("a\nb\nc", "a\nb\nc"), |
|
38 | ("a\nb\nc", "a\nb\nc"), | |
39 | ("a\nb\nc\nd\n", "a\nd\n"), |
|
39 | ("a\nb\nc\nd\n", "a\nd\n"), | |
40 | ("a\nb\nc\nd\n", "a\nc\ne\n"), |
|
40 | ("a\nb\nc\nd\n", "a\nc\ne\n"), | |
41 | ("a\nb\nc\n", "a\nc\n"), |
|
41 | ("a\nb\nc\n", "a\nc\n"), | |
42 | ("a\n", "c\na\nb\n"), |
|
42 | ("a\n", "c\na\nb\n"), | |
43 | ("a\n", ""), |
|
43 | ("a\n", ""), | |
44 | ("a\n", "b\nc\n"), |
|
44 | ("a\n", "b\nc\n"), | |
45 | ("a\n", "c\na\n"), |
|
45 | ("a\n", "c\na\n"), | |
46 | ("", "adjfkjdjksdhfksj"), |
|
46 | ("", "adjfkjdjksdhfksj"), | |
47 | ("", "ab"), |
|
47 | ("", "ab"), | |
48 | ("", "abc"), |
|
48 | ("", "abc"), | |
49 | ("a", "a"), |
|
49 | ("a", "a"), | |
50 | ("ab", "ab"), |
|
50 | ("ab", "ab"), | |
51 | ("abc", "abc"), |
|
51 | ("abc", "abc"), | |
52 | ("a\n", "a\n"), |
|
52 | ("a\n", "a\n"), | |
53 | ("a\nb", "a\nb"), |
|
53 | ("a\nb", "a\nb"), | |
54 | ] |
|
54 | ] | |
55 | for a, b in cases: |
|
55 | for a, b in cases: | |
56 | self.assert_bdiff(a, b) |
|
56 | self.assert_bdiff(a, b) | |
57 |
|
57 | |||
58 | def showdiff(self, a, b): |
|
58 | def showdiff(self, a, b): | |
59 | bin = bdiff.bdiff(a, b) |
|
59 | bin = bdiff.bdiff(a, b) | |
60 | pos = 0 |
|
60 | pos = 0 | |
61 | q = 0 |
|
61 | q = 0 | |
62 | actions = [] |
|
62 | actions = [] | |
63 | while pos < len(bin): |
|
63 | while pos < len(bin): | |
64 | p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) |
|
64 | p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) | |
65 | pos += 12 |
|
65 | pos += 12 | |
66 | if p1: |
|
66 | if p1: | |
67 | actions.append(a[q:p1]) |
|
67 | actions.append(a[q:p1]) | |
68 | actions.append(diffreplace(p1, p2, a[p1:p2], bin[pos:pos + l])) |
|
68 | actions.append(diffreplace(p1, p2, a[p1:p2], bin[pos:pos + l])) | |
69 | pos += l |
|
69 | pos += l | |
70 | q = p2 |
|
70 | q = p2 | |
71 | if q < len(a): |
|
71 | if q < len(a): | |
72 | actions.append(a[q:]) |
|
72 | actions.append(a[q:]) | |
73 | return actions |
|
73 | return actions | |
74 |
|
74 | |||
75 | def test_issue1295(self): |
|
75 | def test_issue1295(self): | |
76 | cases = [ |
|
76 | cases = [ | |
77 | ("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n", |
|
77 | ("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n", | |
78 | ['x\n\nx\n\n', diffreplace(6, 6, '', 'y\n\n'), 'x\n\nx\n\nz\n']), |
|
78 | ['x\n\nx\n\n', diffreplace(6, 6, '', 'y\n\n'), 'x\n\nx\n\nz\n']), | |
79 | ("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n", |
|
79 | ("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n", | |
80 | ['x\n\nx\n\n', |
|
80 | ['x\n\nx\n\n', | |
81 | diffreplace(6, 6, '', 'y\n\n'), |
|
81 | diffreplace(6, 6, '', 'y\n\n'), | |
82 | 'x\n\n', |
|
82 | 'x\n\n', | |
83 | diffreplace(9, 9, '', 'y\n\n'), |
|
83 | diffreplace(9, 9, '', 'y\n\n'), | |
84 | 'x\n\nz\n']), |
|
84 | 'x\n\nz\n']), | |
85 | # we should pick up abbbc. rather than bc.de as the longest match |
|
85 | # we should pick up abbbc. rather than bc.de as the longest match | |
86 | ("a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n", |
|
86 | ("a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n", | |
87 | "a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n", |
|
87 | "a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n", | |
88 | ['a\nb\nb\n', |
|
88 | ['a\nb\nb\n', | |
89 | diffreplace(6, 6, '', 'a\nb\nb\nb\nc\n.\n'), |
|
89 | diffreplace(6, 6, '', 'a\nb\nb\nb\nc\n.\n'), | |
90 | 'b\nc\n.\nd\ne\n', |
|
90 | 'b\nc\n.\nd\ne\n', | |
91 | diffreplace(16, 18, '.\n', ''), |
|
91 | diffreplace(16, 18, '.\n', ''), | |
92 | 'f\n']), |
|
92 | 'f\n']), | |
93 | ] |
|
93 | ] | |
94 | for old, new, want in cases: |
|
94 | for old, new, want in cases: | |
95 | self.assertEqual(self.showdiff(old, new), want) |
|
95 | self.assertEqual(self.showdiff(old, new), want) | |
96 |
|
96 | |||
|
97 | def test_fixws(self): | |||
|
98 | cases = [ | |||
|
99 | (" \ta\r b\t\n", "ab\n", 1), | |||
|
100 | (" \ta\r b\t\n", " a b\n", 0), | |||
|
101 | ("", "", 1), | |||
|
102 | ("", "", 0), | |||
|
103 | ] | |||
|
104 | for a, b, allws in cases: | |||
|
105 | c = bdiff.fixws(a, allws) | |||
|
106 | self.assertEqual( | |||
|
107 | c, b, 'fixws(%r) want %r got %r (allws=%r)' % (a, b, c, allws)) | |||
|
108 | ||||
97 | def showdiff(a, b): |
|
109 | def showdiff(a, b): | |
98 | print('showdiff(\n %r,\n %r):' % (a, b)) |
|
110 | print('showdiff(\n %r,\n %r):' % (a, b)) | |
99 | bin = bdiff.bdiff(a, b) |
|
111 | bin = bdiff.bdiff(a, b) | |
100 | pos = 0 |
|
112 | pos = 0 | |
101 | q = 0 |
|
113 | q = 0 | |
102 | while pos < len(bin): |
|
114 | while pos < len(bin): | |
103 | p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) |
|
115 | p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) | |
104 | pos += 12 |
|
116 | pos += 12 | |
105 | if p1: |
|
117 | if p1: | |
106 | print('', repr(a[q:p1])) |
|
118 | print('', repr(a[q:p1])) | |
107 | print('', p1, p2, repr(a[p1:p2]), '->', repr(bin[pos:pos + l])) |
|
119 | print('', p1, p2, repr(a[p1:p2]), '->', repr(bin[pos:pos + l])) | |
108 | pos += l |
|
120 | pos += l | |
109 | q = p2 |
|
121 | q = p2 | |
110 | if q < len(a): |
|
122 | if q < len(a): | |
111 | print('', repr(a[q:])) |
|
123 | print('', repr(a[q:])) | |
112 |
|
124 | |||
113 | def testfixws(a, b, allws): |
|
|||
114 | c = bdiff.fixws(a, allws) |
|
|||
115 | if c != b: |
|
|||
116 | print("*** fixws", repr(a), repr(b), allws) |
|
|||
117 | print("got:") |
|
|||
118 | print(repr(c)) |
|
|||
119 |
|
||||
120 | testfixws(" \ta\r b\t\n", "ab\n", 1) |
|
|||
121 | testfixws(" \ta\r b\t\n", " a b\n", 0) |
|
|||
122 | testfixws("", "", 1) |
|
|||
123 | testfixws("", "", 0) |
|
|||
124 |
|
||||
125 | print("done") |
|
|||
126 |
|
||||
127 | print("Nice diff for a trivial change:") |
|
125 | print("Nice diff for a trivial change:") | |
128 | showdiff( |
|
126 | showdiff( | |
129 | ''.join('<%s\n-\n' % i for i in range(5)), |
|
127 | ''.join('<%s\n-\n' % i for i in range(5)), | |
130 | ''.join('>%s\n-\n' % i for i in range(5))) |
|
128 | ''.join('>%s\n-\n' % i for i in range(5))) | |
131 |
|
129 | |||
132 | print("Diff 1 to 3 lines - preference for appending:") |
|
130 | print("Diff 1 to 3 lines - preference for appending:") | |
133 | showdiff('a\n', 'a\n' * 3) |
|
131 | showdiff('a\n', 'a\n' * 3) | |
134 | print("Diff 1 to 5 lines - preference for appending:") |
|
132 | print("Diff 1 to 5 lines - preference for appending:") | |
135 | showdiff('a\n', 'a\n' * 5) |
|
133 | showdiff('a\n', 'a\n' * 5) | |
136 | print("Diff 3 to 1 lines - preference for removing trailing lines:") |
|
134 | print("Diff 3 to 1 lines - preference for removing trailing lines:") | |
137 | showdiff('a\n' * 3, 'a\n') |
|
135 | showdiff('a\n' * 3, 'a\n') | |
138 | print("Diff 5 to 1 lines - preference for removing trailing lines:") |
|
136 | print("Diff 5 to 1 lines - preference for removing trailing lines:") | |
139 | showdiff('a\n' * 5, 'a\n') |
|
137 | showdiff('a\n' * 5, 'a\n') | |
140 |
|
138 | |||
141 | if __name__ == '__main__': |
|
139 | if __name__ == '__main__': | |
142 | silenttestrunner.main(__name__) |
|
140 | silenttestrunner.main(__name__) |
@@ -1,39 +1,38 b'' | |||||
1 | done |
|
|||
2 | Nice diff for a trivial change: |
|
1 | Nice diff for a trivial change: | |
3 | showdiff( |
|
2 | showdiff( | |
4 | '<0\n-\n<1\n-\n<2\n-\n<3\n-\n<4\n-\n', |
|
3 | '<0\n-\n<1\n-\n<2\n-\n<3\n-\n<4\n-\n', | |
5 | '>0\n-\n>1\n-\n>2\n-\n>3\n-\n>4\n-\n'): |
|
4 | '>0\n-\n>1\n-\n>2\n-\n>3\n-\n>4\n-\n'): | |
6 | 0 3 '<0\n' -> '>0\n' |
|
5 | 0 3 '<0\n' -> '>0\n' | |
7 | '-\n' |
|
6 | '-\n' | |
8 | 5 8 '<1\n' -> '>1\n' |
|
7 | 5 8 '<1\n' -> '>1\n' | |
9 | '-\n' |
|
8 | '-\n' | |
10 | 10 13 '<2\n' -> '>2\n' |
|
9 | 10 13 '<2\n' -> '>2\n' | |
11 | '-\n' |
|
10 | '-\n' | |
12 | 15 18 '<3\n' -> '>3\n' |
|
11 | 15 18 '<3\n' -> '>3\n' | |
13 | '-\n' |
|
12 | '-\n' | |
14 | 20 23 '<4\n' -> '>4\n' |
|
13 | 20 23 '<4\n' -> '>4\n' | |
15 | '-\n' |
|
14 | '-\n' | |
16 | Diff 1 to 3 lines - preference for appending: |
|
15 | Diff 1 to 3 lines - preference for appending: | |
17 | showdiff( |
|
16 | showdiff( | |
18 | 'a\n', |
|
17 | 'a\n', | |
19 | 'a\na\na\n'): |
|
18 | 'a\na\na\n'): | |
20 | 'a\n' |
|
19 | 'a\n' | |
21 | 2 2 '' -> 'a\na\n' |
|
20 | 2 2 '' -> 'a\na\n' | |
22 | Diff 1 to 5 lines - preference for appending: |
|
21 | Diff 1 to 5 lines - preference for appending: | |
23 | showdiff( |
|
22 | showdiff( | |
24 | 'a\n', |
|
23 | 'a\n', | |
25 | 'a\na\na\na\na\n'): |
|
24 | 'a\na\na\na\na\n'): | |
26 | 'a\n' |
|
25 | 'a\n' | |
27 | 2 2 '' -> 'a\na\na\na\n' |
|
26 | 2 2 '' -> 'a\na\na\na\n' | |
28 | Diff 3 to 1 lines - preference for removing trailing lines: |
|
27 | Diff 3 to 1 lines - preference for removing trailing lines: | |
29 | showdiff( |
|
28 | showdiff( | |
30 | 'a\na\na\n', |
|
29 | 'a\na\na\n', | |
31 | 'a\n'): |
|
30 | 'a\n'): | |
32 | 'a\n' |
|
31 | 'a\n' | |
33 | 2 6 'a\na\n' -> '' |
|
32 | 2 6 'a\na\n' -> '' | |
34 | Diff 5 to 1 lines - preference for removing trailing lines: |
|
33 | Diff 5 to 1 lines - preference for removing trailing lines: | |
35 | showdiff( |
|
34 | showdiff( | |
36 | 'a\na\na\na\na\n', |
|
35 | 'a\na\na\na\na\n', | |
37 | 'a\n'): |
|
36 | 'a\n'): | |
38 | 'a\n' |
|
37 | 'a\n' | |
39 | 2 10 'a\na\na\na\n' -> '' |
|
38 | 2 10 'a\na\na\na\n' -> '' |
General Comments 0
You need to be logged in to leave comments.
Login now