← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-30 22:15:30 UTC
  • mfrom: (4663.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090830221530-cyl2ubhnn49s05m2
(robertc) Merge 2.0 to bzr.dev,
        including fixes for log and serialisation of
        IncompatibleRepositories. (Robert Collins, John Arbash Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
1210
1210
 
1211
1211
    def get_known_graph_ancestry(self, keys):
1212
1212
        """Get a KnownGraph instance with the ancestry of keys."""
1213
 
        parent_map, missing_keys = self._index._graph_index.find_ancestry(keys,
1214
 
                                                                          0)
 
1213
        # Note that this is identical to
 
1214
        # KnitVersionedFiles.get_known_graph_ancestry, but they don't share
 
1215
        # ancestry.
 
1216
        parent_map, missing_keys = self._index.find_ancestry(keys)
 
1217
        for fallback in self._fallback_vfs:
 
1218
            if not missing_keys:
 
1219
                break
 
1220
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
 
1221
                                                missing_keys)
 
1222
            parent_map.update(f_parent_map)
 
1223
            missing_keys = f_missing_keys
1215
1224
        kg = _mod_graph.KnownGraph(parent_map)
1216
1225
        return kg
1217
1226
 
1831
1840
            if missing_keys:
1832
1841
                raise errors.RevisionNotPresent(missing_keys.pop(), self)
1833
1842
 
 
1843
    def find_ancestry(self, keys):
 
1844
        """See CombinedGraphIndex.find_ancestry"""
 
1845
        return self._graph_index.find_ancestry(keys, 0)
 
1846
 
1834
1847
    def get_parent_map(self, keys):
1835
1848
        """Get a map of the parents of keys.
1836
1849