← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2011-06-14 02:21:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110614022141-18hmm7s0iw3utcbj
Deprecate __contains__ on Tree and Inventory

Show diffs side-by-side

added added

removed removed

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