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

  • Committer: John Arbash Meinel
  • Date: 2008-02-26 22:26:00 UTC
  • mto: This revision was merged to the branch mainline in revision 3280.
  • Revision ID: john@arbash-meinel.com-20080226222600-6wsja3pv4kelorug
Revert the _get_component_positions api

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
895
895
                 noeol) = details
896
896
                if compression_parent is not None:
897
897
                    pending_components.add(compression_parent)
898
 
                component_data[version_id] = details
 
898
                component_data[version_id] = (method, index_memo,
 
899
                                              compression_parent)
899
900
        return component_data
900
901
       
901
902
    def _get_content(self, version_id, parent_texts={}):
1050
1051
        position_map = self._get_components_positions(version_ids)
1051
1052
        # c = component_id, m = method, i_m = index_memo, n = next
1052
1053
        # p = parent_ids, e = noeol
1053
 
        records = [(c, i_m) for c, (m, i_m, n, p, e)
 
1054
        records = [(c, i_m) for c, (m, i_m, n)
1054
1055
                             in position_map.iteritems()]
1055
1056
        record_map = {}
1056
1057
        for component_id, content, digest in \
1057
1058
                self._data.read_records_iter(records):
1058
 
            (method, index_memo, next, parent_ids,
1059
 
             noeol) = position_map[component_id]
 
1059
            (method, index_memo, next) = position_map[component_id]
1060
1060
            record_map[component_id] = method, content, digest, next
1061
 
                          
 
1061
 
1062
1062
        return record_map
1063
1063
 
1064
1064
    def get_text(self, version_id):