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

  • Committer: John Arbash Meinel
  • Date: 2009-06-23 20:20:39 UTC
  • mto: This revision was merged to the branch mainline in revision 4522.
  • Revision ID: john@arbash-meinel.com-20090623202039-kr6mxu576z5vc4y5
Initial implementation of a Pyrex annotator.

Drops the time down to 8.6s down from 9.7s.
This implementation is basically just a copy of the python one, so I'm
a bit surprised to see that much of a win already.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
3420
3420
        # if True or len(self._vf._fallback_vfs) > 0:
3421
3421
        if len(self._vf._fallback_vfs) > 0:
3422
3422
            # If we have fallbacks, go to the generic path
3423
 
            for v in super(_KnitAnnotator, self)._get_needed_texts(key, pb=pb):
 
3423
            for v in annotate.Annotator._get_needed_texts(self, key, pb=pb):
3424
3424
                yield v
3425
3425
            return
3426
3426
        while True:
3497
3497
            blocks = self._matching_blocks.pop(block_key)
3498
3498
            parent_annotations = self._annotations_cache[parent_key]
3499
3499
            return parent_annotations, blocks
3500
 
        return super(_KnitAnnotator, self)._get_parent_annotations_and_matches(
 
3500
        return annotate.Annotator._get_parent_annotations_and_matches(self,
3501
3501
            key, text, parent_key)
3502
3502
 
3503
3503
    def _process_pending(self, key):