← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1338
1338
        """
1339
1339
        # All revisions, to find inventory parents.
1340
1340
        if ancestors is None:
1341
 
            revision_graph = self.get_revision_graph_with_ghosts()
1342
 
            ancestors = revision_graph.get_ancestors()
 
1341
            # self.get_revision_graph_with_ghosts().get_ancestors() wasn't
 
1342
            # returning any ghosts anyway.
 
1343
            ancestors = self.get_revision_graph()
1343
1344
        if text_key_references is None:
1344
1345
            text_key_references = self.find_text_key_references()
1345
1346
        pb = ui.ui_factory.nested_progress_bar()
1565
1566
        raise NotImplementedError(self.get_revision_graph)
1566
1567
 
1567
1568
    @needs_read_lock
 
1569
    @deprecated_method(symbol_versioning.one_three)
1568
1570
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1569
1571
        """Return a graph of the revisions with ghosts marked as applicable.
1570
1572