18
18
"""Tests of simple versioning operations"""
20
# TODO: test adding a file whose directory is not versioned
21
# TODO: test trying to commit within a directory that is not yet added
26
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
27
from bzrlib.branch import Branch
30
logger = logging.getLogger('bzr.test.versioning')
34
class TestVersioning(TestCaseInTempDir):
21
from bzrlib.selftest import InTempDir
23
class Mkdir(InTempDir):
37
25
"""Basic 'bzr mkdir' operation"""
38
26
from bzrlib.commands import run_bzr
41
run_bzr(['mkdir', 'foo'])
29
run_bzr(['bzr', 'init'])
30
run_bzr(['bzr', 'mkdir', 'foo'])
42
31
self.assert_(os.path.isdir('foo'))
44
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
33
self.assertRaises(OSError, run_bzr, ['bzr', 'mkdir', 'foo'])
46
from bzrlib.diff import compare_trees
35
from bzrlib.diff import compare_trees, TreeDelta
47
36
from bzrlib.branch import Branch
50
39
delta = compare_trees(b.basis_tree(), b.working_tree())
52
self.log('delta.added = %r' % delta.added)
54
41
self.assertEquals(len(delta.added), 1)
55
42
self.assertEquals(delta.added[0][0], 'foo')
56
43
self.failIf(delta.modified)
58
def test_add_in_unversioned(self):
47
class AddInUnversioned(InTempDir):
59
49
"""Try to add a file in an unversioned directory.
61
51
smart_add may eventually add the parent as necessary, but simple
62
52
branch add doesn't do that.
64
54
from bzrlib.branch import Branch
65
56
from bzrlib.errors import NotVersionedError
67
58
b = Branch('.', init=True)
76
self.check_and_upgrade()
79
def test_subdir_add(self):
80
"""Add in subdirectory should add only things from there down"""
82
from bzrlib.branch import Branch
83
from bzrlib.commands import run_bzr
89
b = Branch('.', init=True)
90
self.build_tree(['src/', 'README'])
92
eq(sorted(b.unknowns()),
95
eq(run_bzr(['add', 'src']), 0)
97
self.build_tree(['src/foo.c'])
100
eq(run_bzr(['add']), 0)
102
eq(sorted(b.unknowns()),
104
eq(len(b.inventory), 3)
107
eq(run_bzr(['add']), 0)
108
eq(list(b.unknowns()), [])
110
self.check_and_upgrade()
113
def check_and_upgrade(self):
114
"""After all the above changes, run the check and upgrade commands.
116
The upgrade should be a no-op."""
118
debug('branch has %d revisions', b.revno())
120
debug('check branch...')
121
from bzrlib.check import check
124
debug('upgrade branch...')
125
from bzrlib.upgrade import upgrade
128
debug('check branch...')
129
from bzrlib.check import check
135
class SubdirCommit(TestCaseInTempDir):
137
def test_subdir_commit(self):
138
"""Test committing a subdirectory, and committing within a directory."""
139
run_bzr = self.run_bzr
140
eq = self.assertEqual
142
self.build_tree(['a/', 'b/'])
147
for fn in ('a/one', 'b/two', 'top'):
148
file(fn, 'w').write('old contents')
151
run_bzr('commit', '-m', 'first revision')
153
for fn in ('a/one', 'b/two', 'top'):
154
file(fn, 'w').write('new contents')
156
run_bzr('commit', 'a', '-m', 'commit a only')
158
old = b.revision_tree(b.lookup_revision(1))
159
new = b.revision_tree(b.lookup_revision(2))
161
eq(new.get_file_by_path('b/two').read(), 'old contents')
162
eq(new.get_file_by_path('top').read(), 'old contents')
163
eq(new.get_file_by_path('a/one').read(), 'new contents')
166
# commit from here should do nothing
167
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
168
v3 = b.revision_tree(b.lookup_revision(3))
169
eq(v3.get_file_by_path('b/two').read(), 'old contents')
170
eq(v3.get_file_by_path('top').read(), 'old contents')
171
eq(v3.get_file_by_path('a/one').read(), 'new contents')
173
# commit in subdirectory commits whole tree
174
run_bzr('commit', '-m', 'commit whole tree from subdir')
175
v4 = b.revision_tree(b.lookup_revision(4))
176
eq(v4.get_file_by_path('b/two').read(), 'new contents')
177
eq(v4.get_file_by_path('top').read(), 'new contents')
179
# TODO: factor out some kind of assert_tree_state() method
added
removed
bzrlib/selftest/versioning.py
