18
18
"""Tests of simple versioning operations"""
20
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
from bzrlib.branch import Branch
27
from bzrlib.trace import mutter
30
class TestVersioning(TestCaseInTempDir):
21
from bzrlib.selftest import InTempDir
23
class Mkdir(InTempDir):
33
25
"""Basic 'bzr mkdir' operation"""
26
from bzrlib.commands import run_bzr
36
self.run_bzr('mkdir', 'foo')
29
run_bzr(['bzr', 'init'])
30
run_bzr(['bzr', 'mkdir', 'foo'])
37
31
self.assert_(os.path.isdir('foo'))
39
self.run_bzr('mkdir', 'foo', retcode=3)
33
self.assertRaises(OSError, run_bzr, ['bzr', 'mkdir', 'foo'])
41
from bzrlib.diff import compare_trees
35
from bzrlib.diff import compare_trees, TreeDelta
42
36
from bzrlib.branch import Branch
45
39
delta = compare_trees(b.basis_tree(), b.working_tree())
47
self.log('delta.added = %r' % delta.added)
49
41
self.assertEquals(len(delta.added), 1)
50
42
self.assertEquals(delta.added[0][0], 'foo')
51
43
self.failIf(delta.modified)
53
def test_mkdir_in_subdir(self):
54
"""'bzr mkdir' operation in subdirectory"""
57
self.run_bzr('mkdir', 'dir')
58
self.assert_(os.path.isdir('dir'))
61
self.log('Run mkdir in subdir')
62
self.run_bzr('mkdir', 'subdir')
63
self.assert_(os.path.isdir('subdir'))
66
from bzrlib.diff import compare_trees
67
from bzrlib.branch import Branch
70
delta = compare_trees(b.basis_tree(), b.working_tree())
72
self.log('delta.added = %r' % delta.added)
74
self.assertEquals(len(delta.added), 2)
75
self.assertEquals(delta.added[0][0], 'dir')
76
self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
77
self.failIf(delta.modified)
79
def test_mkdir_w_nested_trees(self):
80
"""'bzr mkdir' with nested trees"""
91
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
92
self.failUnless(os.path.isdir('dir'))
93
self.failUnless(os.path.isdir('a/dir'))
94
self.failUnless(os.path.isdir('a/b/dir'))
96
from bzrlib.diff import compare_trees
98
b_a = Branch.open('a')
99
b_b = Branch.open('a/b')
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)
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)
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)
116
def test_branch_add_in_unversioned(self):
47
class AddInUnversioned(InTempDir):
117
49
"""Try to add a file in an unversioned directory.
119
"bzr add" adds the parent as necessary, but simple branch add
51
smart_add may eventually add the parent as necessary, but simple
52
branch add doesn't do that.
122
54
from bzrlib.branch import Branch
123
56
from bzrlib.errors import NotVersionedError
125
b = Branch.initialize('.')
58
b = Branch('.', init=True)
127
60
self.build_tree(['foo/',
136
def test_add_in_unversioned(self):
137
"""Try to add a file in an unversioned directory.
139
"bzr add" should add the parent(s) as necessary.
141
from bzrlib.branch import Branch
142
eq = self.assertEqual
144
b = Branch.initialize('.')
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()), [])
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()), [])
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()), [])
163
def test_add_in_versioned(self):
164
"""Try to add a file in a versioned directory.
166
"bzr add" should do this happily.
168
from bzrlib.branch import Branch
169
eq = self.assertEqual
171
b = Branch.initialize('.')
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()), [])
180
def test_subdir_add(self):
181
"""Add in subdirectory should add only things from there down"""
183
from bzrlib.branch import Branch
185
eq = self.assertEqual
189
b = Branch.initialize('.')
191
self.build_tree(['src/', 'README'])
193
eq(sorted(b.unknowns()),
196
self.run_bzr('add', 'src')
198
self.build_tree(['src/foo.c'])
203
eq(sorted(b.unknowns()),
205
eq(len(t.read_working_inventory()), 3)
209
eq(list(b.unknowns()), [])
213
def check_branch(self):
214
"""After all the above changes, run the check and upgrade commands.
216
The upgrade should be a no-op."""
218
mutter('branch has %d revisions', b.revno())
220
mutter('check branch...')
221
from bzrlib.check import check
225
class SubdirCommit(TestCaseInTempDir):
227
def test_subdir_commit(self):
228
"""Test committing a subdirectory, and committing within a directory."""
229
run_bzr = self.run_bzr
230
eq = self.assertEqual
232
self.build_tree(['a/', 'b/'])
237
for fn in ('a/one', 'b/two', 'top'):
238
file(fn, 'w').write('old contents')
241
run_bzr('commit', '-m', 'first revision')
243
for fn in ('a/one', 'b/two', 'top'):
244
file(fn, 'w').write('new contents')
246
mutter('start selective subdir commit')
247
run_bzr('commit', 'a', '-m', 'commit a only')
249
old = b.revision_tree(b.get_rev_id(1))
250
new = b.revision_tree(b.get_rev_id(2))
252
eq(new.get_file_by_path('b/two').read(), 'old contents')
253
eq(new.get_file_by_path('top').read(), 'old contents')
254
eq(new.get_file_by_path('a/one').read(), 'new contents')
257
# commit from here should do nothing
258
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
259
v3 = b.revision_tree(b.get_rev_id(3))
260
eq(v3.get_file_by_path('b/two').read(), 'old contents')
261
eq(v3.get_file_by_path('top').read(), 'old contents')
262
eq(v3.get_file_by_path('a/one').read(), 'new contents')
264
# commit in subdirectory commits whole tree
265
run_bzr('commit', '-m', 'commit whole tree from subdir')
266
v4 = b.revision_tree(b.get_rev_id(4))
267
eq(v4.get_file_by_path('b/two').read(), 'new contents')
268
eq(v4.get_file_by_path('top').read(), 'new contents')
270
# TODO: factor out some kind of assert_tree_state() method
273
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
