← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
https://launchpad.net/bugs/177390
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
24
24
    errors,
25
25
    merge,
26
26
    repository,
27
 
    versionedfile,
28
27
    )
29
28
from bzrlib.branch import Branch
30
29
from bzrlib.bzrdir import BzrDir
31
30
from bzrlib.repofmt import knitrepo
 
31
from bzrlib.symbol_versioning import (
 
32
    zero_ninetyone,
 
33
    )
32
34
from bzrlib.tests import TestCaseWithTransport
33
 
from bzrlib.tests.http_utils import TestCaseWithWebserver
 
35
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
34
36
from bzrlib.tests.test_revision import make_branches
35
37
from bzrlib.trace import mutter
36
38
from bzrlib.upgrade import Convert
147
149
        branch = self.make_branch('branch', format=knit2_format)
148
150
        branch.pull(tree.branch, stop_revision='rev1')
149
151
        repo = branch.repository
150
 
        repo.lock_read()
151
 
        try:
152
 
            # Make sure fetch retrieved only what we requested
153
 
            self.assertEqual({('tree-root', 'rev1'):()},
154
 
                repo.texts.get_parent_map(
155
 
                    [('tree-root', 'rev1'), ('tree-root', 'rev2')]))
156
 
        finally:
157
 
            repo.unlock()
 
152
        root_knit = repo.weave_store.get_weave('tree-root',
 
153
                                                repo.get_transaction())
 
154
        # Make sure fetch retrieved only what we requested
 
155
        self.assertTrue('rev1' in root_knit)
 
156
        self.assertTrue('rev2' not in root_knit)
158
157
        branch.pull(tree.branch)
 
158
        root_knit = repo.weave_store.get_weave('tree-root',
 
159
                                                repo.get_transaction())
159
160
        # Make sure that the next revision in the root knit was retrieved,
160
161
        # even though the text, name, parent_id, etc., were unchanged.
161
 
        repo.lock_read()
162
 
        try:
163
 
            # Make sure fetch retrieved only what we requested
164
 
            self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
165
 
                repo.texts.get_parent_map([('tree-root', 'rev2')]))
166
 
        finally:
167
 
            repo.unlock()
 
162
        self.assertTrue('rev2' in root_knit)
168
163
 
169
164
    def test_fetch_incompatible(self):
170
165
        knit_tree = self.make_branch_and_tree('knit', format='knit')
171
166
        knit3_tree = self.make_branch_and_tree('knit3',
172
167
            format='dirstate-with-subtree')
173
168
        knit3_tree.commit('blah')
174
 
        e = self.assertRaises(errors.IncompatibleRepositories,
175
 
                              knit_tree.branch.fetch, knit3_tree.branch)
176
 
        self.assertContainsRe(str(e),
177
 
            r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
178
 
            r"different rich-root support")
 
169
        self.assertRaises(errors.IncompatibleRepositories,
 
170
                          knit_tree.branch.fetch, knit3_tree.branch)
179
171
 
180
172
 
181
173
class TestMergeFetch(TestCaseWithTransport):
293
285
        # unfortunately this log entry is branch format specific. We could 
294
286
        # factor out the 'what files does this format use' to a method on the 
295
287
        # repository, which would let us to this generically. RBC 20060419
296
 
        # RBC 20080408: Or perhaps we can assert that no files are fully read
297
 
        # twice?
298
288
        self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
299
289
        self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
300
290
        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
306
296
                                                     http_logs))
307
297
        # FIXME naughty poking in there.
308
298
        self.get_readonly_server().logs = []
309
 
        # check there is nothing more to fetch.  We take care to re-use the
310
 
        # existing transport so that the request logs we're about to examine
311
 
        # aren't cluttered with redundant probes for a smart server.
312
 
        # XXX: Perhaps this further parameterisation: test http with smart
313
 
        # server, and test http without smart server?
314
 
        source = Branch.open(
315
 
            self.get_readonly_url("source/"),
316
 
            possible_transports=[source.bzrdir.root_transport])
 
299
        # check there is nothing more to fetch
 
300
        source = Branch.open(self.get_readonly_url("source/"))
317
301
        self.assertEqual(target.fetch(source), (0, []))
318
302
        # should make just two requests
