← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
990
990
                else:
991
991
                    lca_entries.append(lca_ie)
992
992
 
993
 
            if file_id in base_inventory:
 
993
            if base_inventory.has_id(file_id):
994
994
                base_ie = base_inventory[file_id]
995
995
            else:
996
996
                base_ie = _none_entry
997
997
 
998
 
            if file_id in this_inventory:
 
998
            if this_inventory.has_id(file_id):
999
999
                this_ie = this_inventory[file_id]
1000
1000
            else:
1001
1001
                this_ie = _none_entry
1105
1105
        other_root = self.tt.trans_id_file_id(other_root_file_id)
1106
1106
        if other_root == self.tt.root:
1107
1107
            return
1108
 
        if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1109
 
            # the other tree's root is a non-root in the current tree (as when
1110
 
            # a previously unrelated branch is merged into another)
 
1108
        if self.this_tree.inventory.has_id(
 
1109
            self.other_tree.inventory.root.file_id):
 
1110
            # the other tree's root is a non-root in the current tree (as
 
1111
            # when a previously unrelated branch is merged into another)
1111
1112
            return
1112
1113
        if self.tt.final_kind(other_root) is not None:
1113
1114
            other_root_is_present = True
1165
1166
    @staticmethod
1166
1167
    def contents_sha1(tree, file_id):
1167
1168
        """Determine the sha1 of the file contents (used as a key method)."""
1168
 
        if file_id not in tree:
 
1169
        if not tree.has_id(file_id):
1169
1170
            return None
1170
1171
        return tree.get_file_sha1(file_id)
1171
1172
 
1331
1332
    def _do_merge_contents(self, file_id):
1332
1333
        """Performs a merge on file_id contents."""
1333
1334
        def contents_pair(tree):
1334
 
            if file_id not in tree:
 
1335
            if not tree.has_id(file_id):
1335
1336
                return (None, None)
1336
1337
            kind = tree.kind(file_id)
1337
1338
            if kind == "file":
1900
1901
        name_in_target = osutils.basename(self._target_subdir)
1901
1902
        merge_into_root = subdir.copy()
1902
1903
        merge_into_root.name = name_in_target
1903
 
        if merge_into_root.file_id in self.this_tree.inventory:
 
1904
        if self.this_tree.inventory.has_id(merge_into_root.file_id):
1904
1905
            # Give the root a new file-id.
1905
1906
            # This can happen fairly easily if the directory we are
1906
1907
            # incorporating is the root, and both trees have 'TREE_ROOT' as