← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
352
352
        self.inv_D = self.branch.repository.get_inventory('D')
353
353
        self.file_active = self.wt.inventory['fileid']
354
354
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
355
 
            self.branch.get_transaction())
 
355
            self.branch.repository.get_transaction())
356
356
        
357
357
    def get_previous_heads(self, inventories):
358
 
        return self.file_active.find_previous_heads(inventories, self.weave)
 
358
        return self.file_active.find_previous_heads(
 
359
            inventories, 
 
360
            self.branch.repository.weave_store,
 
361
            self.branch.repository.get_transaction())
359
362
        
360
363
    def test_fileid_in_no_inventory(self):
361
364
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))