319
303
        http_logs = self.get_readonly_server().logs
321
305
        self.log('\n'.join(http_logs))
322
306
        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
323
307
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
324
 
        self.assertEqual(1, self._count_log_matches('repository/format',
325
 
            http_logs))
 
308
        self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
326
309
        self.assertTrue(1 >= self._count_log_matches('revision-history',
327
310
                                                     http_logs))
328
311
        self.assertTrue(1 >= self._count_log_matches('last-revision',
329
312
                                                     http_logs))
330
313
        self.assertEqual(4, len(http_logs))
331
 
 
332
 
 
333
 
class TestKnitToPackFetch(TestCaseWithTransport):
334
 
 
335
 
    def find_get_record_stream(self, calls):
336
 
        """In a list of calls, find 'get_record_stream' calls.
337
 
 
338
 
        This also ensures that there is only one get_record_stream call.
339
 
        """
340
 
        get_record_call = None
341
 
        for call in calls:
342
 
            if call[0] == 'get_record_stream':
343
 
                self.assertIs(None, get_record_call,
344
 
                              "there should only be one call to"
345
 
                              " get_record_stream")
346
 
                get_record_call = call
347
 
        self.assertIsNot(None, get_record_call,
348
 
                         "there should be exactly one call to "
349
 
                         " get_record_stream")
350
 
        return get_record_call
351
 
 
352
 
    def test_fetch_with_deltas_no_delta_closure(self):
353
 
        tree = self.make_branch_and_tree('source', format='dirstate')
354
 
        target = self.make_repository('target', format='pack-0.92')
355
 
        self.build_tree(['source/file'])
356
 
        tree.set_root_id('root-id')
357
 
        tree.add('file', 'file-id')
358
 
        tree.commit('one', rev_id='rev-one')
359
 
        source = tree.branch.repository
360
 
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
361
 
                        source.texts)
362
 
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
363
 
                        source.signatures)
364
 
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
365
 
                        source.revisions)
366
 
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
367
 
                        source.inventories)
368
 
        # precondition
369
 
        self.assertTrue(target._fetch_uses_deltas)
370
 
        target.fetch(source, revision_id='rev-one')
371
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
372
 
                          target._fetch_order, False),
373
 
                         self.find_get_record_stream(source.texts.calls))
374
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
375
 
                          target._fetch_order, False),
376
 
                         self.find_get_record_stream(source.inventories.calls))
377
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
378
 
                          target._fetch_order, False),
379
 
                         self.find_get_record_stream(source.revisions.calls))
380
 
        # XXX: Signatures is special, and slightly broken. The
381
 
        # standard item_keys_introduced_by actually does a lookup for every
382
 
        # signature to see if it exists, rather than waiting to do them all at
383
 
        # once at the end. The fetch code then does an all-at-once and just
384
 
        # allows for some of them to be missing.
385
 
        # So we know there will be extra calls, but the *last* one is the one
386
 
        # we care about.
387
 
        signature_calls = source.signatures.calls[-1:]
388
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
389
 
                          target._fetch_order, False),
390
 
                         self.find_get_record_stream(signature_calls))
391
 
 
392
 
    def test_fetch_no_deltas_with_delta_closure(self):
393
 
        tree = self.make_branch_and_tree('source', format='dirstate')
394
 
        target = self.make_repository('target', format='pack-0.92')
395
 
        self.build_tree(['source/file'])
396
 
        tree.set_root_id('root-id')
397
 
        tree.add('file', 'file-id')
398
 
        tree.commit('one', rev_id='rev-one')
399
 
        source = tree.branch.repository
400
 
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
401
 
                        source.texts)
402
 
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
403
 
                        source.signatures)
404
 
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
405
 
                        source.revisions)
406
 
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
407
 
                        source.inventories)
408
 
        target._fetch_uses_deltas = False
409
 
        target.fetch(source, revision_id='rev-one')
410
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
411
 
                          target._fetch_order, True),
412
 
                         self.find_get_record_stream(source.texts.calls))
413
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
414
 
                          target._fetch_order, True),
415
 
                         self.find_get_record_stream(source.inventories.calls))
416
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
417
 
                          target._fetch_order, True),
418
 
                         self.find_get_record_stream(source.revisions.calls))
