← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 22:23:20 UTC
  • mfrom: (5825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5830.
  • Revision ID: jelmer@samba.org-20110504222320-bczsppms2wadcrb4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_repository.py
210
210
        rev_tree = tree.branch.repository.revision_tree(second_revision)
211
211
        rev_tree.lock_read()
212
212
        self.addCleanup(rev_tree.unlock)
213
 
        inv = rev_tree.inventory
214
 
        rich_root = (inv.root.revision != second_revision)
 
213
        root_revision = rev_tree.get_file_revision(rev_tree.get_root_id())
 
214
        rich_root = (root_revision != second_revision)
215
215
        self.assertEqual(rich_root,
216
216
                         tree.branch.repository.supports_rich_root())
217
217
 
545
545
        rev_tree = tree.branch.repository.revision_tree(tree.last_revision())
546
546
        rev_tree.lock_read()
547
547
        self.addCleanup(rev_tree.unlock)
548
 
        self.assertEqual('rev_id', rev_tree.inventory.root.revision)
 
548
        root_id = rev_tree.get_root_id()
 
549
        self.assertEqual('rev_id', rev_tree.get_file_revision(root_id))
549
550
 
550
551
    def test_pointless_commit(self):
551
552
        tree = self.make_branch_and_tree('.')
635
636
            # expected_record_names.
636
637
            # Note that the file keys can be in any order, so this test is
637
638
            # written to allow that.
638
 
            inv = repo.get_inventory('rev_id')
639
 
            root_item_key = ('file', inv.root.file_id, ['rev_id'])
 
639
            rev_tree = repo.revision_tree('rev_id')
 
640
            root_item_key = ('file', rev_tree.get_root_id(), ['rev_id'])
640
641
            self.assertTrue(root_item_key in item_keys)
641
642
            item_keys.remove(root_item_key)
642
643
 
758
759
        self.assertEquals(inv_sha1, repo.get_revision('A').inventory_sha1)
759
760
        repo.unlock()
760
761
 
761
 
    def test_install_revisions(self):
762
 
        wt = self.make_branch_and_tree('source')
763
 
        wt.commit('A', allow_pointless=True, rev_id='A')
764
 
        repo = wt.branch.repository
765
 
        repo.lock_write()
766
 
        repo.start_write_group()
767
 
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
768
 
        repo.commit_write_group()
769
 
        repo.unlock()
770
 
        repo.lock_read()
771
 
        self.addCleanup(repo.unlock)
772
 
        repo2 = self.make_repository('repo2')
773
 
        revision = repo.get_revision('A')
774
 
        tree = repo.revision_tree('A')
775
 
        signature = repo.get_signature_text('A')
776
 
        repo2.lock_write()
777
 
        self.addCleanup(repo2.unlock)
778
 
        repository.install_revisions(repo2, [(revision, tree, signature)])
779
 
        self.assertEqual(revision, repo2.get_revision('A'))
780
 
        self.assertEqual(signature, repo2.get_signature_text('A'))
781
 
 
782
762
    # XXX: this helper duplicated from tests.test_repository
783
763
    def make_remote_repository(self, path, shared=False):
784
764
        """Make a RemoteRepository object backed by a real repository that will