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

  • Committer: Martin Pool
  • Date: 2008-11-10 07:29:34 UTC
  • mto: (3735.2.28 repository)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: mbp@sourcefrog.net-20081110072934-g98e0746d05xzdzf
Restore optimization in commit _report_and_accumulate_deletes
(thanks lifeless)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
77
77
                            )
78
78
from bzrlib.testament import Testament
79
79
from bzrlib.trace import mutter, note, warning, is_quiet
80
 
from bzrlib.inventory import InventoryEntry, make_entry
 
80
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
81
81
from bzrlib import symbol_versioning
82
82
from bzrlib.symbol_versioning import (deprecated_passed,
83
83
        deprecated_function,
698
698
    def _report_and_accumulate_deletes(self):
699
699
        # XXX: Could the list of deleted paths and ids be instead taken from
700
700
        # _populate_from_inventory?
701
 
        deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
 
701
        if (isinstance(self.basis_inv, Inventory)
 
702
            and isinstance(self.builder.new_inventory, Inventory)):
 
703
            # the older Inventory classes provide a _byid dict, and building a
 
704
            # set from the keys of this dict is substantially faster than even
 
705
            # getting a set of ids from the inventory
 
706
            #
 
707
            # <lifeless> set(dict) is roughly the same speed as
 
708
            # set(iter(dict)) and both are significantly slower than
 
709
            # set(dict.keys())
 
710
            deleted_ids = set(self.basis_inv._byid.keys()) - \
 
711
               set(self.builder.new_inventory._byid.keys())
 
712
        else:
 
713
            deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
702
714
        if deleted_ids:
703
715
            self.any_entries_deleted = True
704
716
            deleted = [(self.basis_tree.id2path(file_id), file_id)