[MERGE][#217701][1.4] Force get_revision_file to set delta=False, and teach KnitVersionedFile.insert_data_stream to convert line-deltas to fulltexts when necessary.

Andrew Bennetts andrew at canonical.com
Fri Apr 18 07:23:29 BST 2008


This short patch fixes <https://bugs.launchpad.net/bzr/+bug/217701>.

The problem appears to be that get_revision_file doesn't reliably return a
KnitVersionedFile with delta=False, even though the revisions.kndx/.knit is
meant to be non-delta.  So this change:

 - forces get_revision_file on a KnitRevisionStore to set delta=False, and
 - teaches KnitVersionedFile.insert_data_stream how to convert a line-delta
   record to a fulltext when inserting into a non-delta knit.

In addition to fixing the traceback reported in #217701, new revision.knits will
be repaired, in that they will have all fulltexts, even if the source
incorrectly has a line-delta.

This change still needs tests (although the existing suite does pass).  In the
meantime, feedback and sanity checking is most welcome!

-Andrew.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-217701-3373.patch
Type: text/x-diff
Size: 6355 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080418/7cced03d/attachment-0001.bin 


More information about the bazaar mailing list