← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
32
32
from bzrlib import (
33
33
    annotate,
34
34
    errors,
 
35
    graph as _mod_graph,
35
36
    groupcompress,
36
37
    index,
37
38
    knit,
941
942
            if '\n' in line[:-1]:
942
943
                raise errors.BzrBadParameterContainsNewline("lines")
943
944
 
 
945
    def get_known_graph_ancestry(self, keys):
 
946
        """Get a KnownGraph instance with the ancestry of keys."""
 
947
        # most basic implementation is a loop around get_parent_map
 
948
        pending = set(keys)
 
949
        parent_map = {}
 
950
        while pending:
 
951
            this_parent_map = self.get_parent_map(pending)
 
952
            parent_map.update(this_parent_map)
 
953
            pending = set()
 
954
            map(pending.update, this_parent_map.itervalues())
 
955
            pending = pending.difference(parent_map)
 
956
        kg = _mod_graph.KnownGraph(parent_map)
 
957
        return kg
 
958
 
944
959
    def get_parent_map(self, keys):
945
960
        """Get a map of the parents of keys.
946
961
 
1571
1586
            record.get_bytes_as(record.storage_kind) call.
1572
1587
        """
1573
1588
        self._bytes_iterator = bytes_iterator
1574
 
        self._kind_factory = {'knit-ft-gz':knit.knit_network_to_record,
1575
 
            'knit-delta-gz':knit.knit_network_to_record,
1576
 
            'knit-annotated-ft-gz':knit.knit_network_to_record,
1577
 
            'knit-annotated-delta-gz':knit.knit_network_to_record,
1578
 
            'knit-delta-closure':knit.knit_delta_closure_to_records,
1579
 
            'fulltext':fulltext_network_to_record,
1580
 
            'groupcompress-block':groupcompress.network_block_to_records,
 
1589
        self._kind_factory = {
 
1590
            'fulltext': fulltext_network_to_record,
 
1591
            'groupcompress-block': groupcompress.network_block_to_records,
 
1592
            'knit-ft-gz': knit.knit_network_to_record,
 
1593
            'knit-delta-gz': knit.knit_network_to_record,
 
1594
            'knit-annotated-ft-gz': knit.knit_network_to_record,
 
1595
            'knit-annotated-delta-gz': knit.knit_network_to_record,
 
1596
            'knit-delta-closure': knit.knit_delta_closure_to_records,
1581
1597
            }
1582
1598
 
1583
1599
    def read(self):