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

  • Committer: Jelmer Vernooij
  • Date: 2011-05-18 10:41:51 UTC
  • mto: This revision was merged to the branch mainline in revision 5903.
  • Revision ID: jelmer@samba.org-20110518104151-he1uar3o6dxp1plp
Simplify revision limiting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
19
19
 
20
20
from bzrlib.lazy_import import lazy_import
21
21
lazy_import(globals(), """
 
22
import itertools
 
23
 
22
24
from bzrlib import (
23
25
    check,
24
26
    debug,
2585
2587
                not None):
2586
2588
            result = self._walk_to_common_revisions(revision_ids,
2587
2589
                    if_present_ids=if_present_ids)
 
2590
            if limit is None:
 
2591
                return result
2588
2592
            result_set = result.get_keys()
2589
2593
        else:
2590
2594
            # generic, possibly worst case, slow code path.
2593
2597
                revision_ids, if_present_ids)
2594
2598
            result_set = set(source_ids).difference(target_ids)
2595
2599
        if limit is not None:
2596
 
            graph = self.source.get_graph()
2597
 
            topo_ordered = list(graph.iter_topo_order(result_set))
2598
 
            result_set = set(topo_ordered[:limit])
 
2600
            topo_ordered = self.source.get_graph().iter_topo_order(result_set)
 
2601
            result_set = set(itertools.islice(topo_ordered, limit))
2599
2602
        return self.source.revision_ids_to_search_result(result_set)
2600
2603
 
2601
2604
    def _present_source_revisions_for(self, revision_ids, if_present_ids=None):