/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/repository_implementations/test_commit_builder.py

Merge commit refactoring.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_commit_builder.py
46
46
                tree.unlock()
47
47
            parent_tree = tree.branch.repository.revision_tree(None)
48
48
            parent_invs = []
49
 
            builder.record_entry_contents(ie, parent_invs, '', tree)
 
49
            builder.record_entry_contents(ie, parent_invs, '', tree,
 
50
                tree.path_content_summary(''))
50
51
 
51
52
    def test_finish_inventory(self):
52
53
        tree = self.make_branch_and_tree(".")
127
128
            builder = tree.branch.get_commit_builder([])
128
129
            self.callDeprecated(['Root entry should be supplied to'
129
130
                ' record_entry_contents, as of bzr 0.10.'],
130
 
                builder.record_entry_contents, entry, [], 'foo', tree)
 
131
                builder.record_entry_contents, entry, [], 'foo', tree,
 
132
                    tree.path_content_summary('foo'))
131
133
            builder.finish_inventory()
132
134
            rev_id = builder.commit('foo bar')
133
135
        finally: