18
18
"""Tests of simple versioning operations"""
20
# TODO: test adding a file whose directory is not versioned
20
21
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
25
from bzrlib.selftest import InTempDir, BzrTestBase
26
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):
29
class TestVersioning(InTempDir):
34
31
def test_mkdir(self):
35
32
"""Basic 'bzr mkdir' operation"""
33
from bzrlib.commands import run_bzr
38
self.run_bzr('mkdir', 'foo')
36
run_bzr(['mkdir', 'foo'])
39
37
self.assert_(os.path.isdir('foo'))
41
self.run_bzr('mkdir', 'foo', retcode=3)
39
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
43
41
from bzrlib.diff import compare_trees
44
wt = WorkingTree.open('.')
42
from bzrlib.branch import Branch
46
delta = compare_trees(wt.basis_tree(), wt)
45
delta = compare_trees(b.basis_tree(), b.working_tree())
48
47
self.log('delta.added = %r' % delta.added)
51
50
self.assertEquals(delta.added[0][0], 'foo')
52
51
self.failIf(delta.modified)
54
def test_mkdir_in_subdir(self):
55
"""'bzr mkdir' operation in subdirectory"""
58
self.run_bzr('mkdir', 'dir')
59
self.assert_(os.path.isdir('dir'))
62
self.log('Run mkdir in subdir')
63
self.run_bzr('mkdir', 'subdir')
64
self.assert_(os.path.isdir('subdir'))
67
from bzrlib.diff import compare_trees
68
wt = WorkingTree.open('.')
70
delta = compare_trees(wt.basis_tree(), wt)
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], pathjoin('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
97
wt = WorkingTree.open('.')
98
wt_a = WorkingTree.open('a')
99
wt_b = WorkingTree.open('a/b')
101
delta = compare_trees(wt.basis_tree(), wt)
102
self.assertEquals(len(delta.added), 1)
103
self.assertEquals(delta.added[0][0], 'dir')
104
self.failIf(delta.modified)
106
delta = compare_trees(wt_a.basis_tree(), wt_a)
107
self.assertEquals(len(delta.added), 1)
108
self.assertEquals(delta.added[0][0], 'dir')
109
self.failIf(delta.modified)
111
delta = compare_trees(wt_b.basis_tree(), wt_b)
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(delta.added[0][0], 'dir')
114
self.failIf(delta.modified)
116
def check_branch(self):
117
"""After all the above changes, run the check and upgrade commands.
119
The upgrade should be a no-op."""
120
b = Branch.open(u'.')
121
mutter('branch has %d revisions', b.revno())
123
mutter('check branch...')
124
from bzrlib.check import check
128
class SubdirCommit(TestCaseInTempDir):
53
def test_add_in_unversioned(self):
54
"""Try to add a file in an unversioned directory.
56
smart_add may eventually add the parent as necessary, but simple
57
branch add doesn't do that.
59
from bzrlib.branch import Branch
60
from bzrlib.errors import NotVersionedError
62
b = Branch('.', init=True)
64
self.build_tree(['foo/',
67
self.assertRaises(NotVersionedError,
71
def test_subdir_add(self):
72
"""Add in subdirectory should add only things from there down"""
74
from bzrlib.branch import Branch
75
from bzrlib.commands import run_bzr
81
b = Branch('.', init=True)
82
self.build_tree(['src/', 'README'])
84
eq(sorted(b.unknowns()),
87
eq(run_bzr(['add', 'src']), 0)
89
self.build_tree(['src/foo.c'])
92
eq(run_bzr(['add']), 0)
94
eq(sorted(b.unknowns()),
96
eq(len(b.inventory), 3)
99
eq(run_bzr(['add']), 0)
100
eq(list(b.unknowns()), [])
103
class SubdirCommit(BzrTestBase):
130
105
def test_subdir_commit(self):
131
106
"""Test committing a subdirectory, and committing within a directory."""
146
121
for fn in ('a/one', 'b/two', 'top'):
147
122
file(fn, 'w').write('new contents')
149
mutter('start selective subdir commit')
150
124
run_bzr('commit', 'a', '-m', 'commit a only')
152
old = b.repository.revision_tree(b.get_rev_id(1))
153
new = b.repository.revision_tree(b.get_rev_id(2))
126
old = b.revision_tree(b.lookup_revision(1))
127
new = b.revision_tree(b.lookup_revision(2))
155
129
eq(new.get_file_by_path('b/two').read(), 'old contents')
156
130
eq(new.get_file_by_path('top').read(), 'old contents')
160
134
# commit from here should do nothing
161
135
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
162
v3 = b.repository.revision_tree(b.get_rev_id(3))
136
v3 = b.revision_tree(b.lookup_revision(3))
163
137
eq(v3.get_file_by_path('b/two').read(), 'old contents')
164
138
eq(v3.get_file_by_path('top').read(), 'old contents')
165
139
eq(v3.get_file_by_path('a/one').read(), 'new contents')
167
141
# commit in subdirectory commits whole tree
168
142
run_bzr('commit', '-m', 'commit whole tree from subdir')
169
v4 = b.repository.revision_tree(b.get_rev_id(4))
143
v4 = b.revision_tree(b.lookup_revision(4))
170
144
eq(v4.get_file_by_path('b/two').read(), 'new contents')
171
145
eq(v4.get_file_by_path('top').read(), 'new contents')
173
147
# TODO: factor out some kind of assert_tree_state() method
176
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
