← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fileid_involved.py

Finish deprecating Branch.working_tree()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fileid_involved.py
42
42
        base_rev = common_ancestor(branch_from.last_revision(),
43
43
                                    wt_to.branch.last_revision(),
44
44
                                    wt_to.branch.repository)
45
 
        merge_inner(wt_to.branch, branch_from.working_tree(), 
 
45
        merge_inner(wt_to.branch, branch_from.basis_tree(), 
46
46
                    wt_to.branch.repository.revision_tree(base_rev),
47
47
                    this_tree=wt_to)
48
48
        wt_to.add_pending_merge(branch_from.last_revision())
69
69
 
70
70
        b1 = main_branch.clone("branch1")
71
71
        self.build_tree(["branch1/d"])
72
 
        b1.working_tree().add('d')
73
 
        b1.working_tree().commit("branch1, Commit one", rev_id="rev-E")
 
72
        bt1 = WorkingTree('branch1', b1)
 
73
        bt1.add('d')
 
74
        bt1.commit("branch1, Commit one", rev_id="rev-E")
74
75
 
75
76
        #-------- end E -----------
76
77
 
81
82
 
82
83
        branch2_branch = main_branch.clone("branch2")
83
84
        os.chmod("branch2/b",0770)
84
 
        branch2_branch.working_tree().commit("branch2, Commit one", 
85
 
                                             rev_id="rev-J")
 
85
        bt2 = WorkingTree('branch2', branch2_branch)
 
86
        bt2.commit("branch2, Commit one", rev_id="rev-J")
86
87
 
87
88
        #-------- end J -----------
88
89
 
91
92
 
92
93
        #-------- end C -----------
93
94
 
94
 
        tree = WorkingTree('branch1', b1)
95
 
        tree.rename_one("d","e")
96
 
        tree.commit("branch1, commit two", rev_id="rev-F")
 
95
        bt1.rename_one("d","e")
 
96
        bt1.commit("branch1, commit two", rev_id="rev-F")
97
97
 
98
98
        #-------- end F -----------
99
99
 
100
100
        self.touch("branch2/c")
101
 
        branch2_branch.working_tree().commit("branch2, commit two", rev_id="rev-K")
 
101
        bt2.commit("branch2, commit two", rev_id="rev-K")
102
102
 
103
103
        #-------- end K -----------
104
104