/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: John Arbash Meinel
  • Date: 2011-05-06 14:53:40 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5846.
  • Revision ID: john@arbash-meinel.com-20110506145340-whf3chalcyhar9ag
Merge bzr.dev 5835 in prep for release-notes updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
118
118
        finally:
119
119
            tree.unlock()
120
120
 
 
121
    def test_commit_lossy(self):
 
122
        tree = self.make_branch_and_tree(".")
 
123
        tree.lock_write()
 
124
        try:
 
125
            builder = tree.branch.get_commit_builder([], lossy=True)
 
126
            list(builder.record_iter_changes(tree, tree.last_revision(),
 
127
                tree.iter_changes(tree.basis_tree())))
 
128
            builder.finish_inventory()
 
129
            rev_id = builder.commit('foo bar blah')
 
130
        finally:
 
131
            tree.unlock()
 
132
        rev = tree.branch.repository.get_revision(rev_id)
 
133
        self.assertEqual('foo bar blah', rev.message)
 
134
 
121
135
    def test_commit_message(self):
122
136
        tree = self.make_branch_and_tree(".")
123
137
        tree.lock_write()
521
535
        basis_tree = tree.basis_tree()
522
536
        basis_tree.lock_read()
523
537
        self.addCleanup(basis_tree.unlock)
524
 
        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()))
525
540
 
526
541
    def _get_revtrees(self, tree, revision_ids):
527
542
        tree.lock_read()
541
556
        rev1 = tree.commit('')
542
557
        rev2 = tree.commit('')
543
558
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
544
 
        self.assertEqual(rev1, tree1.inventory.root.revision)
 
559
        self.assertEqual(rev1, tree1.get_file_revision(tree1.get_root_id()))
545
560
        if tree.branch.repository.supports_rich_root():
546
 
            self.assertEqual(rev1, tree2.inventory.root.revision)
 
561
            self.assertEqual(rev1,
 
562
                tree2.get_file_revision(tree2.get_root_id()))
547
563
        else:
548
 
            self.assertEqual(rev2, tree2.inventory.root.revision)
 
564
            self.assertEqual(rev2,
 
565
                tree2.get_file_revision(tree2.get_root_id()))
549
566
 
550
567
    def _add_commit_check_unchanged(self, tree, name, mini_commit=None):
551
568
        tree.add([name], [name + 'id'])
558
575
            mini_commit = self.mini_commit
559
576
        rev2 = mini_commit(tree, name, name, False, False)
560
577
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
561
 
        self.assertEqual(rev1, tree1.inventory[file_id].revision)
562
 
        self.assertEqual(rev1, tree2.inventory[file_id].revision)
 
578
        self.assertEqual(rev1, tree1.get_file_revision(file_id))
 
579
        self.assertEqual(rev1, tree2.get_file_revision(file_id))
563
580
        expected_graph = {}
564
581
        expected_graph[(file_id, rev1)] = ()
565
582
        self.assertFileGraph(expected_graph, tree, (file_id, rev1))
588
605
        tree.add(['dir/content'], ['contentid'])
589
606
        rev2 = tree.commit('')
590
607
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
591
 
        self.assertEqual(rev1, tree1.inventory['dirid'].revision)
592
 
        self.assertEqual(rev1, tree2.inventory['dirid'].revision)
 
608
        self.assertEqual(rev1, tree1.get_file_revision('dirid'))
 
609
        self.assertEqual(rev1, tree2.get_file_revision('dirid'))
593
610
        file_id = 'dirid'
594
611
        expected_graph = {}
595
612
        expected_graph[(file_id, rev1)] = ()
798
815
        rev2 = mini_commit(tree, name, tree.id2path(file_id),
799
816
            expect_fs_hash=expect_fs_hash)
800
817
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
801
 
        self.assertEqual(rev1, tree1.inventory[file_id].revision)
802
 
        self.assertEqual(rev2, tree2.inventory[file_id].revision)
 
818
        self.assertEqual(rev1, tree1.get_file_revision(file_id))
 
819
        self.assertEqual(rev2, tree2.get_file_revision(file_id))
803
820
        expected_graph = {}
804
821
        expected_graph[(file_id, rev1)] = ()
805
822
        expected_graph[(file_id, rev2)] = ((file_id, rev1),)
1059
1076
        rev4 = mini_commit(tree1, 'new_' + name, 'new_' + name,
1060
1077
            expect_fs_hash=expect_fs_hash)
1061
1078
        tree3, = self._get_revtrees(tree1, [rev4])
1062
 
        self.assertEqual(rev4, tree3.inventory[name + 'id'].revision)
 
1079
        self.assertEqual(rev4, tree3.get_file_revision(name + 'id'))
1063
1080
        file_id = name + 'id'
1064
1081
        expected_graph = {}
1065
1082
        expected_graph[(file_id, rev1)] = ()
1125
1142
            rev3 = mini_commit(in_tree, name, 'new_' + name, False,
1126
1143
                delta_against_basis=changed_in_tree)
1127
1144
            tree3, = self._get_revtrees(in_tree, [rev2])
1128
 
            self.assertEqual(rev2, tree3.inventory[name + 'id'].revision)
 
1145
            self.assertEqual(rev2, tree3.get_file_revision(name + 'id'))
1129
1146
            file_id = name + 'id'
1130
1147
            expected_graph = {}
1131
1148
            expected_graph[(file_id, rev1)] = ()
1157
1174
        rev3 = mini_commit(tree1, None, 'name', False)
1158
1175
        tree3, = self._get_revtrees(tree1, [rev2])
1159
1176
        # in rev2, name should be only changed in rev2
1160
 
        self.assertEqual(rev2, tree3.inventory[file_id].revision)
 
1177
        self.assertEqual(rev2, tree3.get_file_revision(file_id))
1161
1178
        expected_graph = {}
1162
1179
        expected_graph[(file_id, rev2)] = ()
1163
1180
        self.assertFileGraph(expected_graph, tree1, (file_id, rev2))