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
29
logger = logging.getLogger('bzr.test.versioning')
33
class TestVersioning(TestCaseInTempDir):
21
from bzrlib.selftest import InTempDir
23
class Mkdir(InTempDir):
36
25
"""Basic 'bzr mkdir' operation"""
26
from bzrlib.commands import run_bzr
39
self.run_bzr('mkdir', 'foo')
29
run_bzr(['bzr', 'init'])
30
run_bzr(['bzr', 'mkdir', 'foo'])
40
31
self.assert_(os.path.isdir('foo'))
42
self.run_bzr('mkdir', 'foo', retcode=2)
33
self.assertRaises(OSError, run_bzr, ['bzr', 'mkdir', 'foo'])
44
from bzrlib.diff import compare_trees
35
from bzrlib.diff import compare_trees, TreeDelta
45
36
from bzrlib.branch import Branch
48
39
delta = compare_trees(b.basis_tree(), b.working_tree())
50
self.log('delta.added = %r' % delta.added)
52
41
self.assertEquals(len(delta.added), 1)
53
42
self.assertEquals(delta.added[0][0], 'foo')
54
43
self.failIf(delta.modified)
56
def test_branch_add_in_unversioned(self):
47
class AddInUnversioned(InTempDir):
57
49
"""Try to add a file in an unversioned directory.
59
"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.
62
54
from bzrlib.branch import Branch
63
56
from bzrlib.errors import NotVersionedError
65
b = Branch.initialize('.')
58
b = Branch('.', init=True)
67
60
self.build_tree(['foo/',
76
def test_add_in_unversioned(self):
77
"""Try to add a file in an unversioned directory.
79
"bzr add" should add the parent(s) as necessary.
81
from bzrlib.branch import Branch
84
b = Branch.initialize('.')
86
self.build_tree(['inertiatic/', 'inertiatic/esp'])
87
eq(list(b.unknowns()), ['inertiatic'])
88
self.run_bzr('add', 'inertiatic/esp')
89
eq(list(b.unknowns()), [])
91
# Multiple unversioned parents
92
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
93
eq(list(b.unknowns()), ['veil'])
94
self.run_bzr('add', 'veil/cerpin/taxt')
95
eq(list(b.unknowns()), [])
97
# Check whacky paths work
98
self.build_tree(['cicatriz/', 'cicatriz/esp'])
99
eq(list(b.unknowns()), ['cicatriz'])
100
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
101
eq(list(b.unknowns()), [])
103
def test_add_in_versioned(self):
104
"""Try to add a file in a versioned directory.
106
"bzr add" should do this happily.
108
from bzrlib.branch import Branch
109
eq = self.assertEqual
111
b = Branch.initialize('.')
113
self.build_tree(['inertiatic/', 'inertiatic/esp'])
114
eq(list(b.unknowns()), ['inertiatic'])
115
self.run_bzr('add', '--no-recurse', 'inertiatic')
116
eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
117
self.run_bzr('add', 'inertiatic/esp')
118
eq(list(b.unknowns()), [])
120
def test_subdir_add(self):
121
"""Add in subdirectory should add only things from there down"""
123
from bzrlib.branch import Branch
125
eq = self.assertEqual
129
b = Branch.initialize('.')
130
self.build_tree(['src/', 'README'])
132
eq(sorted(b.unknowns()),
135
self.run_bzr('add', 'src')
137
self.build_tree(['src/foo.c'])
142
eq(sorted(b.unknowns()),
144
eq(len(b.inventory), 3)
148
eq(list(b.unknowns()), [])
152
def check_branch(self):
153
"""After all the above changes, run the check and upgrade commands.
155
The upgrade should be a no-op."""
157
debug('branch has %d revisions', b.revno())
159
debug('check branch...')
160
from bzrlib.check import check
165
class SubdirCommit(TestCaseInTempDir):
167
def test_subdir_commit(self):
168
"""Test committing a subdirectory, and committing within a directory."""
169
run_bzr = self.run_bzr
170
eq = self.assertEqual
172
self.build_tree(['a/', 'b/'])
177
for fn in ('a/one', 'b/two', 'top'):
178
file(fn, 'w').write('old contents')
181
run_bzr('commit', '-m', 'first revision')
183
for fn in ('a/one', 'b/two', 'top'):
184
file(fn, 'w').write('new contents')
186
debug('start selective subdir commit')
187
run_bzr('commit', 'a', '-m', 'commit a only')
189
old = b.revision_tree(b.get_rev_id(1))
190
new = b.revision_tree(b.get_rev_id(2))
192
eq(new.get_file_by_path('b/two').read(), 'old contents')
193
eq(new.get_file_by_path('top').read(), 'old contents')
194
eq(new.get_file_by_path('a/one').read(), 'new contents')
197
# commit from here should do nothing
198
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
199
v3 = b.revision_tree(b.get_rev_id(3))
200
eq(v3.get_file_by_path('b/two').read(), 'old contents')
201
eq(v3.get_file_by_path('top').read(), 'old contents')
202
eq(v3.get_file_by_path('a/one').read(), 'new contents')
204
# commit in subdirectory commits whole tree
205
run_bzr('commit', '-m', 'commit whole tree from subdir')
206
v4 = b.revision_tree(b.get_rev_id(4))
207
eq(v4.get_file_by_path('b/two').read(), 'new contents')
208
eq(v4.get_file_by_path('top').read(), 'new contents')
210
# TODO: factor out some kind of assert_tree_state() method
213
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
