← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
447
447
        # start_revision_id.
448
448
        if self._merge_sorted_revisions_cache is None:
449
449
            last_revision = self.last_revision()
450
 
            last_key = (last_revision,)
451
 
            known_graph = self.repository.revisions.get_known_graph_ancestry(
452
 
                [last_key])
 
450
            known_graph = self.repository.get_known_graph_ancestry(
 
451
                [last_revision])
453
452
            self._merge_sorted_revisions_cache = known_graph.merge_sort(
454
 
                last_key)
 
453
                last_revision)
455
454
        filtered = self._filter_merge_sorted_revisions(
456
455
            self._merge_sorted_revisions_cache, start_revision_id,
457
456
            stop_revision_id, stop_rule)