1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Tests for Knit data structure"""
19
from cStringIO import StringIO
31
from bzrlib.errors import (
32
RevisionAlreadyPresent,
37
from bzrlib.index import *
38
from bzrlib.knit import (
53
from bzrlib.osutils import split_lines
54
from bzrlib.tests import (
57
TestCaseWithMemoryTransport,
58
TestCaseWithTransport,
60
from bzrlib.transport import TransportLogger, get_transport
61
from bzrlib.transport.memory import MemoryTransport
62
from bzrlib.util import bencode
63
from bzrlib.weave import Weave
66
class _CompiledKnitFeature(Feature):
70
import bzrlib._knit_load_data_c
75
def feature_name(self):
76
return 'bzrlib._knit_load_data_c'
78
CompiledKnitFeature = _CompiledKnitFeature()
81
class KnitContentTestsMixin(object):
83
def test_constructor(self):
84
content = self._make_content([])
87
content = self._make_content([])
88
self.assertEqual(content.text(), [])
90
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
91
self.assertEqual(content.text(), ["text1", "text2"])
94
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
96
self.assertIsInstance(copy, content.__class__)
97
self.assertEqual(copy.annotate(), content.annotate())
99
def assertDerivedBlocksEqual(self, source, target, noeol=False):
100
"""Assert that the derived matching blocks match real output"""
101
source_lines = source.splitlines(True)
102
target_lines = target.splitlines(True)
104
if noeol and not line.endswith('\n'):
108
source_content = self._make_content([(None, nl(l)) for l in source_lines])
109
target_content = self._make_content([(None, nl(l)) for l in target_lines])
110
line_delta = source_content.line_delta(target_content)
111
delta_blocks = list(KnitContent.get_line_delta_blocks(line_delta,
112
source_lines, target_lines))
113
matcher = KnitSequenceMatcher(None, source_lines, target_lines)
114
matcher_blocks = list(list(matcher.get_matching_blocks()))
115
self.assertEqual(matcher_blocks, delta_blocks)
117
def test_get_line_delta_blocks(self):
118
self.assertDerivedBlocksEqual('a\nb\nc\n', 'q\nc\n')
119
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1)
120
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1A)
121
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1B)
122
self.assertDerivedBlocksEqual(TEXT_1B, TEXT_1A)
123
self.assertDerivedBlocksEqual(TEXT_1A, TEXT_1B)
124
self.assertDerivedBlocksEqual(TEXT_1A, '')
125
self.assertDerivedBlocksEqual('', TEXT_1A)
126
self.assertDerivedBlocksEqual('', '')
127
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd')
129
def test_get_line_delta_blocks_noeol(self):
130
"""Handle historical knit deltas safely
132
Some existing knit deltas don't consider the last line to differ
133
when the only difference whether it has a final newline.
135
New knit deltas appear to always consider the last line to differ
138
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd\n', noeol=True)
139
self.assertDerivedBlocksEqual('a\nb\nc\nd\n', 'a\nb\nc', noeol=True)
140
self.assertDerivedBlocksEqual('a\nb\nc\n', 'a\nb\nc', noeol=True)
141
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\n', noeol=True)
144
class TestPlainKnitContent(TestCase, KnitContentTestsMixin):
146
def _make_content(self, lines):
147
annotated_content = AnnotatedKnitContent(lines)
148
return PlainKnitContent(annotated_content.text(), 'bogus')
150
def test_annotate(self):
151
content = self._make_content([])
152
self.assertEqual(content.annotate(), [])
154
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
155
self.assertEqual(content.annotate(),
156
[("bogus", "text1"), ("bogus", "text2")])
158
def test_annotate_iter(self):
159
content = self._make_content([])
160
it = content.annotate_iter()
161
self.assertRaises(StopIteration, it.next)
163
content = self._make_content([("bogus", "text1"), ("bogus", "text2")])
164
it = content.annotate_iter()
165
self.assertEqual(it.next(), ("bogus", "text1"))
166
self.assertEqual(it.next(), ("bogus", "text2"))
167
self.assertRaises(StopIteration, it.next)
169
def test_line_delta(self):
170
content1 = self._make_content([("", "a"), ("", "b")])
171
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
172
self.assertEqual(content1.line_delta(content2),
173
[(1, 2, 2, ["a", "c"])])
175
def test_line_delta_iter(self):
176
content1 = self._make_content([("", "a"), ("", "b")])
177
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
178
it = content1.line_delta_iter(content2)
179
self.assertEqual(it.next(), (1, 2, 2, ["a", "c"]))
180
self.assertRaises(StopIteration, it.next)
183
class TestAnnotatedKnitContent(TestCase, KnitContentTestsMixin):
185
def _make_content(self, lines):
186
return AnnotatedKnitContent(lines)
188
def test_annotate(self):
189
content = self._make_content([])
190
self.assertEqual(content.annotate(), [])
192
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
193
self.assertEqual(content.annotate(),
194
[("origin1", "text1"), ("origin2", "text2")])
196
def test_annotate_iter(self):
197
content = self._make_content([])
198
it = content.annotate_iter()
199
self.assertRaises(StopIteration, it.next)
201
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
202
it = content.annotate_iter()
203
self.assertEqual(it.next(), ("origin1", "text1"))
204
self.assertEqual(it.next(), ("origin2", "text2"))
205
self.assertRaises(StopIteration, it.next)
207
def test_line_delta(self):
208
content1 = self._make_content([("", "a"), ("", "b")])
209
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
210
self.assertEqual(content1.line_delta(content2),
211
[(1, 2, 2, [("", "a"), ("", "c")])])
213
def test_line_delta_iter(self):
214
content1 = self._make_content([("", "a"), ("", "b")])
215
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
216
it = content1.line_delta_iter(content2)
217
self.assertEqual(it.next(), (1, 2, 2, [("", "a"), ("", "c")]))
218
self.assertRaises(StopIteration, it.next)
221
class MockTransport(object):
223
def __init__(self, file_lines=None):
224
self.file_lines = file_lines
226
# We have no base directory for the MockTransport
229
def get(self, filename):
230
if self.file_lines is None:
231
raise NoSuchFile(filename)
233
return StringIO("\n".join(self.file_lines))
235
def readv(self, relpath, offsets):
236
fp = self.get(relpath)
237
for offset, size in offsets:
239
yield offset, fp.read(size)
241
def __getattr__(self, name):
242
def queue_call(*args, **kwargs):
243
self.calls.append((name, args, kwargs))
247
class KnitRecordAccessTestsMixin(object):
248
"""Tests for getting and putting knit records."""
250
def assertAccessExists(self, access):
251
"""Ensure the data area for access has been initialised/exists."""
252
raise NotImplementedError(self.assertAccessExists)
254
def test_add_raw_records(self):
255
"""Add_raw_records adds records retrievable later."""
256
access = self.get_access()
257
memos = access.add_raw_records([10], '1234567890')
258
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
260
def test_add_several_raw_records(self):
261
"""add_raw_records with many records and read some back."""
262
access = self.get_access()
263
memos = access.add_raw_records([10, 2, 5], '12345678901234567')
264
self.assertEqual(['1234567890', '12', '34567'],
265
list(access.get_raw_records(memos)))
266
self.assertEqual(['1234567890'],
267
list(access.get_raw_records(memos[0:1])))
268
self.assertEqual(['12'],
269
list(access.get_raw_records(memos[1:2])))
270
self.assertEqual(['34567'],
271
list(access.get_raw_records(memos[2:3])))
272
self.assertEqual(['1234567890', '34567'],
273
list(access.get_raw_records(memos[0:1] + memos[2:3])))
275
def test_create(self):
276
"""create() should make a file on disk."""
277
access = self.get_access()
279
self.assertAccessExists(access)
281
def test_open_file(self):
282
"""open_file never errors."""
283
access = self.get_access()
287
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
288
"""Tests for the .kndx implementation."""
290
def assertAccessExists(self, access):
291
self.assertNotEqual(None, access.open_file())
293
def get_access(self):
294
"""Get a .knit style access instance."""
295
access = _KnitAccess(self.get_transport(), "foo.knit", None, None,
300
class TestPackKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
301
"""Tests for the pack based access."""
303
def assertAccessExists(self, access):
304
# as pack based access has no backing unless an index maps data, this
308
def get_access(self):
309
return self._get_access()[0]
311
def _get_access(self, packname='packfile', index='FOO'):
312
transport = self.get_transport()
313
def write_data(bytes):
314
transport.append_bytes(packname, bytes)
315
writer = pack.ContainerWriter(write_data)
317
indices = {index:(transport, packname)}
318
access = _PackAccess(indices, writer=(writer, index))
319
return access, writer
321
def test_read_from_several_packs(self):
322
access, writer = self._get_access()
324
memos.extend(access.add_raw_records([10], '1234567890'))
326
access, writer = self._get_access('pack2', 'FOOBAR')
327
memos.extend(access.add_raw_records([5], '12345'))
329
access, writer = self._get_access('pack3', 'BAZ')
330
memos.extend(access.add_raw_records([5], 'alpha'))
332
transport = self.get_transport()
333
access = _PackAccess({"FOO":(transport, 'packfile'),
334
"FOOBAR":(transport, 'pack2'),
335
"BAZ":(transport, 'pack3')})
336
self.assertEqual(['1234567890', '12345', 'alpha'],
337
list(access.get_raw_records(memos)))
338
self.assertEqual(['1234567890'],
339
list(access.get_raw_records(memos[0:1])))
340
self.assertEqual(['12345'],
341
list(access.get_raw_records(memos[1:2])))
342
self.assertEqual(['alpha'],
343
list(access.get_raw_records(memos[2:3])))
344
self.assertEqual(['1234567890', 'alpha'],
345
list(access.get_raw_records(memos[0:1] + memos[2:3])))
347
def test_set_writer(self):
348
"""The writer should be settable post construction."""
349
access = _PackAccess({})
350
transport = self.get_transport()
351
packname = 'packfile'
353
def write_data(bytes):
354
transport.append_bytes(packname, bytes)
355
writer = pack.ContainerWriter(write_data)
357
access.set_writer(writer, index, (transport, packname))
358
memos = access.add_raw_records([10], '1234567890')
360
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
363
class LowLevelKnitDataTests(TestCase):
365
def create_gz_content(self, text):
367
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
370
return sio.getvalue()
372
def test_valid_knit_data(self):
373
sha1sum = sha.new('foo\nbar\n').hexdigest()
374
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
379
transport = MockTransport([gz_txt])
380
access = _KnitAccess(transport, 'filename', None, None, False, False)
381
data = _KnitData(access=access)
382
records = [('rev-id-1', (None, 0, len(gz_txt)))]
384
contents = data.read_records(records)
385
self.assertEqual({'rev-id-1':(['foo\n', 'bar\n'], sha1sum)}, contents)
387
raw_contents = list(data.read_records_iter_raw(records))
388
self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
390
def test_not_enough_lines(self):
391
sha1sum = sha.new('foo\n').hexdigest()
392
# record says 2 lines data says 1
393
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
397
transport = MockTransport([gz_txt])
398
access = _KnitAccess(transport, 'filename', None, None, False, False)
399
data = _KnitData(access=access)
400
records = [('rev-id-1', (None, 0, len(gz_txt)))]
401
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
403
# read_records_iter_raw won't detect that sort of mismatch/corruption
404
raw_contents = list(data.read_records_iter_raw(records))
405
self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
407
def test_too_many_lines(self):
408
sha1sum = sha.new('foo\nbar\n').hexdigest()
409
# record says 1 lines data says 2
410
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
415
transport = MockTransport([gz_txt])
416
access = _KnitAccess(transport, 'filename', None, None, False, False)
417
data = _KnitData(access=access)
418
records = [('rev-id-1', (None, 0, len(gz_txt)))]
419
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
421
# read_records_iter_raw won't detect that sort of mismatch/corruption
422
raw_contents = list(data.read_records_iter_raw(records))
423
self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
425
def test_mismatched_version_id(self):
426
sha1sum = sha.new('foo\nbar\n').hexdigest()
427
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
432
transport = MockTransport([gz_txt])
433
access = _KnitAccess(transport, 'filename', None, None, False, False)
434
data = _KnitData(access=access)
435
# We are asking for rev-id-2, but the data is rev-id-1
436
records = [('rev-id-2', (None, 0, len(gz_txt)))]
437
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
439
# read_records_iter_raw will notice if we request the wrong version.
440
self.assertRaises(errors.KnitCorrupt, list,
441
data.read_records_iter_raw(records))
443
def test_uncompressed_data(self):
444
sha1sum = sha.new('foo\nbar\n').hexdigest()
445
txt = ('version rev-id-1 2 %s\n'
450
transport = MockTransport([txt])
451
access = _KnitAccess(transport, 'filename', None, None, False, False)
452
data = _KnitData(access=access)
453
records = [('rev-id-1', (None, 0, len(txt)))]
455
# We don't have valid gzip data ==> corrupt
456
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
458
# read_records_iter_raw will notice the bad data
459
self.assertRaises(errors.KnitCorrupt, list,
460
data.read_records_iter_raw(records))
462
def test_corrupted_data(self):
463
sha1sum = sha.new('foo\nbar\n').hexdigest()
464
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
469
# Change 2 bytes in the middle to \xff
470
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
471
transport = MockTransport([gz_txt])
472
access = _KnitAccess(transport, 'filename', None, None, False, False)
473
data = _KnitData(access=access)
474
records = [('rev-id-1', (None, 0, len(gz_txt)))]
476
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
478
# read_records_iter_raw will notice if we request the wrong version.
479
self.assertRaises(errors.KnitCorrupt, list,
480
data.read_records_iter_raw(records))
483
class LowLevelKnitIndexTests(TestCase):
485
def get_knit_index(self, *args, **kwargs):
486
orig = knit._load_data
488
knit._load_data = orig
489
self.addCleanup(reset)
490
from bzrlib._knit_load_data_py import _load_data_py
491
knit._load_data = _load_data_py
492
return _KnitIndex(*args, **kwargs)
494
def test_no_such_file(self):
495
transport = MockTransport()
497
self.assertRaises(NoSuchFile, self.get_knit_index,
498
transport, "filename", "r")
499
self.assertRaises(NoSuchFile, self.get_knit_index,
500
transport, "filename", "w", create=False)
502
def test_create_file(self):
503
transport = MockTransport()
505
index = self.get_knit_index(transport, "filename", "w",
506
file_mode="wb", create=True)
508
("put_bytes_non_atomic",
509
("filename", index.HEADER), {"mode": "wb"}),
510
transport.calls.pop(0))
512
def test_delay_create_file(self):
513
transport = MockTransport()
515
index = self.get_knit_index(transport, "filename", "w",
516
create=True, file_mode="wb", create_parent_dir=True,
517
delay_create=True, dir_mode=0777)
518
self.assertEqual([], transport.calls)
520
index.add_versions([])
521
name, (filename, f), kwargs = transport.calls.pop(0)
522
self.assertEqual("put_file_non_atomic", name)
524
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
526
self.assertEqual("filename", filename)
527
self.assertEqual(index.HEADER, f.read())
529
index.add_versions([])
530
self.assertEqual(("append_bytes", ("filename", ""), {}),
531
transport.calls.pop(0))
533
def test_read_utf8_version_id(self):
534
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
535
utf8_revision_id = unicode_revision_id.encode('utf-8')
536
transport = MockTransport([
538
'%s option 0 1 :' % (utf8_revision_id,)
540
index = self.get_knit_index(transport, "filename", "r")
541
# _KnitIndex is a private class, and deals in utf8 revision_ids, not
542
# Unicode revision_ids.
543
self.assertTrue(index.has_version(utf8_revision_id))
544
self.assertFalse(index.has_version(unicode_revision_id))
546
def test_read_utf8_parents(self):
547
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
548
utf8_revision_id = unicode_revision_id.encode('utf-8')
549
transport = MockTransport([
551
"version option 0 1 .%s :" % (utf8_revision_id,)
553
index = self.get_knit_index(transport, "filename", "r")
554
self.assertEqual([utf8_revision_id],
555
index.get_parents_with_ghosts("version"))
557
def test_read_ignore_corrupted_lines(self):
558
transport = MockTransport([
561
"corrupted options 0 1 .b .c ",
562
"version options 0 1 :"
564
index = self.get_knit_index(transport, "filename", "r")
565
self.assertEqual(1, index.num_versions())
566
self.assertTrue(index.has_version("version"))
568
def test_read_corrupted_header(self):
569
transport = MockTransport(['not a bzr knit index header\n'])
570
self.assertRaises(KnitHeaderError,
571
self.get_knit_index, transport, "filename", "r")
573
def test_read_duplicate_entries(self):
574
transport = MockTransport([
576
"parent options 0 1 :",
577
"version options1 0 1 0 :",
578
"version options2 1 2 .other :",
579
"version options3 3 4 0 .other :"
581
index = self.get_knit_index(transport, "filename", "r")
582
self.assertEqual(2, index.num_versions())
583
# check that the index used is the first one written. (Specific
584
# to KnitIndex style indices.
585
self.assertEqual("1", index._version_list_to_index(["version"]))
586
self.assertEqual((None, 3, 4), index.get_position("version"))
587
self.assertEqual(["options3"], index.get_options("version"))
588
self.assertEqual(["parent", "other"],
589
index.get_parents_with_ghosts("version"))
591
def test_read_compressed_parents(self):
592
transport = MockTransport([
596
"c option 0 1 1 0 :",
598
index = self.get_knit_index(transport, "filename", "r")
599
self.assertEqual(["a"], index.get_parents("b"))
600
self.assertEqual(["b", "a"], index.get_parents("c"))
602
def test_write_utf8_version_id(self):
603
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
604
utf8_revision_id = unicode_revision_id.encode('utf-8')
605
transport = MockTransport([
608
index = self.get_knit_index(transport, "filename", "r")
609
index.add_version(utf8_revision_id, ["option"], (None, 0, 1), [])
610
self.assertEqual(("append_bytes", ("filename",
611
"\n%s option 0 1 :" % (utf8_revision_id,)),
613
transport.calls.pop(0))
615
def test_write_utf8_parents(self):
616
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
617
utf8_revision_id = unicode_revision_id.encode('utf-8')
618
transport = MockTransport([
621
index = self.get_knit_index(transport, "filename", "r")
622
index.add_version("version", ["option"], (None, 0, 1), [utf8_revision_id])
623
self.assertEqual(("append_bytes", ("filename",
624
"\nversion option 0 1 .%s :" % (utf8_revision_id,)),
626
transport.calls.pop(0))
628
def test_get_graph(self):
629
transport = MockTransport()
630
index = self.get_knit_index(transport, "filename", "w", create=True)
631
self.assertEqual([], index.get_graph())
633
index.add_version("a", ["option"], (None, 0, 1), ["b"])
634
self.assertEqual([("a", ["b"])], index.get_graph())
636
index.add_version("c", ["option"], (None, 0, 1), ["d"])
637
self.assertEqual([("a", ["b"]), ("c", ["d"])],
638
sorted(index.get_graph()))
640
def test_get_ancestry(self):
641
transport = MockTransport([
644
"b option 0 1 0 .e :",
645
"c option 0 1 1 0 :",
646
"d option 0 1 2 .f :"
648
index = self.get_knit_index(transport, "filename", "r")
650
self.assertEqual([], index.get_ancestry([]))
651
self.assertEqual(["a"], index.get_ancestry(["a"]))
652
self.assertEqual(["a", "b"], index.get_ancestry(["b"]))
653
self.assertEqual(["a", "b", "c"], index.get_ancestry(["c"]))
654
self.assertEqual(["a", "b", "c", "d"], index.get_ancestry(["d"]))
655
self.assertEqual(["a", "b"], index.get_ancestry(["a", "b"]))
656
self.assertEqual(["a", "b", "c"], index.get_ancestry(["a", "c"]))
658
self.assertRaises(RevisionNotPresent, index.get_ancestry, ["e"])
660
def test_get_ancestry_with_ghosts(self):
661
transport = MockTransport([
664
"b option 0 1 0 .e :",
665
"c option 0 1 0 .f .g :",
666
"d option 0 1 2 .h .j .k :"
668
index = self.get_knit_index(transport, "filename", "r")
670
self.assertEqual([], index.get_ancestry_with_ghosts([]))
671
self.assertEqual(["a"], index.get_ancestry_with_ghosts(["a"]))
672
self.assertEqual(["a", "e", "b"],
673
index.get_ancestry_with_ghosts(["b"]))
674
self.assertEqual(["a", "g", "f", "c"],
675
index.get_ancestry_with_ghosts(["c"]))
676
self.assertEqual(["a", "g", "f", "c", "k", "j", "h", "d"],
677
index.get_ancestry_with_ghosts(["d"]))
678
self.assertEqual(["a", "e", "b"],
679
index.get_ancestry_with_ghosts(["a", "b"]))
680
self.assertEqual(["a", "g", "f", "c"],
681
index.get_ancestry_with_ghosts(["a", "c"]))
683
["a", "g", "f", "c", "e", "b", "k", "j", "h", "d"],
684
index.get_ancestry_with_ghosts(["b", "d"]))
686
self.assertRaises(RevisionNotPresent,
687
index.get_ancestry_with_ghosts, ["e"])
689
def test_iter_parents(self):
690
transport = MockTransport()
691
index = self.get_knit_index(transport, "filename", "w", create=True)
693
index.add_version('r0', ['option'], (None, 0, 1), [])
695
index.add_version('r1', ['option'], (None, 0, 1), ['r0'])
697
index.add_version('r2', ['option'], (None, 0, 1), ['r1', 'r0'])
699
# cases: each sample data individually:
700
self.assertEqual(set([('r0', ())]),
701
set(index.iter_parents(['r0'])))
702
self.assertEqual(set([('r1', ('r0', ))]),
703
set(index.iter_parents(['r1'])))
704
self.assertEqual(set([('r2', ('r1', 'r0'))]),
705
set(index.iter_parents(['r2'])))
706
# no nodes returned for a missing node
707
self.assertEqual(set(),
708
set(index.iter_parents(['missing'])))
709
# 1 node returned with missing nodes skipped
710
self.assertEqual(set([('r1', ('r0', ))]),
711
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
713
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
714
set(index.iter_parents(['r0', 'r1'])))
715
# 2 nodes returned, missing skipped
716
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
717
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
719
def test_num_versions(self):
720
transport = MockTransport([
723
index = self.get_knit_index(transport, "filename", "r")
725
self.assertEqual(0, index.num_versions())
726
self.assertEqual(0, len(index))
728
index.add_version("a", ["option"], (None, 0, 1), [])
729
self.assertEqual(1, index.num_versions())
730
self.assertEqual(1, len(index))
732
index.add_version("a", ["option2"], (None, 1, 2), [])
733
self.assertEqual(1, index.num_versions())
734
self.assertEqual(1, len(index))
736
index.add_version("b", ["option"], (None, 0, 1), [])
737
self.assertEqual(2, index.num_versions())
738
self.assertEqual(2, len(index))
740
def test_get_versions(self):
741
transport = MockTransport([
744
index = self.get_knit_index(transport, "filename", "r")
746
self.assertEqual([], index.get_versions())
748
index.add_version("a", ["option"], (None, 0, 1), [])
749
self.assertEqual(["a"], index.get_versions())
751
index.add_version("a", ["option"], (None, 0, 1), [])
752
self.assertEqual(["a"], index.get_versions())
754
index.add_version("b", ["option"], (None, 0, 1), [])
755
self.assertEqual(["a", "b"], index.get_versions())
757
def test_add_version(self):
758
transport = MockTransport([
761
index = self.get_knit_index(transport, "filename", "r")
763
index.add_version("a", ["option"], (None, 0, 1), ["b"])
764
self.assertEqual(("append_bytes",
765
("filename", "\na option 0 1 .b :"),
766
{}), transport.calls.pop(0))
767
self.assertTrue(index.has_version("a"))
768
self.assertEqual(1, index.num_versions())
769
self.assertEqual((None, 0, 1), index.get_position("a"))
770
self.assertEqual(["option"], index.get_options("a"))
771
self.assertEqual(["b"], index.get_parents_with_ghosts("a"))
773
index.add_version("a", ["opt"], (None, 1, 2), ["c"])
774
self.assertEqual(("append_bytes",
775
("filename", "\na opt 1 2 .c :"),
776
{}), transport.calls.pop(0))
777
self.assertTrue(index.has_version("a"))
778
self.assertEqual(1, index.num_versions())
779
self.assertEqual((None, 1, 2), index.get_position("a"))
780
self.assertEqual(["opt"], index.get_options("a"))
781
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
783
index.add_version("b", ["option"], (None, 2, 3), ["a"])
784
self.assertEqual(("append_bytes",
785
("filename", "\nb option 2 3 0 :"),
786
{}), transport.calls.pop(0))
787
self.assertTrue(index.has_version("b"))
788
self.assertEqual(2, index.num_versions())
789
self.assertEqual((None, 2, 3), index.get_position("b"))
790
self.assertEqual(["option"], index.get_options("b"))
791
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
793
def test_add_versions(self):
794
transport = MockTransport([
797
index = self.get_knit_index(transport, "filename", "r")
800
("a", ["option"], (None, 0, 1), ["b"]),
801
("a", ["opt"], (None, 1, 2), ["c"]),
802
("b", ["option"], (None, 2, 3), ["a"])
804
self.assertEqual(("append_bytes", ("filename",
805
"\na option 0 1 .b :"
808
), {}), transport.calls.pop(0))
809
self.assertTrue(index.has_version("a"))
810
self.assertTrue(index.has_version("b"))
811
self.assertEqual(2, index.num_versions())
812
self.assertEqual((None, 1, 2), index.get_position("a"))
813
self.assertEqual((None, 2, 3), index.get_position("b"))
814
self.assertEqual(["opt"], index.get_options("a"))
815
self.assertEqual(["option"], index.get_options("b"))
816
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
817
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
819
def test_add_versions_random_id_is_accepted(self):
820
transport = MockTransport([
823
index = self.get_knit_index(transport, "filename", "r")
826
("a", ["option"], (None, 0, 1), ["b"]),
827
("a", ["opt"], (None, 1, 2), ["c"]),
828
("b", ["option"], (None, 2, 3), ["a"])
831
def test_delay_create_and_add_versions(self):
832
transport = MockTransport()
834
index = self.get_knit_index(transport, "filename", "w",
835
create=True, file_mode="wb", create_parent_dir=True,
836
delay_create=True, dir_mode=0777)
837
self.assertEqual([], transport.calls)
840
("a", ["option"], (None, 0, 1), ["b"]),
841
("a", ["opt"], (None, 1, 2), ["c"]),
842
("b", ["option"], (None, 2, 3), ["a"])
844
name, (filename, f), kwargs = transport.calls.pop(0)
845
self.assertEqual("put_file_non_atomic", name)
847
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
849
self.assertEqual("filename", filename)
852
"\na option 0 1 .b :"
854
"\nb option 2 3 0 :",
857
def test_has_version(self):
858
transport = MockTransport([
862
index = self.get_knit_index(transport, "filename", "r")
864
self.assertTrue(index.has_version("a"))
865
self.assertFalse(index.has_version("b"))
867
def test_get_position(self):
868
transport = MockTransport([
873
index = self.get_knit_index(transport, "filename", "r")
875
self.assertEqual((None, 0, 1), index.get_position("a"))
876
self.assertEqual((None, 1, 2), index.get_position("b"))
878
def test_get_method(self):
879
transport = MockTransport([
881
"a fulltext,unknown 0 1 :",
882
"b unknown,line-delta 1 2 :",
885
index = self.get_knit_index(transport, "filename", "r")
887
self.assertEqual("fulltext", index.get_method("a"))
888
self.assertEqual("line-delta", index.get_method("b"))
889
self.assertRaises(errors.KnitIndexUnknownMethod, index.get_method, "c")
891
def test_get_options(self):
892
transport = MockTransport([
897
index = self.get_knit_index(transport, "filename", "r")
899
self.assertEqual(["opt1"], index.get_options("a"))
900
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
902
def test_get_parents(self):
903
transport = MockTransport([
906
"b option 1 2 0 .c :",
907
"c option 1 2 1 0 .e :"
909
index = self.get_knit_index(transport, "filename", "r")
911
self.assertEqual([], index.get_parents("a"))
912
self.assertEqual(["a", "c"], index.get_parents("b"))
913
self.assertEqual(["b", "a"], index.get_parents("c"))
915
def test_get_parents_with_ghosts(self):
916
transport = MockTransport([
919
"b option 1 2 0 .c :",
920
"c option 1 2 1 0 .e :"
922
index = self.get_knit_index(transport, "filename", "r")
924
self.assertEqual([], index.get_parents_with_ghosts("a"))
925
self.assertEqual(["a", "c"], index.get_parents_with_ghosts("b"))
926
self.assertEqual(["b", "a", "e"],
927
index.get_parents_with_ghosts("c"))
929
def test_check_versions_present(self):
930
transport = MockTransport([
935
index = self.get_knit_index(transport, "filename", "r")
937
check = index.check_versions_present
943
self.assertRaises(RevisionNotPresent, check, ["c"])
944
self.assertRaises(RevisionNotPresent, check, ["a", "b", "c"])
946
def test_impossible_parent(self):
947
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
948
transport = MockTransport([
951
"b option 0 1 4 :" # We don't have a 4th record
954
self.assertRaises(errors.KnitCorrupt,
955
self.get_knit_index, transport, 'filename', 'r')
957
if (str(e) == ('exceptions must be strings, classes, or instances,'
958
' not exceptions.IndexError')
959
and sys.version_info[0:2] >= (2,5)):
960
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
961
' raising new style exceptions with python'
966
def test_corrupted_parent(self):
967
transport = MockTransport([
971
"c option 0 1 1v :", # Can't have a parent of '1v'
974
self.assertRaises(errors.KnitCorrupt,
975
self.get_knit_index, transport, 'filename', 'r')
977
if (str(e) == ('exceptions must be strings, classes, or instances,'
978
' not exceptions.ValueError')
979
and sys.version_info[0:2] >= (2,5)):
980
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
981
' raising new style exceptions with python'
986
def test_corrupted_parent_in_list(self):
987
transport = MockTransport([
991
"c option 0 1 1 v :", # Can't have a parent of 'v'
994
self.assertRaises(errors.KnitCorrupt,
995
self.get_knit_index, transport, 'filename', 'r')
997
if (str(e) == ('exceptions must be strings, classes, or instances,'
998
' not exceptions.ValueError')
999
and sys.version_info[0:2] >= (2,5)):
1000
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1001
' raising new style exceptions with python'
1006
def test_invalid_position(self):
1007
transport = MockTransport([
1012
self.assertRaises(errors.KnitCorrupt,
1013
self.get_knit_index, transport, 'filename', 'r')
1014
except TypeError, e:
1015
if (str(e) == ('exceptions must be strings, classes, or instances,'
1016
' not exceptions.ValueError')
1017
and sys.version_info[0:2] >= (2,5)):
1018
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1019
' raising new style exceptions with python'
1024
def test_invalid_size(self):
1025
transport = MockTransport([
1030
self.assertRaises(errors.KnitCorrupt,
1031
self.get_knit_index, transport, 'filename', 'r')
1032
except TypeError, e:
1033
if (str(e) == ('exceptions must be strings, classes, or instances,'
1034
' not exceptions.ValueError')
1035
and sys.version_info[0:2] >= (2,5)):
1036
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1037
' raising new style exceptions with python'
1042
def test_short_line(self):
1043
transport = MockTransport([
1046
"b option 10 10 0", # This line isn't terminated, ignored
1048
index = self.get_knit_index(transport, "filename", "r")
1049
self.assertEqual(['a'], index.get_versions())
1051
def test_skip_incomplete_record(self):
1052
# A line with bogus data should just be skipped
1053
transport = MockTransport([
1056
"b option 10 10 0", # This line isn't terminated, ignored
1057
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1059
index = self.get_knit_index(transport, "filename", "r")
1060
self.assertEqual(['a', 'c'], index.get_versions())
1062
def test_trailing_characters(self):
1063
# A line with bogus data should just be skipped
1064
transport = MockTransport([
1067
"b option 10 10 0 :a", # This line has extra trailing characters
1068
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1070
index = self.get_knit_index(transport, "filename", "r")
1071
self.assertEqual(['a', 'c'], index.get_versions())
1074
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1076
_test_needs_features = [CompiledKnitFeature]
1078
def get_knit_index(self, *args, **kwargs):
1079
orig = knit._load_data
1081
knit._load_data = orig
1082
self.addCleanup(reset)
1083
from bzrlib._knit_load_data_c import _load_data_c
1084
knit._load_data = _load_data_c
1085
return _KnitIndex(*args, **kwargs)
1089
class KnitTests(TestCaseWithTransport):
1090
"""Class containing knit test helper routines."""
1092
def make_test_knit(self, annotate=False, delay_create=False, index=None,
1095
factory = KnitPlainFactory()
1098
return KnitVersionedFile(name, get_transport('.'), access_mode='w',
1099
factory=factory, create=True,
1100
delay_create=delay_create, index=index)
1102
def assertRecordContentEqual(self, knit, version_id, candidate_content):
1103
"""Assert that some raw record content matches the raw record content
1104
for a particular version_id in the given knit.
1106
index_memo = knit._index.get_position(version_id)
1107
record = (version_id, index_memo)
1108
[(_, expected_content)] = list(knit._data.read_records_iter_raw([record]))
1109
self.assertEqual(expected_content, candidate_content)
1112
class BasicKnitTests(KnitTests):
1114
def add_stock_one_and_one_a(self, k):
1115
k.add_lines('text-1', [], split_lines(TEXT_1))
1116
k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
1118
def test_knit_constructor(self):
1119
"""Construct empty k"""
1120
self.make_test_knit()
1122
def test_make_explicit_index(self):
1123
"""We can supply an index to use."""
1124
knit = KnitVersionedFile('test', get_transport('.'),
1125
index='strangelove')
1126
self.assertEqual(knit._index, 'strangelove')
1128
def test_knit_add(self):
1129
"""Store one text in knit and retrieve"""
1130
k = self.make_test_knit()
1131
k.add_lines('text-1', [], split_lines(TEXT_1))
1132
self.assertTrue(k.has_version('text-1'))
1133
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1135
def test_knit_reload(self):
1136
# test that the content in a reloaded knit is correct
1137
k = self.make_test_knit()
1138
k.add_lines('text-1', [], split_lines(TEXT_1))
1140
k2 = KnitVersionedFile('test', get_transport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
1141
self.assertTrue(k2.has_version('text-1'))
1142
self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
1144
def test_knit_several(self):
1145
"""Store several texts in a knit"""
1146
k = self.make_test_knit()
1147
k.add_lines('text-1', [], split_lines(TEXT_1))
1148
k.add_lines('text-2', [], split_lines(TEXT_2))
1149
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1150
self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
1152
def test_repeated_add(self):
1153
"""Knit traps attempt to replace existing version"""
1154
k = self.make_test_knit()
1155
k.add_lines('text-1', [], split_lines(TEXT_1))
1156
self.assertRaises(RevisionAlreadyPresent,
1158
'text-1', [], split_lines(TEXT_1))
1160
def test_empty(self):
1161
k = self.make_test_knit(True)
1162
k.add_lines('text-1', [], [])
1163
self.assertEquals(k.get_lines('text-1'), [])
1165
def test_incomplete(self):
1166
"""Test if texts without a ending line-end can be inserted and
1168
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1169
k.add_lines('text-1', [], ['a\n', 'b' ])
1170
k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
1171
# reopening ensures maximum room for confusion
1172
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1173
self.assertEquals(k.get_lines('text-1'), ['a\n', 'b' ])
1174
self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
1176
def test_delta(self):
1177
"""Expression of knit delta as lines"""
1178
k = self.make_test_knit()
1179
td = list(line_delta(TEXT_1.splitlines(True),
1180
TEXT_1A.splitlines(True)))
1181
self.assertEqualDiff(''.join(td), delta_1_1a)
1182
out = apply_line_delta(TEXT_1.splitlines(True), td)
1183
self.assertEqualDiff(''.join(out), TEXT_1A)
1185
def test_add_with_parents(self):
1186
"""Store in knit with parents"""
1187
k = self.make_test_knit()
1188
self.add_stock_one_and_one_a(k)
1189
self.assertEquals(k.get_parents('text-1'), [])
1190
self.assertEquals(k.get_parents('text-1a'), ['text-1'])
1192
def test_ancestry(self):
1193
"""Store in knit with parents"""
1194
k = self.make_test_knit()
1195
self.add_stock_one_and_one_a(k)
1196
self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
1198
def test_add_delta(self):
1199
"""Store in knit with parents"""
1200
k = KnitVersionedFile('test', get_transport('.'), factory=KnitPlainFactory(),
1201
delta=True, create=True)
1202
self.add_stock_one_and_one_a(k)
1204
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1206
def test_add_delta_knit_graph_index(self):
1207
"""Does adding work with a KnitGraphIndex."""
1208
index = InMemoryGraphIndex(2)
1209
knit_index = KnitGraphIndex(index, add_callback=index.add_nodes,
1211
k = KnitVersionedFile('test', get_transport('.'),
1212
delta=True, create=True, index=knit_index)
1213
self.add_stock_one_and_one_a(k)
1215
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1216
# check the index had the right data added.
1217
self.assertEqual(set([
1218
(index, ('text-1', ), ' 0 127', ((), ())),
1219
(index, ('text-1a', ), ' 127 140', ((('text-1', ),), (('text-1', ),))),
1220
]), set(index.iter_all_entries()))
1221
# we should not have a .kndx file
1222
self.assertFalse(get_transport('.').has('test.kndx'))
1224
def test_annotate(self):
1226
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1227
delta=True, create=True)
1228
self.insert_and_test_small_annotate(k)
1230
def insert_and_test_small_annotate(self, k):
1231
"""test annotation with k works correctly."""
1232
k.add_lines('text-1', [], ['a\n', 'b\n'])
1233
k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
1235
origins = k.annotate('text-2')
1236
self.assertEquals(origins[0], ('text-1', 'a\n'))
1237
self.assertEquals(origins[1], ('text-2', 'c\n'))
1239
def test_annotate_fulltext(self):
1241
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1242
delta=False, create=True)
1243
self.insert_and_test_small_annotate(k)
1245
def test_annotate_merge_1(self):
1246
k = self.make_test_knit(True)
1247
k.add_lines('text-a1', [], ['a\n', 'b\n'])
1248
k.add_lines('text-a2', [], ['d\n', 'c\n'])
1249
k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
1250
origins = k.annotate('text-am')
1251
self.assertEquals(origins[0], ('text-a2', 'd\n'))
1252
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1254
def test_annotate_merge_2(self):
1255
k = self.make_test_knit(True)
1256
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1257
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1258
k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
1259
origins = k.annotate('text-am')
1260
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1261
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1262
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1264
def test_annotate_merge_9(self):
1265
k = self.make_test_knit(True)
1266
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1267
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1268
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
1269
origins = k.annotate('text-am')
1270
self.assertEquals(origins[0], ('text-am', 'k\n'))
1271
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1272
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1274
def test_annotate_merge_3(self):
1275
k = self.make_test_knit(True)
1276
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1277
k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
1278
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
1279
origins = k.annotate('text-am')
1280
self.assertEquals(origins[0], ('text-am', 'k\n'))
1281
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1282
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1284
def test_annotate_merge_4(self):
1285
k = self.make_test_knit(True)
1286
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1287
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1288
k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
1289
k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
1290
origins = k.annotate('text-am')
1291
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1292
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1293
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1295
def test_annotate_merge_5(self):
1296
k = self.make_test_knit(True)
1297
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1298
k.add_lines('text-a2', [], ['d\n', 'e\n', 'f\n'])
1299
k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
1300
k.add_lines('text-am',
1301
['text-a1', 'text-a2', 'text-a3'],
1302
['a\n', 'e\n', 'z\n'])
1303
origins = k.annotate('text-am')
1304
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1305
self.assertEquals(origins[1], ('text-a2', 'e\n'))
1306
self.assertEquals(origins[2], ('text-a3', 'z\n'))
1308
def test_annotate_file_cherry_pick(self):
1309
k = self.make_test_knit(True)
1310
k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
1311
k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
1312
k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
1313
origins = k.annotate('text-3')
1314
self.assertEquals(origins[0], ('text-1', 'a\n'))
1315
self.assertEquals(origins[1], ('text-1', 'b\n'))
1316
self.assertEquals(origins[2], ('text-1', 'c\n'))
1318
def _test_join_with_factories(self, k1_factory, k2_factory):
1319
k1 = KnitVersionedFile('test1', get_transport('.'), factory=k1_factory, create=True)
1320
k1.add_lines('text-a', [], ['a1\n', 'a2\n', 'a3\n'])
1321
k1.add_lines('text-b', ['text-a'], ['a1\n', 'b2\n', 'a3\n'])
1322
k1.add_lines('text-c', [], ['c1\n', 'c2\n', 'c3\n'])
1323
k1.add_lines('text-d', ['text-c'], ['c1\n', 'd2\n', 'd3\n'])
1324
k1.add_lines('text-m', ['text-b', 'text-d'], ['a1\n', 'b2\n', 'd3\n'])
1325
k2 = KnitVersionedFile('test2', get_transport('.'), factory=k2_factory, create=True)
1326
count = k2.join(k1, version_ids=['text-m'])
1327
self.assertEquals(count, 5)
1328
self.assertTrue(k2.has_version('text-a'))
1329
self.assertTrue(k2.has_version('text-c'))
1330
origins = k2.annotate('text-m')
1331
self.assertEquals(origins[0], ('text-a', 'a1\n'))
1332
self.assertEquals(origins[1], ('text-b', 'b2\n'))
1333
self.assertEquals(origins[2], ('text-d', 'd3\n'))
1335
def test_knit_join_plain_to_plain(self):
1336
"""Test joining a plain knit with a plain knit."""
1337
self._test_join_with_factories(KnitPlainFactory(), KnitPlainFactory())
1339
def test_knit_join_anno_to_anno(self):
1340
"""Test joining an annotated knit with an annotated knit."""
1341
self._test_join_with_factories(None, None)
1343
def test_knit_join_anno_to_plain(self):
1344
"""Test joining an annotated knit with a plain knit."""
1345
self._test_join_with_factories(None, KnitPlainFactory())
1347
def test_knit_join_plain_to_anno(self):
1348
"""Test joining a plain knit with an annotated knit."""
1349
self._test_join_with_factories(KnitPlainFactory(), None)
1351
def test_reannotate(self):
1352
k1 = KnitVersionedFile('knit1', get_transport('.'),
1353
factory=KnitAnnotateFactory(), create=True)
1355
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1357
k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
1359
k2 = KnitVersionedFile('test2', get_transport('.'),
1360
factory=KnitAnnotateFactory(), create=True)
1361
k2.join(k1, version_ids=['text-b'])
1364
k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
1366
k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
1368
k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
1370
# test-c will have index 3
1371
k1.join(k2, version_ids=['text-c'])
1373
lines = k1.get_lines('text-c')
1374
self.assertEquals(lines, ['z\n', 'c\n'])
1376
origins = k1.annotate('text-c')
1377
self.assertEquals(origins[0], ('text-c', 'z\n'))
1378
self.assertEquals(origins[1], ('text-b', 'c\n'))
1380
def test_get_line_delta_texts(self):
1381
"""Make sure we can call get_texts on text with reused line deltas"""
1382
k1 = KnitVersionedFile('test1', get_transport('.'),
1383
factory=KnitPlainFactory(), create=True)
1388
parents = ['%d' % (t-1)]
1389
k1.add_lines('%d' % t, parents, ['hello\n'] * t)
1390
k1.get_texts(('%d' % t) for t in range(3))
1392
def test_iter_lines_reads_in_order(self):
1393
t = MemoryTransport()
1394
instrumented_t = TransportLogger(t)
1395
k1 = KnitVersionedFile('id', instrumented_t, create=True, delta=True)
1396
self.assertEqual([('id.kndx',)], instrumented_t._calls)
1397
# add texts with no required ordering
1398
k1.add_lines('base', [], ['text\n'])
1399
k1.add_lines('base2', [], ['text2\n'])
1401
instrumented_t._calls = []
1402
# request a last-first iteration
1403
results = list(k1.iter_lines_added_or_present_in_versions(['base2', 'base']))
1404
self.assertEqual([('id.knit', [(0, 87), (87, 89)])], instrumented_t._calls)
1405
self.assertEqual(['text\n', 'text2\n'], results)
1407
def test_create_empty_annotated(self):
1408
k1 = self.make_test_knit(True)
1410
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1411
k2 = k1.create_empty('t', MemoryTransport())
1412
self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
1413
self.assertEqual(k1.delta, k2.delta)
1414
# the generic test checks for empty content and file class
1416
def test_knit_format(self):
1417
# this tests that a new knit index file has the expected content
1418
# and that is writes the data we expect as records are added.
1419
knit = self.make_test_knit(True)
1420
# Now knit files are not created until we first add data to them
1421
self.assertFileEqual("# bzr knit index 8\n", 'test.kndx')
1422
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1423
self.assertFileEqual(
1424
"# bzr knit index 8\n"
1426
"revid fulltext 0 84 .a_ghost :",
1428
knit.add_lines_with_ghosts('revid2', ['revid'], ['a\n'])
1429
self.assertFileEqual(
1430
"# bzr knit index 8\n"
1431
"\nrevid fulltext 0 84 .a_ghost :"
1432
"\nrevid2 line-delta 84 82 0 :",
1434
# we should be able to load this file again
1435
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1436
self.assertEqual(['revid', 'revid2'], knit.versions())
1437
# write a short write to the file and ensure that its ignored
1438
indexfile = file('test.kndx', 'ab')
1439
indexfile.write('\nrevid3 line-delta 166 82 1 2 3 4 5 .phwoar:demo ')
1441
# we should be able to load this file again
1442
knit = KnitVersionedFile('test', get_transport('.'), access_mode='w')
1443
self.assertEqual(['revid', 'revid2'], knit.versions())
1444
# and add a revision with the same id the failed write had
1445
knit.add_lines('revid3', ['revid2'], ['a\n'])
1446
# and when reading it revid3 should now appear.
1447
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1448
self.assertEqual(['revid', 'revid2', 'revid3'], knit.versions())
1449
self.assertEqual(['revid2'], knit.get_parents('revid3'))
1451
def test_delay_create(self):
1452
"""Test that passing delay_create=True creates files late"""
1453
knit = self.make_test_knit(annotate=True, delay_create=True)
1454
self.failIfExists('test.knit')
1455
self.failIfExists('test.kndx')
1456
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1457
self.failUnlessExists('test.knit')
1458
self.assertFileEqual(
1459
"# bzr knit index 8\n"
1461
"revid fulltext 0 84 .a_ghost :",
1464
def test_create_parent_dir(self):
1465
"""create_parent_dir can create knits in nonexistant dirs"""
1466
# Has no effect if we don't set 'delay_create'
1467
trans = get_transport('.')
1468
self.assertRaises(NoSuchFile, KnitVersionedFile, 'dir/test',
1469
trans, access_mode='w', factory=None,
1470
create=True, create_parent_dir=True)
1471
# Nothing should have changed yet
1472
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1473
factory=None, create=True,
1474
create_parent_dir=True,
1476
self.failIfExists('dir/test.knit')
1477
self.failIfExists('dir/test.kndx')
1478
self.failIfExists('dir')
1479
knit.add_lines('revid', [], ['a\n'])
1480
self.failUnlessExists('dir')
1481
self.failUnlessExists('dir/test.knit')
1482
self.assertFileEqual(
1483
"# bzr knit index 8\n"
1485
"revid fulltext 0 84 :",
1488
def test_create_mode_700(self):
1489
trans = get_transport('.')
1490
if not trans._can_roundtrip_unix_modebits():
1491
# Can't roundtrip, so no need to run this test
1493
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1494
factory=None, create=True,
1495
create_parent_dir=True,
1499
knit.add_lines('revid', [], ['a\n'])
1500
self.assertTransportMode(trans, 'dir', 0700)
1501
self.assertTransportMode(trans, 'dir/test.knit', 0600)
1502
self.assertTransportMode(trans, 'dir/test.kndx', 0600)
1504
def test_create_mode_770(self):
1505
trans = get_transport('.')
1506
if not trans._can_roundtrip_unix_modebits():
1507
# Can't roundtrip, so no need to run this test
1509
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1510
factory=None, create=True,
1511
create_parent_dir=True,
1515
knit.add_lines('revid', [], ['a\n'])
1516
self.assertTransportMode(trans, 'dir', 0770)
1517
self.assertTransportMode(trans, 'dir/test.knit', 0660)
1518
self.assertTransportMode(trans, 'dir/test.kndx', 0660)
1520
def test_create_mode_777(self):
1521
trans = get_transport('.')
1522
if not trans._can_roundtrip_unix_modebits():
1523
# Can't roundtrip, so no need to run this test
1525
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1526
factory=None, create=True,
1527
create_parent_dir=True,
1531
knit.add_lines('revid', [], ['a\n'])
1532
self.assertTransportMode(trans, 'dir', 0777)
1533
self.assertTransportMode(trans, 'dir/test.knit', 0666)
1534
self.assertTransportMode(trans, 'dir/test.kndx', 0666)
1536
def test_plan_merge(self):
1537
my_knit = self.make_test_knit(annotate=True)
1538
my_knit.add_lines('text1', [], split_lines(TEXT_1))
1539
my_knit.add_lines('text1a', ['text1'], split_lines(TEXT_1A))
1540
my_knit.add_lines('text1b', ['text1'], split_lines(TEXT_1B))
1541
plan = list(my_knit.plan_merge('text1a', 'text1b'))
1542
for plan_line, expected_line in zip(plan, AB_MERGE):
1543
self.assertEqual(plan_line, expected_line)
1545
def test_get_stream_empty(self):
1546
"""Get a data stream for an empty knit file."""
1547
k1 = self.make_test_knit()
1548
format, data_list, reader_callable = k1.get_data_stream([])
1549
self.assertEqual('knit-plain', format)
1550
self.assertEqual([], data_list)
1551
content = reader_callable(None)
1552
self.assertEqual('', content)
1553
self.assertIsInstance(content, str)
1555
def test_get_stream_one_version(self):
1556
"""Get a data stream for a single record out of a knit containing just
1559
k1 = self.make_test_knit()
1561
('text-a', [], TEXT_1),
1563
expected_data_list = [
1564
# version, options, length, parents
1565
('text-a', ['fulltext'], 122, []),
1567
for version_id, parents, lines in test_data:
1568
k1.add_lines(version_id, parents, split_lines(lines))
1570
format, data_list, reader_callable = k1.get_data_stream(['text-a'])
1571
self.assertEqual('knit-plain', format)
1572
self.assertEqual(expected_data_list, data_list)
1573
# There's only one record in the knit, so the content should be the
1574
# entire knit data file's contents.
1575
self.assertEqual(k1.transport.get_bytes(k1._data._access._filename),
1576
reader_callable(None))
1578
def test_get_stream_get_one_version_of_many(self):
1579
"""Get a data stream for just one version out of a knit containing many
1582
k1 = self.make_test_knit()
1583
# Insert the same data as test_knit_join, as they seem to cover a range
1584
# of cases (no parents, one parent, multiple parents).
1586
('text-a', [], TEXT_1),
1587
('text-b', ['text-a'], TEXT_1),
1588
('text-c', [], TEXT_1),
1589
('text-d', ['text-c'], TEXT_1),
1590
('text-m', ['text-b', 'text-d'], TEXT_1),
1592
expected_data_list = [
1593
# version, options, length, parents
1594
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1596
for version_id, parents, lines in test_data:
1597
k1.add_lines(version_id, parents, split_lines(lines))
1599
format, data_list, reader_callable = k1.get_data_stream(['text-m'])
1600
self.assertEqual('knit-plain', format)
1601
self.assertEqual(expected_data_list, data_list)
1602
self.assertRecordContentEqual(k1, 'text-m', reader_callable(None))
1604
def test_get_stream_ghost_parent(self):
1605
"""Get a data stream for a version with a ghost parent."""
1606
k1 = self.make_test_knit()
1608
k1.add_lines('text-a', [], split_lines(TEXT_1))
1609
k1.add_lines_with_ghosts('text-b', ['text-a', 'text-ghost'],
1610
split_lines(TEXT_1))
1612
expected_data_list = [
1613
# version, options, length, parents
1614
('text-b', ['line-delta'], 84, ['text-a', 'text-ghost']),
1617
format, data_list, reader_callable = k1.get_data_stream(['text-b'])
1618
self.assertEqual('knit-plain', format)
1619
self.assertEqual(expected_data_list, data_list)
1620
self.assertRecordContentEqual(k1, 'text-b', reader_callable(None))
1622
def test_get_stream_get_multiple_records(self):
1623
"""Get a stream for multiple records of a knit."""
1624
k1 = self.make_test_knit()
1625
# Insert the same data as test_knit_join, as they seem to cover a range
1626
# of cases (no parents, one parent, multiple parents).
1628
('text-a', [], TEXT_1),
1629
('text-b', ['text-a'], TEXT_1),
1630
('text-c', [], TEXT_1),
1631
('text-d', ['text-c'], TEXT_1),
1632
('text-m', ['text-b', 'text-d'], TEXT_1),
1634
expected_data_list = [
1635
# version, options, length, parents
1636
('text-b', ['line-delta'], 84, ['text-a']),
1637
('text-d', ['line-delta'], 84, ['text-c']),
1639
for version_id, parents, lines in test_data:
1640
k1.add_lines(version_id, parents, split_lines(lines))
1642
# Note that even though we request the revision IDs in a particular
1643
# order, the data stream may return them in any order it likes. In this
1644
# case, they'll be in the order they were inserted into the knit.
1645
format, data_list, reader_callable = k1.get_data_stream(
1646
['text-d', 'text-b'])
1647
self.assertEqual('knit-plain', format)
1648
self.assertEqual(expected_data_list, data_list)
1649
self.assertRecordContentEqual(k1, 'text-b', reader_callable(84))
1650
self.assertRecordContentEqual(k1, 'text-d', reader_callable(84))
1651
self.assertEqual('', reader_callable(None),
1652
"There should be no more bytes left to read.")
1654
def test_get_stream_all(self):
1655
"""Get a data stream for all the records in a knit.
1657
This exercises fulltext records, line-delta records, records with
1658
various numbers of parents, and reading multiple records out of the
1659
callable. These cases ought to all be exercised individually by the
1660
other test_get_stream_* tests; this test is basically just paranoia.
1662
k1 = self.make_test_knit()
1663
# Insert the same data as test_knit_join, as they seem to cover a range
1664
# of cases (no parents, one parent, multiple parents).
1666
('text-a', [], TEXT_1),
1667
('text-b', ['text-a'], TEXT_1),
1668
('text-c', [], TEXT_1),
1669
('text-d', ['text-c'], TEXT_1),
1670
('text-m', ['text-b', 'text-d'], TEXT_1),
1672
expected_data_list = [
1673
# version, options, length, parents
1674
('text-a', ['fulltext'], 122, []),
1675
('text-b', ['line-delta'], 84, ['text-a']),
1676
('text-c', ['fulltext'], 121, []),
1677
('text-d', ['line-delta'], 84, ['text-c']),
1678
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1680
for version_id, parents, lines in test_data:
1681
k1.add_lines(version_id, parents, split_lines(lines))
1683
format, data_list, reader_callable = k1.get_data_stream(
1684
['text-a', 'text-b', 'text-c', 'text-d', 'text-m'])
1685
self.assertEqual('knit-plain', format)
1686
self.assertEqual(expected_data_list, data_list)
1687
for version_id, options, length, parents in expected_data_list:
1688
bytes = reader_callable(length)
1689
self.assertRecordContentEqual(k1, version_id, bytes)
1691
def assertKnitFilesEqual(self, knit1, knit2):
1692
"""Assert that the contents of the index and data files of two knits are
1696
knit1.transport.get_bytes(knit1._data._access._filename),
1697
knit2.transport.get_bytes(knit2._data._access._filename))
1699
knit1.transport.get_bytes(knit1._index._filename),
1700
knit2.transport.get_bytes(knit2._index._filename))
1702
def test_insert_data_stream_empty(self):
1703
"""Inserting a data stream with no records should not put any data into
1706
k1 = self.make_test_knit()
1707
k1.insert_data_stream(
1708
(k1.get_format_signature(), [], lambda ignored: ''))
1709
self.assertEqual('', k1.transport.get_bytes(k1._data._access._filename),
1710
"The .knit should be completely empty.")
1711
self.assertEqual(k1._index.HEADER,
1712
k1.transport.get_bytes(k1._index._filename),
1713
"The .kndx should have nothing apart from the header.")
1715
def test_insert_data_stream_one_record(self):
1716
"""Inserting a data stream with one record from a knit with one record
1717
results in byte-identical files.
1719
source = self.make_test_knit(name='source')
1720
source.add_lines('text-a', [], split_lines(TEXT_1))
1721
data_stream = source.get_data_stream(['text-a'])
1723
target = self.make_test_knit(name='target')
1724
target.insert_data_stream(data_stream)
1726
self.assertKnitFilesEqual(source, target)
1728
def test_insert_data_stream_records_already_present(self):
1729
"""Insert a data stream where some records are alreday present in the
1730
target, and some not. Only the new records are inserted.
1732
source = self.make_test_knit(name='source')
1733
target = self.make_test_knit(name='target')
1734
# Insert 'text-a' into both source and target
1735
source.add_lines('text-a', [], split_lines(TEXT_1))
1736
target.insert_data_stream(source.get_data_stream(['text-a']))
1737
# Insert 'text-b' into just the source.
1738
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1739
# Get a data stream of both text-a and text-b, and insert it.
1740
data_stream = source.get_data_stream(['text-a', 'text-b'])
1741
target.insert_data_stream(data_stream)
1742
# The source and target will now be identical. This means the text-a
1743
# record was not added a second time.
1744
self.assertKnitFilesEqual(source, target)
1746
def test_insert_data_stream_multiple_records(self):
1747
"""Inserting a data stream of all records from a knit with multiple
1748
records results in byte-identical files.
1750
source = self.make_test_knit(name='source')
1751
source.add_lines('text-a', [], split_lines(TEXT_1))
1752
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1753
source.add_lines('text-c', [], split_lines(TEXT_1))
1754
data_stream = source.get_data_stream(['text-a', 'text-b', 'text-c'])
1756
target = self.make_test_knit(name='target')
1757
target.insert_data_stream(data_stream)
1759
self.assertKnitFilesEqual(source, target)
1761
def test_insert_data_stream_ghost_parent(self):
1762
"""Insert a data stream with a record that has a ghost parent."""
1763
# Make a knit with a record, text-a, that has a ghost parent.
1764
source = self.make_test_knit(name='source')
1765
source.add_lines_with_ghosts('text-a', ['text-ghost'],
1766
split_lines(TEXT_1))
1767
data_stream = source.get_data_stream(['text-a'])
1769
target = self.make_test_knit(name='target')
1770
target.insert_data_stream(data_stream)
1772
self.assertKnitFilesEqual(source, target)
1774
# The target knit object is in a consistent state, i.e. the record we
1775
# just added is immediately visible.
1776
self.assertTrue(target.has_version('text-a'))
1777
self.assertTrue(target.has_ghost('text-ghost'))
1778
self.assertEqual(split_lines(TEXT_1), target.get_lines('text-a'))
1780
def test_insert_data_stream_inconsistent_version_lines(self):
1781
"""Inserting a data stream which has different content for a version_id
1782
than already exists in the knit will raise KnitCorrupt.
1784
source = self.make_test_knit(name='source')
1785
target = self.make_test_knit(name='target')
1786
# Insert a different 'text-a' into both source and target
1787
source.add_lines('text-a', [], split_lines(TEXT_1))
1788
target.add_lines('text-a', [], split_lines(TEXT_2))
1789
# Insert a data stream with conflicting content into the target
1790
data_stream = source.get_data_stream(['text-a'])
1792
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1794
def test_insert_data_stream_inconsistent_version_parents(self):
1795
"""Inserting a data stream which has different parents for a version_id
1796
than already exists in the knit will raise KnitCorrupt.
1798
source = self.make_test_knit(name='source')
1799
target = self.make_test_knit(name='target')
1800
# Insert a different 'text-a' into both source and target. They differ
1801
# only by the parents list, the content is the same.
1802
source.add_lines_with_ghosts('text-a', [], split_lines(TEXT_1))
1803
target.add_lines_with_ghosts('text-a', ['a-ghost'], split_lines(TEXT_1))
1804
# Insert a data stream with conflicting content into the target
1805
data_stream = source.get_data_stream(['text-a'])
1807
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1809
def test_insert_data_stream_incompatible_format(self):
1810
"""A data stream in a different format to the target knit cannot be
1813
It will raise KnitDataStreamIncompatible.
1815
data_stream = ('fake-format-signature', [], lambda _: '')
1816
target = self.make_test_knit(name='target')
1818
errors.KnitDataStreamIncompatible,
1819
target.insert_data_stream, data_stream)
1821
# * test that a stream of "already present version, then new version"
1822
# inserts correctly.
1833
Banana cup cake recipe
1839
- self-raising flour
1843
Banana cup cake recipe
1845
- bananas (do not use plantains!!!)
1852
Banana cup cake recipe
1855
- self-raising flour
1868
AB_MERGE_TEXT="""unchanged|Banana cup cake recipe
1873
new-b|- bananas (do not use plantains!!!)
1874
unchanged|- broken tea cups
1875
new-a|- self-raising flour
1878
AB_MERGE=[tuple(l.split('|')) for l in AB_MERGE_TEXT.splitlines(True)]
1881
def line_delta(from_lines, to_lines):
1882
"""Generate line-based delta from one text to another"""
1883
s = difflib.SequenceMatcher(None, from_lines, to_lines)
1884
for op in s.get_opcodes():
1885
if op[0] == 'equal':
1887
yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
1888
for i in range(op[3], op[4]):
1892
def apply_line_delta(basis_lines, delta_lines):
1893
"""Apply a line-based perfect diff
1895
basis_lines -- text to apply the patch to
1896
delta_lines -- diff instructions and content
1898
out = basis_lines[:]
1901
while i < len(delta_lines):
1903
a, b, c = map(long, l.split(','))
1905
out[offset+a:offset+b] = delta_lines[i:i+c]
1907
offset = offset + (b - a) + c
1911
class TestWeaveToKnit(KnitTests):
1913
def test_weave_to_knit_matches(self):
1914
# check that the WeaveToKnit is_compatible function
1915
# registers True for a Weave to a Knit.
1917
k = self.make_test_knit()
1918
self.failUnless(WeaveToKnit.is_compatible(w, k))
1919
self.failIf(WeaveToKnit.is_compatible(k, w))
1920
self.failIf(WeaveToKnit.is_compatible(w, w))
1921
self.failIf(WeaveToKnit.is_compatible(k, k))
1924
class TestKnitCaching(KnitTests):
1926
def create_knit(self):
1927
k = self.make_test_knit(True)
1928
k.add_lines('text-1', [], split_lines(TEXT_1))
1929
k.add_lines('text-2', [], split_lines(TEXT_2))
1932
def test_no_caching(self):
1933
k = self.create_knit()
1934
# Nothing should be cached without setting 'enable_cache'
1935
self.assertEqual({}, k._data._cache)
1937
def test_cache_data_read_raw(self):
1938
k = self.create_knit()
1940
# Now cache and read
1943
def read_one_raw(version):
1944
pos_map = k._get_components_positions([version])
1945
method, index_memo, next = pos_map[version]
1946
lst = list(k._data.read_records_iter_raw([(version, index_memo)]))
1947
self.assertEqual(1, len(lst))
1950
val = read_one_raw('text-1')
1951
self.assertEqual({'text-1':val[1]}, k._data._cache)
1954
# After clear, new reads are not cached
1955
self.assertEqual({}, k._data._cache)
1957
val2 = read_one_raw('text-1')
1958
self.assertEqual(val, val2)
1959
self.assertEqual({}, k._data._cache)
1961
def test_cache_data_read(self):
1962
k = self.create_knit()
1964
def read_one(version):
1965
pos_map = k._get_components_positions([version])
1966
method, index_memo, next = pos_map[version]
1967
lst = list(k._data.read_records_iter([(version, index_memo)]))
1968
self.assertEqual(1, len(lst))
1971
# Now cache and read
1974
val = read_one('text-2')
1975
self.assertEqual(['text-2'], k._data._cache.keys())
1976
self.assertEqual('text-2', val[0])
1977
content, digest = k._data._parse_record('text-2',
1978
k._data._cache['text-2'])
1979
self.assertEqual(content, val[1])
1980
self.assertEqual(digest, val[2])
1983
self.assertEqual({}, k._data._cache)
1985
val2 = read_one('text-2')
1986
self.assertEqual(val, val2)
1987
self.assertEqual({}, k._data._cache)
1989
def test_cache_read(self):
1990
k = self.create_knit()
1993
text = k.get_text('text-1')
1994
self.assertEqual(TEXT_1, text)
1995
self.assertEqual(['text-1'], k._data._cache.keys())
1998
self.assertEqual({}, k._data._cache)
2000
text = k.get_text('text-1')
2001
self.assertEqual(TEXT_1, text)
2002
self.assertEqual({}, k._data._cache)
2005
class TestKnitIndex(KnitTests):
2007
def test_add_versions_dictionary_compresses(self):
2008
"""Adding versions to the index should update the lookup dict"""
2009
knit = self.make_test_knit()
2011
idx.add_version('a-1', ['fulltext'], (None, 0, 0), [])
2012
self.check_file_contents('test.kndx',
2013
'# bzr knit index 8\n'
2015
'a-1 fulltext 0 0 :'
2017
idx.add_versions([('a-2', ['fulltext'], (None, 0, 0), ['a-1']),
2018
('a-3', ['fulltext'], (None, 0, 0), ['a-2']),
2020
self.check_file_contents('test.kndx',
2021
'# bzr knit index 8\n'
2023
'a-1 fulltext 0 0 :\n'
2024
'a-2 fulltext 0 0 0 :\n'
2025
'a-3 fulltext 0 0 1 :'
2027
self.assertEqual(['a-1', 'a-2', 'a-3'], idx._history)
2028
self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0),
2029
'a-2':('a-2', ['fulltext'], 0, 0, ['a-1'], 1),
2030
'a-3':('a-3', ['fulltext'], 0, 0, ['a-2'], 2),
2033
def test_add_versions_fails_clean(self):
2034
"""If add_versions fails in the middle, it restores a pristine state.
2036
Any modifications that are made to the index are reset if all versions
2039
# This cheats a little bit by passing in a generator which will
2040
# raise an exception before the processing finishes
2041
# Other possibilities would be to have an version with the wrong number
2042
# of entries, or to make the backing transport unable to write any
2045
knit = self.make_test_knit()
2047
idx.add_version('a-1', ['fulltext'], (None, 0, 0), [])
2049
class StopEarly(Exception):
2052
def generate_failure():
2053
"""Add some entries and then raise an exception"""
2054
yield ('a-2', ['fulltext'], (None, 0, 0), ['a-1'])
2055
yield ('a-3', ['fulltext'], (None, 0, 0), ['a-2'])
2058
# Assert the pre-condition
2059
self.assertEqual(['a-1'], idx._history)
2060
self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0)}, idx._cache)
2062
self.assertRaises(StopEarly, idx.add_versions, generate_failure())
2064
# And it shouldn't be modified
2065
self.assertEqual(['a-1'], idx._history)
2066
self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0)}, idx._cache)
2068
def test_knit_index_ignores_empty_files(self):
2069
# There was a race condition in older bzr, where a ^C at the right time
2070
# could leave an empty .kndx file, which bzr would later claim was a
2071
# corrupted file since the header was not present. In reality, the file
2072
# just wasn't created, so it should be ignored.
2073
t = get_transport('.')
2074
t.put_bytes('test.kndx', '')
2076
knit = self.make_test_knit()
2078
def test_knit_index_checks_header(self):
2079
t = get_transport('.')
2080
t.put_bytes('test.kndx', '# not really a knit header\n\n')
2082
self.assertRaises(KnitHeaderError, self.make_test_knit)
2085
class TestGraphIndexKnit(KnitTests):
2086
"""Tests for knits using a GraphIndex rather than a KnitIndex."""
2088
def make_g_index(self, name, ref_lists=0, nodes=[]):
2089
builder = GraphIndexBuilder(ref_lists)
2090
for node, references, value in nodes:
2091
builder.add_node(node, references, value)
2092
stream = builder.finish()
2093
trans = self.get_transport()
2094
trans.put_file(name, stream)
2095
return GraphIndex(trans, name)
2097
def two_graph_index(self, deltas=False, catch_adds=False):
2098
"""Build a two-graph index.
2100
:param deltas: If true, use underlying indices with two node-ref
2101
lists and 'parent' set to a delta-compressed against tail.
2103
# build a complex graph across several indices.
2105
# delta compression inn the index
2106
index1 = self.make_g_index('1', 2, [
2107
(('tip', ), 'N0 100', ([('parent', )], [], )),
2108
(('tail', ), '', ([], []))])
2109
index2 = self.make_g_index('2', 2, [
2110
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
2111
(('separate', ), '', ([], []))])
2113
# just blob location and graph in the index.
2114
index1 = self.make_g_index('1', 1, [
2115
(('tip', ), 'N0 100', ([('parent', )], )),
2116
(('tail', ), '', ([], ))])
2117
index2 = self.make_g_index('2', 1, [
2118
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
2119
(('separate', ), '', ([], ))])
2120
combined_index = CombinedGraphIndex([index1, index2])
2122
self.combined_index = combined_index
2123
self.caught_entries = []
2124
add_callback = self.catch_add
2127
return KnitGraphIndex(combined_index, deltas=deltas,
2128
add_callback=add_callback)
2130
def test_get_graph(self):
2131
index = self.two_graph_index()
2132
self.assertEqual(set([
2133
('tip', ('parent', )),
2135
('parent', ('tail', 'ghost')),
2137
]), set(index.get_graph()))
2139
def test_get_ancestry(self):
2140
# get_ancestry is defined as eliding ghosts, not erroring.
2141
index = self.two_graph_index()
2142
self.assertEqual([], index.get_ancestry([]))
2143
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2144
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2145
self.assertEqual(['tail', 'parent'], index.get_ancestry(['parent']))
2146
self.assertEqual(['tail', 'parent', 'tip'], index.get_ancestry(['tip']))
2147
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2148
(['tail', 'parent', 'tip', 'separate'],
2149
['separate', 'tail', 'parent', 'tip'],
2151
# and without topo_sort
2152
self.assertEqual(set(['separate']),
2153
set(index.get_ancestry(['separate'], topo_sorted=False)))
2154
self.assertEqual(set(['tail']),
2155
set(index.get_ancestry(['tail'], topo_sorted=False)))
2156
self.assertEqual(set(['tail', 'parent']),
2157
set(index.get_ancestry(['parent'], topo_sorted=False)))
2158
self.assertEqual(set(['tail', 'parent', 'tip']),
2159
set(index.get_ancestry(['tip'], topo_sorted=False)))
2160
self.assertEqual(set(['separate', 'tail', 'parent', 'tip']),
2161
set(index.get_ancestry(['tip', 'separate'])))
2162
# asking for a ghost makes it go boom.
2163
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2165
def test_get_ancestry_with_ghosts(self):
2166
index = self.two_graph_index()
2167
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2168
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2169
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2170
self.assertTrue(index.get_ancestry_with_ghosts(['parent']) in
2171
(['tail', 'ghost', 'parent'],
2172
['ghost', 'tail', 'parent'],
2174
self.assertTrue(index.get_ancestry_with_ghosts(['tip']) in
2175
(['tail', 'ghost', 'parent', 'tip'],
2176
['ghost', 'tail', 'parent', 'tip'],
2178
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2179
(['tail', 'ghost', 'parent', 'tip', 'separate'],
2180
['ghost', 'tail', 'parent', 'tip', 'separate'],
2181
['separate', 'tail', 'ghost', 'parent', 'tip'],
2182
['separate', 'ghost', 'tail', 'parent', 'tip'],
2184
# asking for a ghost makes it go boom.
2185
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2187
def test_num_versions(self):
2188
index = self.two_graph_index()
2189
self.assertEqual(4, index.num_versions())
2191
def test_get_versions(self):
2192
index = self.two_graph_index()
2193
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2194
set(index.get_versions()))
2196
def test_has_version(self):
2197
index = self.two_graph_index()
2198
self.assertTrue(index.has_version('tail'))
2199
self.assertFalse(index.has_version('ghost'))
2201
def test_get_position(self):
2202
index = self.two_graph_index()
2203
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2204
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
2206
def test_get_method_deltas(self):
2207
index = self.two_graph_index(deltas=True)
2208
self.assertEqual('fulltext', index.get_method('tip'))
2209
self.assertEqual('line-delta', index.get_method('parent'))
2211
def test_get_method_no_deltas(self):
2212
# check that the parent-history lookup is ignored with deltas=False.
2213
index = self.two_graph_index(deltas=False)
2214
self.assertEqual('fulltext', index.get_method('tip'))
2215
self.assertEqual('fulltext', index.get_method('parent'))
2217
def test_get_options_deltas(self):
2218
index = self.two_graph_index(deltas=True)
2219
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2220
self.assertEqual(['line-delta'], index.get_options('parent'))
2222
def test_get_options_no_deltas(self):
2223
# check that the parent-history lookup is ignored with deltas=False.
2224
index = self.two_graph_index(deltas=False)
2225
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2226
self.assertEqual(['fulltext'], index.get_options('parent'))
2228
def test_get_parents(self):
2229
# get_parents ignores ghosts
2230
index = self.two_graph_index()
2231
self.assertEqual(('tail', ), index.get_parents('parent'))
2232
# and errors on ghosts.
2233
self.assertRaises(errors.RevisionNotPresent,
2234
index.get_parents, 'ghost')
2236
def test_get_parents_with_ghosts(self):
2237
index = self.two_graph_index()
2238
self.assertEqual(('tail', 'ghost'), index.get_parents_with_ghosts('parent'))
2239
# and errors on ghosts.
2240
self.assertRaises(errors.RevisionNotPresent,
2241
index.get_parents_with_ghosts, 'ghost')
2243
def test_check_versions_present(self):
2244
# ghosts should not be considered present
2245
index = self.two_graph_index()
2246
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2248
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2250
index.check_versions_present(['tail', 'separate'])
2252
def catch_add(self, entries):
2253
self.caught_entries.append(entries)
2255
def test_add_no_callback_errors(self):
2256
index = self.two_graph_index()
2257
self.assertRaises(errors.ReadOnlyError, index.add_version,
2258
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2260
def test_add_version_smoke(self):
2261
index = self.two_graph_index(catch_adds=True)
2262
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2263
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
2264
self.caught_entries)
2266
def test_add_version_delta_not_delta_index(self):
2267
index = self.two_graph_index(catch_adds=True)
2268
self.assertRaises(errors.KnitCorrupt, index.add_version,
2269
'new', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2270
self.assertEqual([], self.caught_entries)
2272
def test_add_version_same_dup(self):
2273
index = self.two_graph_index(catch_adds=True)
2274
# options can be spelt two different ways
2275
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2276
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])
2277
# but neither should have added data.
2278
self.assertEqual([[], []], self.caught_entries)
2280
def test_add_version_different_dup(self):
2281
index = self.two_graph_index(deltas=True, catch_adds=True)
2283
self.assertRaises(errors.KnitCorrupt, index.add_version,
2284
'tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2285
self.assertRaises(errors.KnitCorrupt, index.add_version,
2286
'tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])
2287
self.assertRaises(errors.KnitCorrupt, index.add_version,
2288
'tip', 'fulltext', (None, 0, 100), ['parent'])
2290
self.assertRaises(errors.KnitCorrupt, index.add_version,
2291
'tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])
2292
self.assertRaises(errors.KnitCorrupt, index.add_version,
2293
'tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])
2295
self.assertRaises(errors.KnitCorrupt, index.add_version,
2296
'tip', 'fulltext,no-eol', (None, 0, 100), [])
2297
self.assertEqual([], self.caught_entries)
2299
def test_add_versions_nodeltas(self):
2300
index = self.two_graph_index(catch_adds=True)
2301
index.add_versions([
2302
('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2303
('new2', 'fulltext', (None, 0, 6), ['new']),
2305
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
2306
(('new2', ), ' 0 6', ((('new',),),))],
2307
sorted(self.caught_entries[0]))
2308
self.assertEqual(1, len(self.caught_entries))
2310
def test_add_versions_deltas(self):
2311
index = self.two_graph_index(deltas=True, catch_adds=True)
2312
index.add_versions([
2313
('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2314
('new2', 'line-delta', (None, 0, 6), ['new']),
2316
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
2317
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
2318
sorted(self.caught_entries[0]))
2319
self.assertEqual(1, len(self.caught_entries))
2321
def test_add_versions_delta_not_delta_index(self):
2322
index = self.two_graph_index(catch_adds=True)
2323
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2324
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2325
self.assertEqual([], self.caught_entries)
2327
def test_add_versions_random_id_accepted(self):
2328
index = self.two_graph_index(catch_adds=True)
2329
index.add_versions([], random_id=True)
2331
def test_add_versions_same_dup(self):
2332
index = self.two_graph_index(catch_adds=True)
2333
# options can be spelt two different ways
2334
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2335
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2336
# but neither should have added data.
2337
self.assertEqual([[], []], self.caught_entries)
2339
def test_add_versions_different_dup(self):
2340
index = self.two_graph_index(deltas=True, catch_adds=True)
2342
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2343
[('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2344
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2345
[('tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])])
2346
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2347
[('tip', 'fulltext', (None, 0, 100), ['parent'])])
2349
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2350
[('tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])])
2351
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2352
[('tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])])
2354
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2355
[('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2356
# change options in the second record
2357
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2358
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent']),
2359
('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2360
self.assertEqual([], self.caught_entries)
2362
def test_iter_parents(self):
2363
index1 = self.make_g_index('1', 1, [
2365
(('r0', ), 'N0 100', ([], )),
2367
(('r1', ), '', ([('r0', )], ))])
2368
index2 = self.make_g_index('2', 1, [
2370
(('r2', ), 'N0 100', ([('r1', ), ('r0', )], )),
2372
combined_index = CombinedGraphIndex([index1, index2])
2373
index = KnitGraphIndex(combined_index)
2375
# cases: each sample data individually:
2376
self.assertEqual(set([('r0', ())]),
2377
set(index.iter_parents(['r0'])))
2378
self.assertEqual(set([('r1', ('r0', ))]),
2379
set(index.iter_parents(['r1'])))
2380
self.assertEqual(set([('r2', ('r1', 'r0'))]),
2381
set(index.iter_parents(['r2'])))
2382
# no nodes returned for a missing node
2383
self.assertEqual(set(),
2384
set(index.iter_parents(['missing'])))
2385
# 1 node returned with missing nodes skipped
2386
self.assertEqual(set([('r1', ('r0', ))]),
2387
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
2389
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2390
set(index.iter_parents(['r0', 'r1'])))
2391
# 2 nodes returned, missing skipped
2392
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2393
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
2396
class TestNoParentsGraphIndexKnit(KnitTests):
2397
"""Tests for knits using KnitGraphIndex with no parents."""
2399
def make_g_index(self, name, ref_lists=0, nodes=[]):
2400
builder = GraphIndexBuilder(ref_lists)
2401
for node, references in nodes:
2402
builder.add_node(node, references)
2403
stream = builder.finish()
2404
trans = self.get_transport()
2405
trans.put_file(name, stream)
2406
return GraphIndex(trans, name)
2408
def test_parents_deltas_incompatible(self):
2409
index = CombinedGraphIndex([])
2410
self.assertRaises(errors.KnitError, KnitGraphIndex, index,
2411
deltas=True, parents=False)
2413
def two_graph_index(self, catch_adds=False):
2414
"""Build a two-graph index.
2416
:param deltas: If true, use underlying indices with two node-ref
2417
lists and 'parent' set to a delta-compressed against tail.
2419
# put several versions in the index.
2420
index1 = self.make_g_index('1', 0, [
2421
(('tip', ), 'N0 100'),
2423
index2 = self.make_g_index('2', 0, [
2424
(('parent', ), ' 100 78'),
2425
(('separate', ), '')])
2426
combined_index = CombinedGraphIndex([index1, index2])
2428
self.combined_index = combined_index
2429
self.caught_entries = []
2430
add_callback = self.catch_add
2433
return KnitGraphIndex(combined_index, parents=False,
2434
add_callback=add_callback)
2436
def test_get_graph(self):
2437
index = self.two_graph_index()
2438
self.assertEqual(set([
2443
]), set(index.get_graph()))
2445
def test_get_ancestry(self):
2446
# with no parents, ancestry is always just the key.
2447
index = self.two_graph_index()
2448
self.assertEqual([], index.get_ancestry([]))
2449
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2450
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2451
self.assertEqual(['parent'], index.get_ancestry(['parent']))
2452
self.assertEqual(['tip'], index.get_ancestry(['tip']))
2453
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2454
(['tip', 'separate'],
2455
['separate', 'tip'],
2457
# asking for a ghost makes it go boom.
2458
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2460
def test_get_ancestry_with_ghosts(self):
2461
index = self.two_graph_index()
2462
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2463
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2464
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2465
self.assertEqual(['parent'], index.get_ancestry_with_ghosts(['parent']))
2466
self.assertEqual(['tip'], index.get_ancestry_with_ghosts(['tip']))
2467
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2468
(['tip', 'separate'],
2469
['separate', 'tip'],
2471
# asking for a ghost makes it go boom.
2472
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2474
def test_num_versions(self):
2475
index = self.two_graph_index()
2476
self.assertEqual(4, index.num_versions())
2478
def test_get_versions(self):
2479
index = self.two_graph_index()
2480
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2481
set(index.get_versions()))
2483
def test_has_version(self):
2484
index = self.two_graph_index()
2485
self.assertTrue(index.has_version('tail'))
2486
self.assertFalse(index.has_version('ghost'))
2488
def test_get_position(self):
2489
index = self.two_graph_index()
2490
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2491
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
2493
def test_get_method(self):
2494
index = self.two_graph_index()
2495
self.assertEqual('fulltext', index.get_method('tip'))
2496
self.assertEqual(['fulltext'], index.get_options('parent'))
2498
def test_get_options(self):
2499
index = self.two_graph_index()
2500
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2501
self.assertEqual(['fulltext'], index.get_options('parent'))
2503
def test_get_parents(self):
2504
index = self.two_graph_index()
2505
self.assertEqual((), index.get_parents('parent'))
2506
# and errors on ghosts.
2507
self.assertRaises(errors.RevisionNotPresent,
2508
index.get_parents, 'ghost')
2510
def test_get_parents_with_ghosts(self):
2511
index = self.two_graph_index()
2512
self.assertEqual((), index.get_parents_with_ghosts('parent'))
2513
# and errors on ghosts.
2514
self.assertRaises(errors.RevisionNotPresent,
2515
index.get_parents_with_ghosts, 'ghost')
2517
def test_check_versions_present(self):
2518
index = self.two_graph_index()
2519
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2521
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2522
['tail', 'missing'])
2523
index.check_versions_present(['tail', 'separate'])
2525
def catch_add(self, entries):
2526
self.caught_entries.append(entries)
2528
def test_add_no_callback_errors(self):
2529
index = self.two_graph_index()
2530
self.assertRaises(errors.ReadOnlyError, index.add_version,
2531
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2533
def test_add_version_smoke(self):
2534
index = self.two_graph_index(catch_adds=True)
2535
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), [])
2536
self.assertEqual([[(('new', ), 'N50 60')]],
2537
self.caught_entries)
2539
def test_add_version_delta_not_delta_index(self):
2540
index = self.two_graph_index(catch_adds=True)
2541
self.assertRaises(errors.KnitCorrupt, index.add_version,
2542
'new', 'no-eol,line-delta', (None, 0, 100), [])
2543
self.assertEqual([], self.caught_entries)
2545
def test_add_version_same_dup(self):
2546
index = self.two_graph_index(catch_adds=True)
2547
# options can be spelt two different ways
2548
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), [])
2549
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), [])
2550
# but neither should have added data.
2551
self.assertEqual([[], []], self.caught_entries)
2553
def test_add_version_different_dup(self):
2554
index = self.two_graph_index(catch_adds=True)
2556
self.assertRaises(errors.KnitCorrupt, index.add_version,
2557
'tip', 'no-eol,line-delta', (None, 0, 100), [])
2558
self.assertRaises(errors.KnitCorrupt, index.add_version,
2559
'tip', 'line-delta,no-eol', (None, 0, 100), [])
2560
self.assertRaises(errors.KnitCorrupt, index.add_version,
2561
'tip', 'fulltext', (None, 0, 100), [])
2563
self.assertRaises(errors.KnitCorrupt, index.add_version,
2564
'tip', 'fulltext,no-eol', (None, 50, 100), [])
2565
self.assertRaises(errors.KnitCorrupt, index.add_version,
2566
'tip', 'fulltext,no-eol', (None, 0, 1000), [])
2568
self.assertRaises(errors.KnitCorrupt, index.add_version,
2569
'tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2570
self.assertEqual([], self.caught_entries)
2572
def test_add_versions(self):
2573
index = self.two_graph_index(catch_adds=True)
2574
index.add_versions([
2575
('new', 'fulltext,no-eol', (None, 50, 60), []),
2576
('new2', 'fulltext', (None, 0, 6), []),
2578
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2579
sorted(self.caught_entries[0]))
2580
self.assertEqual(1, len(self.caught_entries))
2582
def test_add_versions_delta_not_delta_index(self):
2583
index = self.two_graph_index(catch_adds=True)
2584
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2585
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2586
self.assertEqual([], self.caught_entries)
2588
def test_add_versions_parents_not_parents_index(self):
2589
index = self.two_graph_index(catch_adds=True)
2590
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2591
[('new', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2592
self.assertEqual([], self.caught_entries)
2594
def test_add_versions_random_id_accepted(self):
2595
index = self.two_graph_index(catch_adds=True)
2596
index.add_versions([], random_id=True)
2598
def test_add_versions_same_dup(self):
2599
index = self.two_graph_index(catch_adds=True)
2600
# options can be spelt two different ways
2601
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2602
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), [])])
2603
# but neither should have added data.
2604
self.assertEqual([[], []], self.caught_entries)
2606
def test_add_versions_different_dup(self):
2607
index = self.two_graph_index(catch_adds=True)
2609
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2610
[('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2611
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2612
[('tip', 'line-delta,no-eol', (None, 0, 100), [])])
2613
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2614
[('tip', 'fulltext', (None, 0, 100), [])])
2616
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2617
[('tip', 'fulltext,no-eol', (None, 50, 100), [])])
2618
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2619
[('tip', 'fulltext,no-eol', (None, 0, 1000), [])])
2621
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2622
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2623
# change options in the second record
2624
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2625
[('tip', 'fulltext,no-eol', (None, 0, 100), []),
2626
('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2627
self.assertEqual([], self.caught_entries)
2629
def test_iter_parents(self):
2630
index = self.two_graph_index()
2631
self.assertEqual(set([
2632
('tip', ()), ('tail', ()), ('parent', ()), ('separate', ())
2634
set(index.iter_parents(['tip', 'tail', 'ghost', 'parent', 'separate'])))
2635
self.assertEqual(set([('tip', ())]),
2636
set(index.iter_parents(['tip'])))
2637
self.assertEqual(set(),
2638
set(index.iter_parents([])))
added
removed
bzrlib/tests/test_knit.py
