← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.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/transform.py
2945
2945
                        if basis_tree is None:
2946
2946
                            basis_tree = working_tree.basis_tree()
2947
2947
                            basis_tree.lock_read()
2948
 
                        if file_id in basis_tree:
 
2948
                        if basis_tree.has_id(file_id):
2949
2949
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
2950
2950
                                keep_content = True
2951
2951
                        elif target_kind is None and not target_versioned:
2981
2981
                        basis_tree = working_tree.basis_tree()
2982
2982
                        basis_tree.lock_read()
2983
2983
                    new_sha1 = target_tree.get_file_sha1(file_id)
2984
 
                    if (file_id in basis_tree and new_sha1 ==
2985
 
                        basis_tree.get_file_sha1(file_id)):
 
2984
                    if (basis_tree.has_id(file_id) and
 
2985
                        new_sha1 == basis_tree.get_file_sha1(file_id)):
2986
2986
                        if file_id in merge_modified:
2987
2987
                            del merge_modified[file_id]
2988
2988
                    else:
3139
3139
        elif c_type == 'unversioned parent':
3140
3140
            file_id = tt.inactive_file_id(conflict[1])
3141
3141
            # special-case the other tree root (move its children instead)
3142
 
            if path_tree and file_id in path_tree:
 
3142
            if path_tree and path_tree.has_id(file_id):
3143
3143
                if path_tree.path2id('') == file_id:
3144
3144
                    # This is the root entry, skip it
3145
3145
                    continue