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

  • Committer: Jelmer Vernooij
  • Date: 2011-05-18 10:24:05 UTC
  • mfrom: (5889 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5903.
  • Revision ID: jelmer@samba.org-20110518102405-isallt5uet1afh4f
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1435
1435
        """
1436
1436
        raise NotImplementedError(self.add_fallback_versioned_files)
1437
1437
 
 
1438
    def get_known_graph_ancestry(self, keys):
 
1439
        """Get a KnownGraph instance with the ancestry of keys."""
 
1440
        parent_map, missing_keys = self._index.find_ancestry(keys)
 
1441
        for fallback in self._transitive_fallbacks():
 
1442
            if not missing_keys:
 
1443
                break
 
1444
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
 
1445
                                                missing_keys)
 
1446
            parent_map.update(f_parent_map)
 
1447
            missing_keys = f_missing_keys
 
1448
        kg = _mod_graph.KnownGraph(parent_map)
 
1449
        return kg
 
1450
 
1438
1451
 
1439
1452
class _PlanMergeVersionedFile(VersionedFiles):
1440
1453
    """A VersionedFile for uncommitted and committed texts.