← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
40
40
 
41
41
        self.run_bzr('mkdir', 'foo', retcode=3)
42
42
 
43
 
        from bzrlib.diff import compare_trees
44
43
        wt = WorkingTree.open('.')
45
44
        
46
 
        delta = compare_trees(wt.basis_tree(), wt)
 
45
        delta = wt.changes_from(wt.basis_tree())
47
46
 
48
47
        self.log('delta.added = %r' % delta.added)
49
48
 
64
63
        self.assert_(os.path.isdir('subdir'))
65
64
        os.chdir('..')
66
65
 
67
 
        from bzrlib.diff import compare_trees
68
66
        wt = WorkingTree.open('.')
69
67
        
70
 
        delta = compare_trees(wt.basis_tree(), wt)
 
68
        delta = wt.changes_from(wt.basis_tree())
71
69
 
72
70
        self.log('delta.added = %r' % delta.added)
73
71
 
93
91
        self.failUnless(os.path.isdir('a/dir'))
94
92
        self.failUnless(os.path.isdir('a/b/dir'))
95
93
 
96
 
        from bzrlib.diff import compare_trees
97
94
        wt = WorkingTree.open('.')
98
95
        wt_a = WorkingTree.open('a')
99
96
        wt_b = WorkingTree.open('a/b')
100
97
        
101
 
        delta = compare_trees(wt.basis_tree(), wt)
102
 
        self.assertEquals(len(delta.added), 1)
103
 
        self.assertEquals(delta.added[0][0], 'dir')
104
 
        self.failIf(delta.modified)
105
 
 
106
 
        delta = compare_trees(wt_a.basis_tree(), wt_a)
107
 
        self.assertEquals(len(delta.added), 1)
108
 
        self.assertEquals(delta.added[0][0], 'dir')
109
 
        self.failIf(delta.modified)
110
 
 
111
 
        delta = compare_trees(wt_b.basis_tree(), wt_b)
 
98
        delta = wt.changes_from(wt.basis_tree())
 
99
        self.assertEquals(len(delta.added), 1)
 
100
        self.assertEquals(delta.added[0][0], 'dir')
 
101
        self.failIf(delta.modified)
 
102
 
 
103
        delta = wt_a.changes_from(wt_a.basis_tree())
 
104
        self.assertEquals(len(delta.added), 1)
 
105
        self.assertEquals(delta.added[0][0], 'dir')
 
106
        self.failIf(delta.modified)
 
107
 
 
108
        delta = wt_b.changes_from(wt_b.basis_tree())
112
109
        self.assertEquals(len(delta.added), 1)
113
110
        self.assertEquals(delta.added[0][0], 'dir')
114
111
        self.failIf(delta.modified)