/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-05-08 16:02:52 UTC
  • mfrom: (5837 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5838.
  • Revision ID: jelmer@samba.org-20110508160252-akovn3laoln5sfx9
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
535
535
        basis_tree = tree.basis_tree()
536
536
        basis_tree.lock_read()
537
537
        self.addCleanup(basis_tree.unlock)
538
 
        self.assertEqual(rev_id, basis_tree.inventory.root.revision)
 
538
        self.assertEqual(rev_id,
 
539
            basis_tree.get_file_revision(basis_tree.get_root_id()))
539
540
 
540
541
    def _get_revtrees(self, tree, revision_ids):
541
542
        tree.lock_read()
555
556
        rev1 = tree.commit('')
556
557
        rev2 = tree.commit('')
557
558
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
558
 
        self.assertEqual(rev1, tree1.inventory.root.revision)
 
559
        self.assertEqual(rev1, tree1.get_file_revision(tree1.get_root_id()))
559
560
        if tree.branch.repository.supports_rich_root():
560
 
            self.assertEqual(rev1, tree2.inventory.root.revision)
 
561
            self.assertEqual(rev1,
 
562
                tree2.get_file_revision(tree2.get_root_id()))
561
563
        else:
562
 
            self.assertEqual(rev2, tree2.inventory.root.revision)
 
564
            self.assertEqual(rev2,
 
565
                tree2.get_file_revision(tree2.get_root_id()))
563
566
 
564
567
    def _add_commit_check_unchanged(self, tree, name, mini_commit=None):
565
568
        tree.add([name], [name + 'id'])