← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-04 02:25:11 UTC
  • mfrom: (4634.108.8 2.0)
  • mto: This revision was merged to the branch mainline in revision 4928.
  • Revision ID: andrew.bennetts@canonical.com-20100104022511-2tq2r9w2te84wzgs
Merge lp:bzr/2.0 into lp:bzr, including fixes for #343218, #495000, #495023, #494406 and #498378.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1631
1631
        keys_to_add = []
1632
1632
        def flush():
1633
1633
            bytes = self._compressor.flush().to_bytes()
1634
 
            self._compressor = GroupCompressor()
1635
1634
            index, start, length = self._access.add_raw_records(
1636
1635
                [(None, len(bytes))], bytes)[0]
1637
1636
            nodes = []
1640
1639
            self._index.add_records(nodes, random_id=random_id)
1641
1640
            self._unadded_refs = {}
1642
1641
            del keys_to_add[:]
 
1642
            self._compressor = GroupCompressor()
1643
1643
 
1644
1644
        last_prefix = None
1645
1645
        max_fulltext_len = 0