/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/groupcompress.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-01 05:35:52 UTC
  • mfrom: (4792.6.2 trace-buffering)
  • Revision ID: pqm@pqm.ubuntu.com-20091201053552-yws5hsfrricui8b6
(mbp) remove extra buffer flushing on trace file

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
1747
1747
                key = record.key
1748
1748
            self._unadded_refs[key] = record.parents
1749
1749
            yield found_sha1
1750
 
            as_st = static_tuple.StaticTuple.from_sequence
1751
 
            if record.parents is not None:
1752
 
                parents = as_st([as_st(p) for p in record.parents])
1753
 
            else:
1754
 
                parents = None
1755
 
            refs = static_tuple.StaticTuple(parents)
1756
 
            keys_to_add.append((key, '%d %d' % (start_point, end_point), refs))
 
1750
            keys_to_add.append((key, '%d %d' % (start_point, end_point),
 
1751
                (record.parents,)))
1757
1752
        if len(keys_to_add):
1758
1753
            flush()
1759
1754
        self._compressor = None