~bzr/bzr/bzr.1.5

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Reinstate the transaction cache for bzr 1.5rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
1279
1279
                setdefault(file_id, set()).add(revision_id)
1280
1280
        return result
1281
1281
 
1282
 
    def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
 
1282
    def fileids_altered_by_revision_ids(self, revision_ids):
1283
1283
        """Find the file ids and versions affected by revisions.
1284
1284
 
1285
1285
        :param revisions: an iterable containing revision ids.
1286
 
        :param _inv_weave: The inventory weave from this repository or None.
1287
 
            If None, the inventory weave will be opened automatically.
1288
1286
        :return: a dictionary mapping altered file-ids to an iterable of
1289
1287
        revision_ids. Each altered file-ids has the exact revision_ids that
1290
1288
        altered it listed explicitly.
1291
1289
        """
1292
1290
        selected_revision_ids = set(revision_ids)
1293
 
        w = _inv_weave or self.get_inventory_weave()
 
1291
        w = self.get_inventory_weave()
1294
1292
        pb = ui.ui_factory.nested_progress_bar()
1295
1293
        try:
1296
1294
            return self._find_file_ids_from_xml_inventory_lines(
1451
1449
        inv_w = self.get_inventory_weave()
1452
1450
 
1453
1451
        # file ids that changed
1454
 
        file_ids = self.fileids_altered_by_revision_ids(revision_ids, inv_w)
 
1452
        file_ids = self.fileids_altered_by_revision_ids(revision_ids)
1455
1453
        count = 0
1456
1454
        num_file_ids = len(file_ids)
1457
1455
        for file_id, altered_versions in file_ids.iteritems():