← 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-09-09 13:49:07 UTC
  • mfrom: (4679.1.1 merge-2.0-into-bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090909134907-nnrr06jw5o011doh
(andrew) Merge 2.0 tip, including fixes for 408841, 423506, 406687,
        418931.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1518
1518
                if source is parent_maps[0]:
1519
1519
                    # this KnitVersionedFiles
1520
1520
                    records = [(key, positions[key][1]) for key in keys]
1521
 
                    for key, raw_data, sha1 in self._read_records_iter_raw(records):
 
1521
                    for key, raw_data in self._read_records_iter_unchecked(records):
1522
1522
                        (record_details, index_memo, _) = positions[key]
1523
1523
                        yield KnitContentFactory(key, global_map[key],
1524
 
                            record_details, sha1, raw_data, self._factory.annotated, None)
 
1524
                            record_details, None, raw_data, self._factory.annotated, None)
1525
1525
                else:
1526
1526
                    vf = self._fallback_vfs[parent_maps.index(source) - 1]
1527
1527
                    for record in vf.get_record_stream(keys, ordering,
1596
1596
        # key = basis_parent, value = index entry to add
1597
1597
        buffered_index_entries = {}
1598
1598
        for record in stream:
 
1599
            kind = record.storage_kind
 
1600
            if kind.startswith('knit-') and kind.endswith('-gz'):
 
1601
                # Check that the ID in the header of the raw knit bytes matches
 
1602
                # the record metadata.
 
1603
                raw_data = record._raw_record
 
1604
                df, rec = self._parse_record_header(record.key, raw_data)
 
1605
                df.close()
1599
1606
            buffered = False
1600
1607
            parents = record.parents
1601
1608
            if record.storage_kind in delta_types: