← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/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
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
 
25
from bzrlib.selftest 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('.')
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('.')
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('.')
 
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_branch_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 branch add
 
120
        doesn't do that.
 
121
        """
 
122
        from bzrlib.branch import Branch
 
123
        from bzrlib.errors import NotVersionedError
 
124
 
 
125
        b = Branch.initialize('.')
 
126
 
 
127
        self.build_tree(['foo/',
 
128
                         'foo/hello'])
 
129
 
 
130
        self.assertRaises(NotVersionedError,
 
131
                          b.add,
 
132
                          'foo/hello')
 
133
        
 
134
        self.check_branch()
 
135
 
 
136
    def test_add_in_unversioned(self):
 
137
        """Try to add a file in an unversioned directory.
 
138
 
 
139
        "bzr add" should add the parent(s) as necessary.
 
140
        """
 
141
        from bzrlib.branch import Branch
 
142
        eq = self.assertEqual
 
143
 
 
144
        b = Branch.initialize('.')
 
145
 
 
146
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
147
        eq(list(b.unknowns()), ['inertiatic'])
 
148
        self.run_bzr('add', 'inertiatic/esp')
 
149
        eq(list(b.unknowns()), [])
 
150
 
 
151
        # Multiple unversioned parents
 
152
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
 
153
        eq(list(b.unknowns()), ['veil'])
 
154
        self.run_bzr('add', 'veil/cerpin/taxt')
 
155
        eq(list(b.unknowns()), [])
 
156
 
 
157
        # Check whacky paths work
 
158
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
 
159
        eq(list(b.unknowns()), ['cicatriz'])
 
160
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
 
161
        eq(list(b.unknowns()), [])
 
162
 
 
163
    def test_add_in_versioned(self):
 
164
        """Try to add a file in a versioned directory.
 
165
 
 
166
        "bzr add" should do this happily.
 
167
        """
 
168
        from bzrlib.branch import Branch
 
169
        eq = self.assertEqual
 
170
 
 
171
        b = Branch.initialize('.')
 
172
 
 
173
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
174
        eq(list(b.unknowns()), ['inertiatic'])
 
175
        self.run_bzr('add', '--no-recurse', 'inertiatic')
 
176
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
 
177
        self.run_bzr('add', 'inertiatic/esp')
 
178
        eq(list(b.unknowns()), [])
 
179
 
 
180
    def test_subdir_add(self):
 
181
        """Add in subdirectory should add only things from there down"""
 
182
        
 
183
        from bzrlib.branch import Branch
 
184
        
 
185
        eq = self.assertEqual
 
186
        ass = self.assert_
 
187
        chdir = os.chdir
 
188
        
 
189
        b = Branch.initialize('.')
 
190
        t = b.working_tree()
 
191
        self.build_tree(['src/', 'README'])
 
192
        
 
193
        eq(sorted(b.unknowns()),
 
194
           ['README', 'src'])
 
195
        
 
196
        self.run_bzr('add', 'src')
 
197
        
 
198
        self.build_tree(['src/foo.c'])
 
199
        
 
200
        chdir('src')
 
201
        self.run_bzr('add')
 
202
        
 
203
        eq(sorted(b.unknowns()), 
 
204
           ['README'])
 
205
        eq(len(t.read_working_inventory()), 3)
 
206
                
 
207
        chdir('..')
 
208
        self.run_bzr('add')
 
209
        eq(list(b.unknowns()), [])
 
210
 
 
211
        self.check_branch()
112
212
 
113
213
    def check_branch(self):
114
214
        """After all the above changes, run the check and upgrade commands.
115
215
 
116
216
        The upgrade should be a no-op."""
117
 
        b = Branch.open(u'.')
 
217
        b = Branch.open('.')
118
218
        mutter('branch has %d revisions', b.revno())
119
219
        
120
220
        mutter('check branch...')
132
232
        self.build_tree(['a/', 'b/'])
133
233
        
134
234
        run_bzr('init')
135
 
        b = Branch.open(u'.')
 
235
        b = Branch.open('.')
136
236
        
137
237
        for fn in ('a/one', 'b/two', 'top'):
138
238
            file(fn, 'w').write('old contents')
146
246
        mutter('start selective subdir commit')
147
247
        run_bzr('commit', 'a', '-m', 'commit a only')
148
248
        
149
 
        old = b.repository.revision_tree(b.get_rev_id(1))
150
 
        new = b.repository.revision_tree(b.get_rev_id(2))
 
249
        old = b.revision_tree(b.get_rev_id(1))
 
250
        new = b.revision_tree(b.get_rev_id(2))
151
251
        
152
252
        eq(new.get_file_by_path('b/two').read(), 'old contents')
153
253
        eq(new.get_file_by_path('top').read(), 'old contents')
156
256
        os.chdir('a')
157
257
        # commit from here should do nothing
158
258
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
159
 
        v3 = b.repository.revision_tree(b.get_rev_id(3))
 
259
        v3 = b.revision_tree(b.get_rev_id(3))
160
260
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
161
261
        eq(v3.get_file_by_path('top').read(), 'old contents')
162
262
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
163
263
                
164
264
        # commit in subdirectory commits whole tree
165
265
        run_bzr('commit', '-m', 'commit whole tree from subdir')
166
 
        v4 = b.repository.revision_tree(b.get_rev_id(4))
 
266
        v4 = b.revision_tree(b.get_rev_id(4))
167
267
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
168
268
        eq(v4.get_file_by_path('top').read(), 'new contents')
169
269