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
28
from bzrlib.osutils import pathjoin
29
from bzrlib.workingtree import WorkingTree
32
class TestVersioning(TestCaseInTempDir):
21
from bzrlib.selftest import InTempDir
23
class Mkdir(InTempDir):
35
25
"""Basic 'bzr mkdir' operation"""
26
from bzrlib.commands import run_bzr
38
self.run_bzr('mkdir', 'foo')
29
run_bzr(['bzr', 'init'])
30
run_bzr(['bzr', 'mkdir', 'foo'])
39
31
self.assert_(os.path.isdir('foo'))
41
self.run_bzr('mkdir', 'foo', retcode=3)
33
self.assertRaises(OSError, run_bzr, ['bzr', 'mkdir', 'foo'])
43
wt = WorkingTree.open('.')
35
from bzrlib.diff import compare_trees, TreeDelta
36
from bzrlib.branch import Branch
45
delta = wt.changes_from(wt.basis_tree())
47
self.log('delta.added = %r' % delta.added)
39
delta = compare_trees(b.basis_tree(), b.working_tree())
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
wt = WorkingTree.open('.')
68
delta = wt.changes_from(wt.basis_tree())
70
self.log('delta.added = %r' % delta.added)
72
self.assertEquals(len(delta.added), 2)
73
self.assertEquals(delta.added[0][0], 'dir')
74
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
75
self.failIf(delta.modified)
77
def test_mkdir_w_nested_trees(self):
78
"""'bzr mkdir' with nested trees"""
89
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
90
self.failUnless(os.path.isdir('dir'))
91
self.failUnless(os.path.isdir('a/dir'))
92
self.failUnless(os.path.isdir('a/b/dir'))
94
wt = WorkingTree.open('.')
95
wt_a = WorkingTree.open('a')
96
wt_b = WorkingTree.open('a/b')
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)
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)
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)
113
def check_branch(self):
114
"""After all the above changes, run the check and upgrade commands.
116
The upgrade should be a no-op."""
117
b = Branch.open(u'.')
118
mutter('branch has %d revisions', b.revno())
120
mutter('check branch...')
121
from bzrlib.check import check
125
class SubdirCommit(TestCaseInTempDir):
127
def test_subdir_commit(self):
128
"""Test committing a subdirectory, and committing within a directory."""
129
run_bzr = self.run_bzr
130
eq = self.assertEqual
132
self.build_tree(['a/', 'b/'])
135
b = Branch.open(u'.')
137
for fn in ('a/one', 'b/two', 'top'):
138
file(fn, 'w').write('old contents')
141
run_bzr('commit', '-m', 'first revision')
143
for fn in ('a/one', 'b/two', 'top'):
144
file(fn, 'w').write('new contents')
146
mutter('start selective subdir commit')
147
run_bzr('commit', 'a', '-m', 'commit a only')
149
old = b.repository.revision_tree(b.get_rev_id(1))
150
new = b.repository.revision_tree(b.get_rev_id(2))
152
eq(new.get_file_by_path('b/two').read(), 'old contents')
153
eq(new.get_file_by_path('top').read(), 'old contents')
154
eq(new.get_file_by_path('a/one').read(), 'new contents')
157
# commit from here should do nothing
158
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
159
v3 = b.repository.revision_tree(b.get_rev_id(3))
160
eq(v3.get_file_by_path('b/two').read(), 'old contents')
161
eq(v3.get_file_by_path('top').read(), 'old contents')
162
eq(v3.get_file_by_path('a/one').read(), 'new contents')
164
# commit in subdirectory commits whole tree
165
run_bzr('commit', '-m', 'commit whole tree from subdir')
166
v4 = b.repository.revision_tree(b.get_rev_id(4))
167
eq(v4.get_file_by_path('b/two').read(), 'new contents')
168
eq(v4.get_file_by_path('top').read(), 'new contents')
170
# TODO: factor out some kind of assert_tree_state() method
173
if __name__ == '__main__':
47
class AddInUnversioned(InTempDir):
49
"""Try to add a file in an unversioned directory.
51
smart_add may eventually add the parent as necessary, but simple
52
branch add doesn't do that.
54
from bzrlib.branch import Branch
56
from bzrlib.errors import NotVersionedError
58
b = Branch('.', init=True)
60
self.build_tree(['foo/',
63
self.assertRaises(NotVersionedError,
added
removed
bzrlib/selftest/versioning.py
