Rev 3900: Fix a critical bug that caused problems with the index entries. in http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core
John Arbash Meinel
john at arbash-meinel.com
Tue Mar 24 01:38:25 GMT 2009
At http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core
------------------------------------------------------------
revno: 3900
revision-id: john at arbash-meinel.com-20090324013726-vccnsrlqw200sh9w
parent: john at arbash-meinel.com-20090323215037-oyxc3d940dw0rnv7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: brisbane-core
timestamp: Mon 2009-03-23 20:37:26 -0500
message:
Fix a critical bug that caused problems with the index entries.
We were grabbing the 'start_point' but not using it, and we weren't resetting
basis_end correctly. So we ended up recording the end of the previous record
as the start of the next.
-------------- next part --------------
=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py 2009-03-23 21:50:37 +0000
+++ b/bzrlib/groupcompress.py 2009-03-24 01:37:26 +0000
@@ -1412,7 +1412,6 @@
self._compressor = GroupCompressor()
self._unadded_refs = {}
keys_to_add = []
- basis_end = 0
def flush():
bytes = self._compressor.flush().to_bytes()
index, start, length = self._access.add_raw_records(
@@ -1532,9 +1531,8 @@
key = record.key
self._unadded_refs[key] = record.parents
yield found_sha1
- keys_to_add.append((key, '%d %d' % (basis_end, end_point),
+ keys_to_add.append((key, '%d %d' % (start_point, end_point),
(record.parents,)))
- basis_end = end_point
if len(keys_to_add):
flush()
self._compressor = None
More information about the bazaar-commits
mailing list