← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.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/knit.py
1193
1193
    def get_known_graph_ancestry(self, keys):
1194
1194
        """Get a KnownGraph instance with the ancestry of keys."""
1195
1195
        parent_map, missing_keys = self._index.find_ancestry(keys)
 
1196
        for fallback in self._fallback_vfs:
 
1197
            if not missing_keys:
 
1198
                break
 
1199
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
 
1200
                                                missing_keys)
 
1201
            parent_map.update(f_parent_map)
 
1202
            missing_keys = f_missing_keys
1196
1203
        kg = _mod_graph.KnownGraph(parent_map)
1197
1204
        return kg
1198
1205