322
305
self.log('\n'.join(http_logs))
323
306
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
324
307
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
325
self.assertEqual(1, self._count_log_matches('repository/format',
308
self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
327
309
self.assertTrue(1 >= self._count_log_matches('revision-history',
329
311
self.assertTrue(1 >= self._count_log_matches('last-revision',
331
313
self.assertEqual(4, len(http_logs))
334
class TestKnitToPackFetch(TestCaseWithTransport):
336
def find_get_record_stream(self, calls):
337
"""In a list of calls, find 'get_record_stream' calls.
339
This also ensures that there is only one get_record_stream call.
341
get_record_call = None
343
if call[0] == 'get_record_stream':
344
self.assertIs(None, get_record_call,
345
"there should only be one call to"
346
" get_record_stream")
347
get_record_call = call
348
self.assertIsNot(None, get_record_call,
349
"there should be exactly one call to "
350
" get_record_stream")
351
return get_record_call
353
def test_fetch_with_deltas_no_delta_closure(self):
354
tree = self.make_branch_and_tree('source', format='dirstate')
355
target = self.make_repository('target', format='pack-0.92')
356
self.build_tree(['source/file'])
357
tree.set_root_id('root-id')
358
tree.add('file', 'file-id')
359
tree.commit('one', rev_id='rev-one')
360
source = tree.branch.repository
361
source.texts = versionedfile.RecordingVersionedFilesDecorator(
363
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
365
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
367
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
370
self.assertTrue(target._fetch_uses_deltas)
371
target.fetch(source, revision_id='rev-one')
372
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
373
target._fetch_order, False),
374
self.find_get_record_stream(source.texts.calls))
375
self.assertEqual(('get_record_stream', [('rev-one',)],
376
target._fetch_order, False),
377
self.find_get_record_stream(source.inventories.calls))
378
self.assertEqual(('get_record_stream', [('rev-one',)],
379
target._fetch_order, False),
380
self.find_get_record_stream(source.revisions.calls))
381
# XXX: Signatures is special, and slightly broken. The
382
# standard item_keys_introduced_by actually does a lookup for every
383
# signature to see if it exists, rather than waiting to do them all at
384
# once at the end. The fetch code then does an all-at-once and just
385
# allows for some of them to be missing.
386
# So we know there will be extra calls, but the *last* one is the one
388
signature_calls = source.signatures.calls[-1:]
389
self.assertEqual(('get_record_stream', [('rev-one',)],
390
target._fetch_order, False),
391
self.find_get_record_stream(signature_calls))
393
def test_fetch_no_deltas_with_delta_closure(self):
394
tree = self.make_branch_and_tree('source', format='dirstate')
395
target = self.make_repository('target', format='pack-0.92')
396
self.build_tree(['source/file'])
397
tree.set_root_id('root-id')
398
tree.add('file', 'file-id')
399
tree.commit('one', rev_id='rev-one')
400
source = tree.branch.repository
401
source.texts = versionedfile.RecordingVersionedFilesDecorator(
403
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
405
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
407
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
409
target._fetch_uses_deltas = False
410
target.fetch(source, revision_id='rev-one')
411
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
412
target._fetch_order, True),
413
self.find_get_record_stream(source.texts.calls))
414
self.assertEqual(('get_record_stream', [('rev-one',)],
415
target._fetch_order, True),
416
self.find_get_record_stream(source.inventories.calls))
417
self.assertEqual(('get_record_stream', [('rev-one',)],
418
target._fetch_order, True),
419
self.find_get_record_stream(source.revisions.calls))
420
# XXX: Signatures is special, and slightly broken. The
421
# standard item_keys_introduced_by actually does a lookup for every
422
# signature to see if it exists, rather than waiting to do them all at
423
# once at the end. The fetch code then does an all-at-once and just
424
# allows for some of them to be missing.
425
# So we know there will be extra calls, but the *last* one is the one
427
signature_calls = source.signatures.calls[-1:]
428
self.assertEqual(('get_record_stream', [('rev-one',)],
429
target._fetch_order, True),
430
self.find_get_record_stream(signature_calls))
432
def test_fetch_revisions_with_deltas_into_pack(self):
433
# See BUG #261339, dev versions of bzr could accidentally create deltas
434
# in revision texts in knit branches (when fetching from packs). So we
435
# ensure that *if* a knit repository has a delta in revisions, that it
436
# gets properly expanded back into a fulltext when stored in the pack
438
tree = self.make_branch_and_tree('source', format='dirstate')
439
target = self.make_repository('target', format='pack-0.92')
440
self.build_tree(['source/file'])
441
tree.set_root_id('root-id')
442
tree.add('file', 'file-id')
443
tree.commit('one', rev_id='rev-one')
444
# Hack the KVF for revisions so that it "accidentally" allows a delta
445
tree.branch.repository.revisions._max_delta_chain = 200
446
tree.commit('two', rev_id='rev-two')
447
source = tree.branch.repository
448
# Ensure that we stored a delta
450
self.addCleanup(source.unlock)
451
record = source.revisions.get_record_stream([('rev-two',)],
452
'unordered', False).next()
453
self.assertEqual('knit-delta-gz', record.storage_kind)
454
target.fetch(tree.branch.repository, revision_id='rev-two')
455
# The record should get expanded back to a fulltext
457
self.addCleanup(target.unlock)
458
record = target.revisions.get_record_stream([('rev-two',)],
459
'unordered', False).next()
460
self.assertEqual('knit-ft-gz', record.storage_kind)
462
def test_fetch_with_fallback_and_merge(self):
463
builder = self.make_branch_builder('source', format='pack-0.92')
464
builder.start_series()
475
# A & B are present in the base (stacked-on) repository, A-E are
476
# present in the source.
477
# This reproduces bug #304841
478
# We need a large enough inventory that total size of compressed deltas
479
# is shorter than the size of a compressed fulltext. We have to use
480
# random ids because otherwise the inventory fulltext compresses too
481
# well and the deltas get bigger.
483
('add', ('', 'TREE_ROOT', 'directory', None))]
485
fname = 'file%03d' % (i,)
486
fileid = '%s-%s' % (fname, osutils.rand_chars(64))
487
to_add.append(('add', (fname, fileid, 'file', 'content\n')))
488
builder.build_snapshot('A', None, to_add)
489
builder.build_snapshot('B', ['A'], [])
490
builder.build_snapshot('C', ['A'], [])
491
builder.build_snapshot('D', ['C'], [])
492
builder.build_snapshot('E', ['D'], [])
493
builder.build_snapshot('F', ['E', 'B'], [])
494
builder.finish_series()
495
source_branch = builder.get_branch()
496
source_branch.bzrdir.sprout('base', revision_id='B')
497
target_branch = self.make_branch('target', format='1.6')
498
target_branch.set_stacked_on_url('../base')
499
source = source_branch.repository
501
self.addCleanup(source.unlock)
502
source.inventories = versionedfile.OrderingVersionedFilesDecorator(
504
key_priority={('E',): 1, ('D',): 2, ('C',): 4,
506
# Ensure that the content is yielded in the proper order, and given as
508
records = [(record.key, record.storage_kind)
509
for record in source.inventories.get_record_stream(
510
[('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
511
self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
512
(('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
515
target_branch.lock_write()
516
self.addCleanup(target_branch.unlock)
517
target = target_branch.repository
518
target.fetch(source, revision_id='F')
519
# 'C' should be expanded to a fulltext, but D and E should still be
521
stream = target.inventories.get_record_stream(
522
[('C',), ('D',), ('E',), ('F',)],
524
kinds = dict((record.key, record.storage_kind) for record in stream)
525
self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
526
('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
530
class Test1To2Fetch(TestCaseWithTransport):
531
"""Tests for Model1To2 failure modes"""
533
def make_tree_and_repo(self):
534
self.tree = self.make_branch_and_tree('tree', format='pack-0.92')
535
self.repo = self.make_repository('rich-repo', format='rich-root-pack')
536
self.repo.lock_write()
537
self.addCleanup(self.repo.unlock)
539
def do_fetch_order_test(self, first, second):
540
"""Test that fetch works no matter what the set order of revision is.
542
This test depends on the order of items in a set, which is
543
implementation-dependant, so we test A, B and then B, A.
545
self.make_tree_and_repo()
546
self.tree.commit('Commit 1', rev_id=first)
547
self.tree.commit('Commit 2', rev_id=second)
548
self.repo.fetch(self.tree.branch.repository, second)
550
def test_fetch_order_AB(self):
551
"""See do_fetch_order_test"""
552
self.do_fetch_order_test('A', 'B')
554
def test_fetch_order_BA(self):
555
"""See do_fetch_order_test"""
556
self.do_fetch_order_test('B', 'A')
558
def get_parents(self, file_id, revision_id):
559
self.repo.lock_read()
561
parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
562
return parent_map[(file_id, revision_id)]
566
def test_fetch_ghosts(self):
567
self.make_tree_and_repo()
568
self.tree.commit('first commit', rev_id='left-parent')
569
self.tree.add_parent_tree_id('ghost-parent')
570
fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
571
fork.commit('not a ghost', rev_id='not-ghost-parent')
572
self.tree.branch.repository.fetch(fork.branch.repository,
574
self.tree.add_parent_tree_id('not-ghost-parent')
575
self.tree.commit('second commit', rev_id='second-id')
576
self.repo.fetch(self.tree.branch.repository, 'second-id')
577
root_id = self.tree.get_root_id()
579
((root_id, 'left-parent'), (root_id, 'ghost-parent'),
580
(root_id, 'not-ghost-parent')),
581
self.get_parents(root_id, 'second-id'))
583
def make_two_commits(self, change_root, fetch_twice):
584
self.make_tree_and_repo()
585
self.tree.commit('first commit', rev_id='first-id')
587
self.tree.set_root_id('unique-id')
588
self.tree.commit('second commit', rev_id='second-id')
590
self.repo.fetch(self.tree.branch.repository, 'first-id')
591
self.repo.fetch(self.tree.branch.repository, 'second-id')
593
def test_fetch_changed_root(self):
594
self.make_two_commits(change_root=True, fetch_twice=False)
595
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
597
def test_two_fetch_changed_root(self):
598
self.make_two_commits(change_root=True, fetch_twice=True)
599
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
601
def test_two_fetches(self):
602
self.make_two_commits(change_root=False, fetch_twice=True)
603
self.assertEqual((('TREE_ROOT', 'first-id'),),
604
self.get_parents('TREE_ROOT', 'second-id'))
added
removed
bzrlib/tests/test_fetch.py
