← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
19
19
import os
20
20
 
21
21
from bzrlib import (
 
22
    config,
22
23
    errors,
23
24
    graph,
24
25
    inventory,
117
118
        finally:
118
119
            tree.unlock()
119
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
 
120
135
    def test_commit_message(self):
121
136
        tree = self.make_branch_and_tree(".")
122
137
        tree.lock_write()
557
572
            mini_commit = self.mini_commit
558
573
        rev2 = mini_commit(tree, name, name, False, False)
559
574
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
560
 
        self.assertEqual(rev1, tree1.inventory[file_id].revision)
561
 
        self.assertEqual(rev1, tree2.inventory[file_id].revision)
 
575
        self.assertEqual(rev1, tree1.get_file_revision(file_id))
 
576
        self.assertEqual(rev1, tree2.get_file_revision(file_id))
562
577
        expected_graph = {}
563
578
        expected_graph[(file_id, rev1)] = ()
564
579
        self.assertFileGraph(expected_graph, tree, (file_id, rev1))
587
602
        tree.add(['dir/content'], ['contentid'])
588
603
        rev2 = tree.commit('')
589
604
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
590
 
        self.assertEqual(rev1, tree1.inventory['dirid'].revision)
591
 
        self.assertEqual(rev1, tree2.inventory['dirid'].revision)
 
605
        self.assertEqual(rev1, tree1.get_file_revision('dirid'))
 
606
        self.assertEqual(rev1, tree2.get_file_revision('dirid'))
592
607
        file_id = 'dirid'
593
608
        expected_graph = {}
594
609
        expected_graph[(file_id, rev1)] = ()
797
812
        rev2 = mini_commit(tree, name, tree.id2path(file_id),
798
813
            expect_fs_hash=expect_fs_hash)
799
814
        tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
800
 
        self.assertEqual(rev1, tree1.inventory[file_id].revision)
801
 
        self.assertEqual(rev2, tree2.inventory[file_id].revision)
 
815
        self.assertEqual(rev1, tree1.get_file_revision(file_id))
 
816
        self.assertEqual(rev2, tree2.get_file_revision(file_id))
802
817
        expected_graph = {}
803
818
        expected_graph[(file_id, rev1)] = ()
804
819
        expected_graph[(file_id, rev2)] = ((file_id, rev1),)
1058
1073
        rev4 = mini_commit(tree1, 'new_' + name, 'new_' + name,
1059
1074
            expect_fs_hash=expect_fs_hash)
1060
1075
        tree3, = self._get_revtrees(tree1, [rev4])
1061
 
        self.assertEqual(rev4, tree3.inventory[name + 'id'].revision)
 
1076
        self.assertEqual(rev4, tree3.get_file_revision(name + 'id'))
1062
1077
        file_id = name + 'id'
1063
1078
        expected_graph = {}
1064
1079
        expected_graph[(file_id, rev1)] = ()
1124
1139
            rev3 = mini_commit(in_tree, name, 'new_' + name, False,
1125
1140
                delta_against_basis=changed_in_tree)
1126
1141
            tree3, = self._get_revtrees(in_tree, [rev2])
1127
 
            self.assertEqual(rev2, tree3.inventory[name + 'id'].revision)
 
1142
            self.assertEqual(rev2, tree3.get_file_revision(name + 'id'))
1128
1143
            file_id = name + 'id'
1129
1144
            expected_graph = {}
1130
1145
            expected_graph[(file_id, rev1)] = ()
1156
1171
        rev3 = mini_commit(tree1, None, 'name', False)
1157
1172
        tree3, = self._get_revtrees(tree1, [rev2])
1158
1173
        # in rev2, name should be only changed in rev2
1159
 
        self.assertEqual(rev2, tree3.inventory[file_id].revision)
 
1174
        self.assertEqual(rev2, tree3.get_file_revision(file_id))
1160
1175
        expected_graph = {}
1161
1176
        expected_graph[(file_id, rev2)] = ()
1162
1177
        self.assertFileGraph(expected_graph, tree1, (file_id, rev2))
1361
1376
        # Ensure that when no username is available but a committer is
1362
1377
        # supplied, commit works.
1363
1378
        self.overrideEnv('EMAIL', None)
 
1379
        self.overrideEnv('BZR_EMAIL', None)
 
1380
        # Also, make sure that it's not inferred from mailname.
 
1381
        self.overrideAttr(config, '_auto_user_id',
 
1382
            lambda: (None, None))
1364
1383
        tree = self.make_branch_and_tree(".")
1365
1384
        tree.lock_write()
1366
1385
        try: