33
43
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
35
from bzrlib.diff import compare_trees, TreeDelta
45
from bzrlib.diff import compare_trees
36
46
from bzrlib.branch import Branch
39
49
delta = compare_trees(b.basis_tree(), b.working_tree())
51
self.log('delta.added = %r' % delta.added)
41
53
self.assertEquals(len(delta.added), 1)
42
54
self.assertEquals(delta.added[0][0], 'foo')
43
55
self.failIf(delta.modified)
47
class AddInUnversioned(InTempDir):
57
def test_branch_add_in_unversioned(self):
49
58
"""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.
60
"bzr add" adds the parent as necessary, but simple branch add
54
63
from bzrlib.branch import Branch
56
64
from bzrlib.errors import NotVersionedError
58
b = Branch('.', init=True)
66
b = Branch.initialize('.')
60
68
self.build_tree(['foo/',
68
class SubdirCommit(InTempDir):
70
"""Various commits from a subdirectory"""
72
from bzrlib.branch import Branch
73
from bzrlib.commands import run_bzr
76
b = Branch('.', init=True)
77
self.build_tree(['src/', 'src/foo.c', 'README'])
79
self.assertEqual(sorted(b.unknowns()),
82
self.assertEqual(run_bzr(['version']), 0)
84
self.assertEqual(run_bzr(['add']), 0)
78
def test_add_in_unversioned(self):
79
"""Try to add a file in an unversioned directory.
81
"bzr add" should add the parent(s) as necessary.
83
from bzrlib.branch import Branch
84
from bzrlib.commands import run_bzr
87
b = Branch.initialize('.')
89
self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
eq(list(b.unknowns()), ['inertiatic'])
91
run_bzr(['add', 'inertiatic/esp'])
92
eq(list(b.unknowns()), [])
94
# Multiple unversioned parents
95
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
96
eq(list(b.unknowns()), ['veil'])
97
run_bzr(['add', 'veil/cerpin/taxt'])
98
eq(list(b.unknowns()), [])
100
# Check whacky paths work
101
self.build_tree(['cicatriz/', 'cicatriz/esp'])
102
eq(list(b.unknowns()), ['cicatriz'])
103
run_bzr(['add', 'inertiatic/../cicatriz/esp'])
104
eq(list(b.unknowns()), [])
106
def test_add_in_versioned(self):
107
"""Try to add a file in a versioned directory.
109
"bzr add" should do this happily.
111
from bzrlib.branch import Branch
112
from bzrlib.commands import run_bzr
113
eq = self.assertEqual
115
b = Branch.initialize('.')
117
self.build_tree(['inertiatic/', 'inertiatic/esp'])
118
eq(list(b.unknowns()), ['inertiatic'])
119
run_bzr(['add', '--no-recurse', 'inertiatic'])
120
eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
121
run_bzr(['add', 'inertiatic/esp'])
122
eq(list(b.unknowns()), [])
124
def test_subdir_add(self):
125
"""Add in subdirectory should add only things from there down"""
127
from bzrlib.branch import Branch
128
from bzrlib.commands import run_bzr
130
eq = self.assertEqual
134
b = Branch.initialize('.')
135
self.build_tree(['src/', 'README'])
137
eq(sorted(b.unknowns()),
140
eq(run_bzr(['add', 'src']), 0)
142
self.build_tree(['src/foo.c'])
145
eq(run_bzr(['add']), 0)
147
eq(sorted(b.unknowns()),
149
eq(len(b.inventory), 3)
152
eq(run_bzr(['add']), 0)
153
eq(list(b.unknowns()), [])
158
def check_branch(self):
159
"""After all the above changes, run the check and upgrade commands.
161
The upgrade should be a no-op."""
163
debug('branch has %d revisions', b.revno())
165
debug('check branch...')
166
from bzrlib.check import check
171
class SubdirCommit(TestCaseInTempDir):
173
def test_subdir_commit(self):
174
"""Test committing a subdirectory, and committing within a directory."""
175
run_bzr = self.run_bzr
176
eq = self.assertEqual
178
self.build_tree(['a/', 'b/'])
183
for fn in ('a/one', 'b/two', 'top'):
184
file(fn, 'w').write('old contents')
187
run_bzr('commit', '-m', 'first revision')
189
for fn in ('a/one', 'b/two', 'top'):
190
file(fn, 'w').write('new contents')
192
debug('start selective subdir commit')
193
run_bzr('commit', 'a', '-m', 'commit a only')
195
old = b.revision_tree(b.get_rev_id(1))
196
new = b.revision_tree(b.get_rev_id(2))
198
eq(new.get_file_by_path('b/two').read(), 'old contents')
199
eq(new.get_file_by_path('top').read(), 'old contents')
200
eq(new.get_file_by_path('a/one').read(), 'new contents')
203
# commit from here should do nothing
204
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
205
v3 = b.revision_tree(b.get_rev_id(3))
206
eq(v3.get_file_by_path('b/two').read(), 'old contents')
207
eq(v3.get_file_by_path('top').read(), 'old contents')
208
eq(v3.get_file_by_path('a/one').read(), 'new contents')
210
# commit in subdirectory commits whole tree
211
run_bzr('commit', '-m', 'commit whole tree from subdir')
212
v4 = b.revision_tree(b.get_rev_id(4))
213
eq(v4.get_file_by_path('b/two').read(), 'new contents')
214
eq(v4.get_file_by_path('top').read(), 'new contents')
216
# TODO: factor out some kind of assert_tree_state() method
219
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
