18
18
"""Tests of simple versioning operations"""
20
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.tests 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_working_tree_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 working tree 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
124
from bzrlib.workingtree import WorkingTree
126
b = Branch.initialize(u'.')
58
b = Branch('.', init=True)
128
60
self.build_tree(['foo/',
131
63
self.assertRaises(NotVersionedError,
132
WorkingTree(b.base, b).add,
137
def check_branch(self):
138
"""After all the above changes, run the check and upgrade commands.
140
The upgrade should be a no-op."""
141
b = Branch.open(u'.')
142
mutter('branch has %d revisions', b.revno())
144
mutter('check branch...')
145
from bzrlib.check import check
149
class SubdirCommit(TestCaseInTempDir):
151
def test_subdir_commit(self):
152
"""Test committing a subdirectory, and committing within a directory."""
153
run_bzr = self.run_bzr
154
eq = self.assertEqual
156
self.build_tree(['a/', 'b/'])
159
b = Branch.open(u'.')
161
for fn in ('a/one', 'b/two', 'top'):
162
file(fn, 'w').write('old contents')
165
run_bzr('commit', '-m', 'first revision')
167
for fn in ('a/one', 'b/two', 'top'):
168
file(fn, 'w').write('new contents')
170
mutter('start selective subdir commit')
171
run_bzr('commit', 'a', '-m', 'commit a only')
173
old = b.revision_tree(b.get_rev_id(1))
174
new = b.revision_tree(b.get_rev_id(2))
176
eq(new.get_file_by_path('b/two').read(), 'old contents')
177
eq(new.get_file_by_path('top').read(), 'old contents')
178
eq(new.get_file_by_path('a/one').read(), 'new contents')
181
# commit from here should do nothing
182
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
183
v3 = b.revision_tree(b.get_rev_id(3))
184
eq(v3.get_file_by_path('b/two').read(), 'old contents')
185
eq(v3.get_file_by_path('top').read(), 'old contents')
186
eq(v3.get_file_by_path('a/one').read(), 'new contents')
188
# commit in subdirectory commits whole tree
189
run_bzr('commit', '-m', 'commit whole tree from subdir')
190
v4 = b.revision_tree(b.get_rev_id(4))
191
eq(v4.get_file_by_path('b/two').read(), 'new contents')
192
eq(v4.get_file_by_path('top').read(), 'new contents')
194
# TODO: factor out some kind of assert_tree_state() method
197
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