419
 
        # XXX: Signatures is special, and slightly broken. The
420
 
        # standard item_keys_introduced_by actually does a lookup for every
421
 
        # signature to see if it exists, rather than waiting to do them all at
422
 
        # once at the end. The fetch code then does an all-at-once and just
423
 
        # allows for some of them to be missing.
424
 
        # So we know there will be extra calls, but the *last* one is the one
425
 
        # we care about.
426
 
        signature_calls = source.signatures.calls[-1:]
427
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
428
 
                          target._fetch_order, True),
429
 
                         self.find_get_record_stream(signature_calls))
430
 
 
431
 
 
432
 
class Test1To2Fetch(TestCaseWithTransport):
433
 
    """Tests for Model1To2 failure modes"""
434
 
 
435
 
    def make_tree_and_repo(self):
436
 
        self.tree = self.make_branch_and_tree('tree', format='pack-0.92')
437
 
        self.repo = self.make_repository('rich-repo', format='rich-root-pack')
438
 
        self.repo.lock_write()
439
 
        self.addCleanup(self.repo.unlock)
440
 
 
441
 
    def do_fetch_order_test(self, first, second):
442
 
        """Test that fetch works no matter what the set order of revision is.
443
 
 
444
 
        This test depends on the order of items in a set, which is
445
 
        implementation-dependant, so we test A, B and then B, A.
446
 
        """
447
 
        self.make_tree_and_repo()
448
 
        self.tree.commit('Commit 1', rev_id=first)
449
 
        self.tree.commit('Commit 2', rev_id=second)
450
 
        self.repo.fetch(self.tree.branch.repository, second)
451
 
 
452
 
    def test_fetch_order_AB(self):
453
 
        """See do_fetch_order_test"""
454
 
        self.do_fetch_order_test('A', 'B')
455
 
 
456
 
    def test_fetch_order_BA(self):
457
 
        """See do_fetch_order_test"""
458
 
        self.do_fetch_order_test('B', 'A')
459
 
 
460
 
    def get_parents(self, file_id, revision_id):
461
 
        self.repo.lock_read()
462
 
        try:
463
 
            parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
464
 
            return parent_map[(file_id, revision_id)]
465
 
        finally:
466
 
            self.repo.unlock()
467
 
 
468
 
    def test_fetch_ghosts(self):
469
 
        self.make_tree_and_repo()
470
 
        self.tree.commit('first commit', rev_id='left-parent')
471
 
        self.tree.add_parent_tree_id('ghost-parent')
472
 
        fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
473
 
        fork.commit('not a ghost', rev_id='not-ghost-parent')
474
 
        self.tree.branch.repository.fetch(fork.branch.repository,
475
 
                                     'not-ghost-parent')
476
 
        self.tree.add_parent_tree_id('not-ghost-parent')
477
 
        self.tree.commit('second commit', rev_id='second-id')
478
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
479
 
        root_id = self.tree.get_root_id()
480
 
        self.assertEqual(
481
 
            ((root_id, 'left-parent'), (root_id, 'ghost-parent'),
482
 
             (root_id, 'not-ghost-parent')),
483
 
            self.get_parents(root_id, 'second-id'))
484
 
 
485
 
    def make_two_commits(self, change_root, fetch_twice):
486
 
        self.make_tree_and_repo()
487
 
        self.tree.commit('first commit', rev_id='first-id')
488
 
        if change_root:
489
 
            self.tree.set_root_id('unique-id')
490
 
        self.tree.commit('second commit', rev_id='second-id')
491
 
        if fetch_twice:
492
 
            self.repo.fetch(self.tree.branch.repository, 'first-id')
493
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
494
 
 
495
 
    def test_fetch_changed_root(self):
496
 
        self.make_two_commits(change_root=True, fetch_twice=False)
497
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
498
 
 
499
 
    def test_two_fetch_changed_root(self):
500
 
        self.make_two_commits(change_root=True, fetch_twice=True)
501
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
502
 
 
503
 
    def test_two_fetches(self):
504
 
        self.make_two_commits(change_root=False, fetch_twice=True)
505
 
        self.assertEqual((('TREE_ROOT', 'first-id'),),
506
 
            self.get_parents('TREE_ROOT', 'second-id'))