← 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

 * The internal storage of history, and logical branch identity have now
   been split into Branch, and Repository. The common locking and file 
   management routines are now in bzrlib.lockablefiles. 
   (Aaron Bentley, Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fileid_involved.py
19
19
from bzrlib.commit import commit
20
20
from bzrlib.add import smart_add
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.clone import copy_branch
23
22
from bzrlib.merge import merge
24
23
from bzrlib.workingtree import WorkingTree
25
24
from bzrlib.delta import compare_trees
63
62
        del b, wt
64
63
        #-------- end A -----------
65
64
 
66
 
        copy_branch(main_branch,"../branch1")
 
65
        main_branch.clone("../branch1")
67
66
        os.chdir("../branch1")
68
67
 
69
68
        #branch1_branch = Branch.open(".")
79
78
 
80
79
        #-------- end B -----------
81
80
 
82
 
        copy_branch(Branch.open("."),"../branch2")
 
81
        Branch.open(".").clone("../branch2")
83
82
        os.chdir("../branch2")
84
83
 
85
84
        branch2_branch = Branch.open(".")
184
183
                l1 = self.branch.fileid_involved_between_revs(
185
184
                    history[start], history[end])
186
185
 
187
 
                old_tree = self.branch.revision_tree(history[start])
188
 
                new_tree = self.branch.revision_tree(history[end])
 
186
                old_tree = self.branch.repository.revision_tree(history[start])
 
187
                new_tree = self.branch.repository.revision_tree(history[end])
189
188
                delta = compare_trees(old_tree, new_tree )
190
189
 
191
190
                l2 = [ id for path, id, kind in delta.added ] + \