← 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: Robert Collins
  • Date: 2005-12-08 05:57:00 UTC
  • Revision ID: robertc@robertcollins.net-20051208055700-5d85edd70fd15d4d
Test the uses of WorkingTree from branch.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
1
 
# Copyright (C) 2005 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by Canonical Ltd
 
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
25
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
27
from bzrlib.trace import mutter
28
 
from bzrlib.osutils import pathjoin
29
 
from bzrlib.workingtree import WorkingTree
30
28
 
31
29
 
32
30
class TestVersioning(TestCaseInTempDir):
40
38
 
41
39
        self.run_bzr('mkdir', 'foo', retcode=3)
42
40
 
43
 
        wt = WorkingTree.open('.')
 
41
        from bzrlib.diff import compare_trees
 
42
        from bzrlib.branch import Branch
 
43
        b = Branch.open(u'.')
44
44
        
45
 
        delta = wt.changes_from(wt.basis_tree())
 
45
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
46
 
47
47
        self.log('delta.added = %r' % delta.added)
48
48
 
63
63
        self.assert_(os.path.isdir('subdir'))
64
64
        os.chdir('..')
65
65
 
66
 
        wt = WorkingTree.open('.')
 
66
        from bzrlib.diff import compare_trees
 
67
        from bzrlib.branch import Branch
 
68
        b = Branch.open(u'.')
67
69
        
68
 
        delta = wt.changes_from(wt.basis_tree())
 
70
        delta = compare_trees(b.basis_tree(), b.working_tree())
69
71
 
70
72
        self.log('delta.added = %r' % delta.added)
71
73
 
72
74
        self.assertEquals(len(delta.added), 2)
73
75
        self.assertEquals(delta.added[0][0], 'dir')
74
 
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
 
76
        self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
75
77
        self.failIf(delta.modified)
76
78
 
77
79
    def test_mkdir_w_nested_trees(self):
91
93
        self.failUnless(os.path.isdir('a/dir'))
92
94
        self.failUnless(os.path.isdir('a/b/dir'))
93
95
 
94
 
        wt = WorkingTree.open('.')
95
 
        wt_a = WorkingTree.open('a')
96
 
        wt_b = WorkingTree.open('a/b')
97
 
        
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())
109
 
        self.assertEquals(len(delta.added), 1)
110
 
        self.assertEquals(delta.added[0][0], 'dir')
111
 
        self.failIf(delta.modified)
 
96
        from bzrlib.diff import compare_trees
 
97
        b = Branch.open(u'.')
 
98
        b_a = Branch.open('a')
 
99
        b_b = Branch.open('a/b')
 
100
        
 
101
        delta = compare_trees(b.basis_tree(), b.working_tree())
 
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(b_a.basis_tree(), b_a.working_tree())
 
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(b_b.basis_tree(), b_b.working_tree())
 
112
        self.assertEquals(len(delta.added), 1)
 
113
        self.assertEquals(delta.added[0][0], 'dir')
 
114
        self.failIf(delta.modified)
 
115
 
 
116
    def test_working_tree_add_in_unversioned(self):
 
117
        """Try to add a file in an unversioned directory.
 
118
 
 
119
        "bzr add" adds the parent as necessary, but simple working tree add
 
120
        doesn't do that.
 
121
        """
 
122
        from bzrlib.branch import Branch
 
123
        from bzrlib.errors import NotVersionedError
 
124
        from bzrlib.workingtree import WorkingTree
 
125
 
 
126
        b = Branch.initialize(u'.')
 
127
 
 
128
        self.build_tree(['foo/',
 
129
                         'foo/hello'])
 
130
 
 
131
        self.assertRaises(NotVersionedError,
 
132
                          WorkingTree(b.base, b).add,
 
133
                          'foo/hello')
 
134
        
 
135
        self.check_branch()
112
136
 
113
137
    def check_branch(self):
114
138
        """After all the above changes, run the check and upgrade commands.
146
170
        mutter('start selective subdir commit')
147
171
        run_bzr('commit', 'a', '-m', 'commit a only')
148
172
        
149
 
        old = b.repository.revision_tree(b.get_rev_id(1))
150
 
        new = b.repository.revision_tree(b.get_rev_id(2))
 
173
        old = b.revision_tree(b.get_rev_id(1))
 
174
        new = b.revision_tree(b.get_rev_id(2))
151
175
        
152
176
        eq(new.get_file_by_path('b/two').read(), 'old contents')
153
177
        eq(new.get_file_by_path('top').read(), 'old contents')
156
180
        os.chdir('a')
157
181
        # commit from here should do nothing
158
182
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
159
 
        v3 = b.repository.revision_tree(b.get_rev_id(3))
 
183
        v3 = b.revision_tree(b.get_rev_id(3))
160
184
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
161
185
        eq(v3.get_file_by_path('top').read(), 'old contents')
162
186
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
163
187
                
164
188
        # commit in subdirectory commits whole tree
165
189
        run_bzr('commit', '-m', 'commit whole tree from subdir')
166
 
        v4 = b.repository.revision_tree(b.get_rev_id(4))
 
190
        v4 = b.revision_tree(b.get_rev_id(4))
167
191
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
168
192
        eq(v4.get_file_by_path('top').read(), 'new contents')
169
193