← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.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/add.py
86
86
        Else, we look for an entry in the base tree with the same path.
87
87
        """
88
88
 
89
 
        if (parent_ie.file_id in self.base_tree):
 
89
        if self.base_tree.has_id(parent_ie.file_id):
90
90
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
91
91
            base_child_ie = base_parent_ie.children.get(
92
92
                osutils.basename(path))