← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: John Arbash Meinel
  • Date: 2010-04-22 19:05:14 UTC
  • mfrom: (4634.139.10 2.0.6-peak-commit-mem)
  • mto: This revision was merged to the branch mainline in revision 5175.
  • Revision ID: john@arbash-meinel.com-20100422190514-udvjsm6n2a6sh0jv
Bring into bzr.dev, and update NEWS.

I can't land in 2.0 right now because PQM is broken.
But at least I can land in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
1631
1631
        keys_to_add = []
1632
1632
        def flush():
1633
1633
            bytes = self._compressor.flush().to_bytes()
 
1634
            self._compressor = GroupCompressor()
1634
1635
            index, start, length = self._access.add_raw_records(
1635
1636
                [(None, len(bytes))], bytes)[0]
1636
1637
            nodes = []
1639
1640
            self._index.add_records(nodes, random_id=random_id)
1640
1641
            self._unadded_refs = {}
1641
1642
            del keys_to_add[:]
1642
 
            self._compressor = GroupCompressor()
1643
1643
 
1644
1644
        last_prefix = None
1645
1645
        max_fulltext_len = 0