← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-28 19:12:10 UTC
  • mfrom: (5967.7.4 rm-magic-methods)
  • Revision ID: pqm@pqm.ubuntu.com-20110628191210-bwblsxn26kyu3swl
(mbp) remove __contains__ methods from inventory and dict (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
723
723
        if self.specific_files or self.exclude:
724
724
            specific_files = self.specific_files or []
725
725
            for path, old_ie in self.basis_inv.iter_entries():
726
 
                if old_ie.file_id in self.builder.new_inventory:
 
726
                if self.builder.new_inventory.has_id(old_ie.file_id):
727
727
                    # already added - skip.
728
728
                    continue
729
729
                if (is_inside_any(specific_files, path)