/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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1036
1036
                            'on the source repository, and "bzr reconcile" '
1037
1037
                            'if necessary.' %
1038
1038
                            (version_id, parents[0]))
 
1039
                    if not self.delta:
 
1040
                        # We received a line-delta record for a non-delta knit.
 
1041
                        # Convert it to a fulltext.
 
1042
                        gzip_bytes = reader_callable(length)
 
1043
                        lines, sha1 = self._data._parse_record(
 
1044
                            version_id, gzip_bytes)
 
1045
                        delta = self.factory.parse_line_delta(lines,
 
1046
                                version_id)
 
1047
                        content = self.factory.make(
 
1048
                            self.get_lines(parents[0]), parents[0])
 
1049
                        content.apply_delta(delta, version_id)
 
1050
                        digest, len, content = self.add_lines(
 
1051
                            version_id, parents, content.text())
 
1052
                        if digest != sha1:
 
1053
                            raise errors.VersionedFileInvalidChecksum(version)
 
1054
                        continue
 
1055
 
1039
1056
                self._add_raw_records(
1040
1057
                    [(version_id, options, parents, length)],
1041
1058
                    reader_callable(length))