← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-26 07:45:29 UTC
  • mfrom: (4769.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091026074529-g0v5lnaqpzksl9kl
(andrew) Merge lp:bzr/2.0 into lp:bzr.  Includes fixes for #436325,
        #436794, #437626 and documentation improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1710
1710
            # There were index entries buffered at the end of the stream,
1711
1711
            # So these need to be added (if the index supports holding such
1712
1712
            # entries for later insertion)
 
1713
            all_entries = []
1713
1714
            for key in buffered_index_entries:
1714
1715
                index_entries = buffered_index_entries[key]
1715
 
                self._index.add_records(index_entries,
1716
 
                    missing_compression_parents=True)
 
1716
                all_entries.extend(index_entries)
 
1717
            self._index.add_records(
 
1718
                all_entries, missing_compression_parents=True)
1717
1719
 
1718
1720
    def get_missing_compression_parent_keys(self):
1719
1721
        """Return an iterable of keys of missing compression parents.