1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
# Copyright (C) 2005, 2006 by Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for Knit data structure"""
import difflib
from bzrlib.errors import KnitError, RevisionAlreadyPresent
from bzrlib.knit import KnitVersionedFile, KnitPlainFactory, KnitAnnotateFactory
from bzrlib.osutils import split_lines
from bzrlib.tests import TestCaseInTempDir
from bzrlib.transport.local import LocalTransport
from bzrlib.transport.memory import MemoryTransport
from bzrlib.transactions import PassThroughTransaction
class KnitTests(TestCaseInTempDir):
def add_stock_one_and_one_a(self, k):
k.add_lines('text-1', [], split_lines(TEXT_1))
k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
def test_knit_constructor(self):
"""Construct empty k"""
self.make_test_knit()
def make_test_knit(self, annotate=False):
if not annotate:
factory = KnitPlainFactory()
else:
factory = None
return KnitVersionedFile('test', LocalTransport('.'), access_mode='w', factory=factory, create=True)
def test_knit_add(self):
"""Store one text in knit and retrieve"""
k = self.make_test_knit()
k.add_lines('text-1', [], split_lines(TEXT_1))
self.assertTrue(k.has_version('text-1'))
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
def test_knit_reload(self):
"""Store and reload a knit"""
k = self.make_test_knit()
k.add_lines('text-1', [], split_lines(TEXT_1))
del k
k2 = KnitVersionedFile('test', LocalTransport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
self.assertTrue(k2.has_version('text-1'))
self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
def test_knit_several(self):
"""Store several texts in a knit"""
k = self.make_test_knit()
k.add_lines('text-1', [], split_lines(TEXT_1))
k.add_lines('text-2', [], split_lines(TEXT_2))
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
def test_repeated_add(self):
"""Knit traps attempt to replace existing version"""
k = self.make_test_knit()
k.add_lines('text-1', [], split_lines(TEXT_1))
self.assertRaises(RevisionAlreadyPresent,
k.add_lines,
'text-1', [], split_lines(TEXT_1))
def test_empty(self):
k = self.make_test_knit(True)
k.add_lines('text-1', [], [])
self.assertEquals(k.get_lines('text-1'), [])
def test_incomplete(self):
"""Test if texts without a ending line-end can be inserted and
extracted."""
k = KnitVersionedFile('test', LocalTransport('.'), delta=False, create=True)
k.add_lines('text-1', [], ['a\n', 'b' ])
k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
self.assertEquals(k.get_lines('text-1'), ['a\n', 'b' ])
self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
def test_delta(self):
"""Expression of knit delta as lines"""
k = self.make_test_knit()
td = list(line_delta(TEXT_1.splitlines(True),
TEXT_1A.splitlines(True)))
self.assertEqualDiff(''.join(td), delta_1_1a)
out = apply_line_delta(TEXT_1.splitlines(True), td)
self.assertEqualDiff(''.join(out), TEXT_1A)
def test_add_with_parents(self):
"""Store in knit with parents"""
k = self.make_test_knit()
self.add_stock_one_and_one_a(k)
self.assertEquals(k.get_parents('text-1'), [])
self.assertEquals(k.get_parents('text-1a'), ['text-1'])
def test_ancestry(self):
"""Store in knit with parents"""
k = self.make_test_knit()
self.add_stock_one_and_one_a(k)
self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
def test_add_delta(self):
"""Store in knit with parents"""
k = KnitVersionedFile('test', LocalTransport('.'), factory=KnitPlainFactory(),
delta=True, create=True)
self.add_stock_one_and_one_a(k)
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
def test_annotate(self):
"""Annotations"""
k = KnitVersionedFile('knit', LocalTransport('.'), factory=KnitAnnotateFactory(),
delta=True, create=True)
self.insert_and_test_small_annotate(k)
def insert_and_test_small_annotate(self, k):
"""test annotation with k works correctly."""
k.add_lines('text-1', [], ['a\n', 'b\n'])
k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
origins = k.annotate('text-2')
self.assertEquals(origins[0], ('text-1', 'a\n'))
self.assertEquals(origins[1], ('text-2', 'c\n'))
def test_annotate_fulltext(self):
"""Annotations"""
k = KnitVersionedFile('knit', LocalTransport('.'), factory=KnitAnnotateFactory(),
delta=False, create=True)
self.insert_and_test_small_annotate(k)
def test_annotate_merge_1(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n'])
k.add_lines('text-a2', [], ['d\n', 'c\n'])
k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-a2', 'd\n'))
self.assertEquals(origins[1], ('text-a1', 'b\n'))
def test_annotate_merge_2(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-a1', 'a\n'))
self.assertEquals(origins[1], ('text-a2', 'y\n'))
self.assertEquals(origins[2], ('text-a1', 'c\n'))
def test_annotate_merge_9(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-am', 'k\n'))
self.assertEquals(origins[1], ('text-a2', 'y\n'))
self.assertEquals(origins[2], ('text-a1', 'c\n'))
def test_annotate_merge_3(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-am', 'k\n'))
self.assertEquals(origins[1], ('text-a2', 'y\n'))
self.assertEquals(origins[2], ('text-a2', 'z\n'))
def test_annotate_merge_4(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-a1', 'a\n'))
self.assertEquals(origins[1], ('text-a1', 'b\n'))
self.assertEquals(origins[2], ('text-a2', 'z\n'))
def test_annotate_merge_5(self):
k = self.make_test_knit(True)
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-a2', [], ['d\n', 'e\n', 'f\n'])
k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
k.add_lines('text-am',
['text-a1', 'text-a2', 'text-a3'],
['a\n', 'e\n', 'z\n'])
origins = k.annotate('text-am')
self.assertEquals(origins[0], ('text-a1', 'a\n'))
self.assertEquals(origins[1], ('text-a2', 'e\n'))
self.assertEquals(origins[2], ('text-a3', 'z\n'))
def test_annotate_file_cherry_pick(self):
k = self.make_test_knit(True)
k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
origins = k.annotate('text-3')
self.assertEquals(origins[0], ('text-1', 'a\n'))
self.assertEquals(origins[1], ('text-1', 'b\n'))
self.assertEquals(origins[2], ('text-1', 'c\n'))
def test_knit_join(self):
"""Store in knit with parents"""
k1 = KnitVersionedFile('test1', LocalTransport('.'), factory=KnitPlainFactory(), create=True)
k1.add_lines('text-a', [], split_lines(TEXT_1))
k1.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
k1.add_lines('text-c', [], split_lines(TEXT_1))
k1.add_lines('text-d', ['text-c'], split_lines(TEXT_1))
k1.add_lines('text-m', ['text-b', 'text-d'], split_lines(TEXT_1))
k2 = KnitVersionedFile('test2', LocalTransport('.'), factory=KnitPlainFactory(), create=True)
count = k2.join(k1, version_ids=['text-m'])
self.assertEquals(count, 5)
self.assertTrue(k2.has_version('text-a'))
self.assertTrue(k2.has_version('text-c'))
def test_reannotate(self):
k1 = KnitVersionedFile('knit1', LocalTransport('.'),
factory=KnitAnnotateFactory(), create=True)
# 0
k1.add_lines('text-a', [], ['a\n', 'b\n'])
# 1
k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
k2 = KnitVersionedFile('test2', LocalTransport('.'),
factory=KnitAnnotateFactory(), create=True)
k2.join(k1, version_ids=['text-b'])
# 2
k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
# 2
k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
# 3
k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
# test-c will have index 3
k1.join(k2, version_ids=['text-c'])
lines = k1.get_lines('text-c')
self.assertEquals(lines, ['z\n', 'c\n'])
origins = k1.annotate('text-c')
self.assertEquals(origins[0], ('text-c', 'z\n'))
self.assertEquals(origins[1], ('text-b', 'c\n'))
def test_create_empty_annotated(self):
k1 = self.make_test_knit(True)
# 0
k1.add_lines('text-a', [], ['a\n', 'b\n'])
k2 = k1.create_empty('t', MemoryTransport())
self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
self.assertEqual(k1.delta, k2.delta)
# the generic test checks for empty content and file class
TEXT_1 = """\
Banana cup cakes:
- bananas
- eggs
- broken tea cups
"""
TEXT_1A = """\
Banana cup cake recipe
(serves 6)
- bananas
- eggs
- broken tea cups
- self-raising flour
"""
delta_1_1a = """\
0,1,2
Banana cup cake recipe
(serves 6)
5,5,1
- self-raising flour
"""
TEXT_2 = """\
Boeuf bourguignon
- beef
- red wine
- small onions
- carrot
- mushrooms
"""
def line_delta(from_lines, to_lines):
"""Generate line-based delta from one text to another"""
s = difflib.SequenceMatcher(None, from_lines, to_lines)
for op in s.get_opcodes():
if op[0] == 'equal':
continue
yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
for i in range(op[3], op[4]):
yield to_lines[i]
def apply_line_delta(basis_lines, delta_lines):
"""Apply a line-based perfect diff
basis_lines -- text to apply the patch to
delta_lines -- diff instructions and content
"""
out = basis_lines[:]
i = 0
offset = 0
while i < len(delta_lines):
l = delta_lines[i]
a, b, c = map(long, l.split(','))
i = i + 1
out[offset+a:offset+b] = delta_lines[i:i+c]
i = i + c
offset = offset + (b - a) + c
return out
|