/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/revisiontree.py

  • Committer: Jonathan Lange
  • Date: 2009-12-09 09:20:42 UTC
  • mfrom: (4881 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4907.
  • Revision ID: jml@canonical.com-20091209092042-s2zgqcf8f39yzxpj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
87
87
                      default_revision=revision.CURRENT_REVISION):
88
88
        """See Tree.annotate_iter"""
89
89
        text_key = (file_id, self.inventory[file_id].revision)
90
 
        annotations = self._repository.texts.annotate(text_key)
 
90
        annotator = self._repository.texts.get_annotator()
 
91
        annotations = annotator.annotate_flat(text_key)
91
92
        return [(key[-1], line) for key, line in annotations]
92
93
 
93
94
    def get_file_size(self, file_id):
241
242
        lookup_trees = [self.source]
242
243
        if extra_trees:
243
244
             lookup_trees.extend(extra_trees)
 
245
        # The ids of items we need to examine to insure delta consistency.
 
246
        precise_file_ids = set()
 
247
        discarded_changes = {}
244
248
        if specific_files == []:
245
249
            specific_file_ids = []
246
250
        else:
247
251
            specific_file_ids = self.target.paths2ids(specific_files,
248
252
                lookup_trees, require_versioned=require_versioned)
249
 
 
250
253
        # FIXME: It should be possible to delegate include_unchanged handling
251
254
        # to CHKInventory.iter_changes and do a better job there -- vila
252
255
        # 20090304
253
 
        if include_unchanged:
254
 
            changed_file_ids = []
 
256
        changed_file_ids = set()
255
257
        for result in self.target.inventory.iter_changes(self.source.inventory):
256
 
            if (specific_file_ids is not None
257
 
                and not result[0] in specific_file_ids):
258
 
                # CHKMap.iter_changes is clean and fast. Better filter out
259
 
                # the specific files *after* it did its job.
260
 
                continue
 
258
            if specific_file_ids is not None:
 
259
                file_id = result[0]
 
260
                if file_id not in specific_file_ids:
 
261
                    # A change from the whole tree that we don't want to show yet.
 
262
                    # We may find that we need to show it for delta consistency, so
 
263
                    # stash it.
 
264
                    discarded_changes[result[0]] = result
 
265
                    continue
 
266
                new_parent_id = result[4][1]
 
267
                precise_file_ids.add(new_parent_id)
261
268
            yield result
262
 
            if include_unchanged:
263
 
                # Keep track of yielded results (cheaper than building the
264
 
                # whole inventory).
265
 
                changed_file_ids.append(result[0])
 
269
            changed_file_ids.add(result[0])
 
270
        if specific_file_ids is not None:
 
271
            for result in self._handle_precise_ids(precise_file_ids,
 
272
                changed_file_ids, discarded_changes=discarded_changes):
 
273
                yield result
266
274
        if include_unchanged:
267
275
            # CHKMap avoid being O(tree), so we go to O(tree) only if
268
276
            # required to.