← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-03 20:18:35 UTC
  • mfrom: (1185.82.137 w-changeset)
  • Revision ID: pqm@pqm.ubuntu.com-20060603201835-1c9a1725641ccd24
Implement bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
1
1
# Copyright (C) 2005 by Canonical Ltd
2
 
#
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
40
40
 
41
41
        self.run_bzr('mkdir', 'foo', retcode=3)
42
42
 
 
43
        from bzrlib.diff import compare_trees
43
44
        wt = WorkingTree.open('.')
44
45
        
45
 
        delta = wt.changes_from(wt.basis_tree())
 
46
        delta = compare_trees(wt.basis_tree(), wt)
46
47
 
47
48
        self.log('delta.added = %r' % delta.added)
48
49
 
63
64
        self.assert_(os.path.isdir('subdir'))
64
65
        os.chdir('..')
65
66
 
 
67
        from bzrlib.diff import compare_trees
66
68
        wt = WorkingTree.open('.')
67
69
        
68
 
        delta = wt.changes_from(wt.basis_tree())
 
70
        delta = compare_trees(wt.basis_tree(), wt)
69
71
 
70
72
        self.log('delta.added = %r' % delta.added)
71
73
 
91
93
        self.failUnless(os.path.isdir('a/dir'))
92
94
        self.failUnless(os.path.isdir('a/b/dir'))
93
95
 
 
96
        from bzrlib.diff import compare_trees
94
97
        wt = WorkingTree.open('.')
95
98
        wt_a = WorkingTree.open('a')
96
99
        wt_b = WorkingTree.open('a/b')
97
100
        
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())
 
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)
109
112
        self.assertEquals(len(delta.added), 1)
110
113
        self.assertEquals(delta.added[0][0], 'dir')
111
114
        self.failIf(delta.modified)