76
51
"original/child/", "original/child/path")
78
53
self.build_tree(build_paths)
79
wt = self.make_branch_and_tree('.')
80
child_tree = self.make_branch_and_tree('original/child')
81
smart_add_tree(wt, (".",))
54
branch = Branch.initialize(".")
55
child_branch = Branch.initialize("original/child")
56
smart_add((".",), True, add_reporter_null)
83
self.assertNotEqual((path, wt.path2id(path)),
58
self.assertNotEqual((path, branch.inventory.path2id(path)),
85
60
for path in full_child_paths:
86
self.assertEqual((path, wt.path2id(path)),
61
self.assertEqual((path, branch.inventory.path2id(path)),
88
63
for path in child_paths:
89
self.assertEqual(child_tree.path2id(path), None)
64
self.assertEqual(child_branch.inventory.path2id(path), None)
91
66
def test_add_paths(self):
92
67
"""Test smart-adding a list of paths."""
93
68
from bzrlib.add import smart_add
94
69
paths = ("file1", "file2")
95
70
self.build_tree(paths)
96
wt = self.make_branch_and_tree('.')
97
smart_add_tree(wt, paths)
71
branch = Branch.initialize(".")
99
self.assertNotEqual(wt.path2id(path), None)
101
def test_add_ignored_nested_paths(self):
102
"""Test smart-adding a list of paths which includes ignored ones."""
103
wt = self.make_branch_and_tree('.')
104
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
105
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
106
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
107
self.build_tree(tree_shape)
108
smart_add_tree(wt, add_paths)
109
for path in expected_paths:
110
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
112
def test_save_false(self):
113
"""Test smart-adding a path with save set to false."""
114
wt = self.make_branch_and_tree('.')
115
self.build_tree(['file'])
116
smart_add_tree(wt, ['file'], save=False)
117
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
118
wt.read_working_inventory()
119
self.assertEqual(wt.path2id('file'), None)
121
def test_add_dry_run(self):
122
"""Test a dry run add, make sure nothing is added."""
123
from bzrlib.commands import run_bzr
124
ignores._set_user_ignores(['./.bazaar'])
125
eq = self.assertEqual
126
wt = self.make_branch_and_tree('.')
127
self.build_tree(['inertiatic/', 'inertiatic/esp'])
128
eq(list(wt.unknowns()), ['inertiatic'])
129
self.capture('add --dry-run .')
130
eq(list(wt.unknowns()), ['inertiatic'])
132
def test_add_non_existant(self):
133
"""Test smart-adding a file that does not exist."""
134
from bzrlib.add import smart_add
135
wt = self.make_branch_and_tree('.')
136
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
138
def test_returns_and_ignores(self):
139
"""Correctly returns added/ignored files"""
140
from bzrlib.commands import run_bzr
141
wt = self.make_branch_and_tree('.')
142
# The default ignore list includes '*.py[co]', but not CVS
143
ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
144
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
145
'inertiatic/foo.pyc'])
146
added, ignored = smart_add_tree(wt, u'.')
147
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
149
self.assertSubset(('*.py[co]',), ignored)
150
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
153
class AddCustomIDAction(AddAction):
155
def __call__(self, inv, parent_ie, path, kind):
156
# The first part just logs if appropriate
157
# Now generate a custom id
158
file_id = kind + '-' + path.raw_path.replace('/', '%')
159
if self.should_print:
160
self._to_file.write('added %s with id %s\n'
161
% (path.raw_path, file_id))
165
class TestSmartAddTree(TestCaseWithTransport):
74
self.assertNotEqual(branch.inventory.path2id(path), None)
76
class TestSmartAddBranch(TestCaseInTempDir):
166
77
"""Test smart adds with a specified branch."""
168
79
def test_add_dot_from_root(self):
169
80
"""Test adding . from the root of the tree."""
81
from bzrlib.add import smart_add_branch
170
82
paths = ("original/", "original/file1", "original/file2")
171
83
self.build_tree(paths)
172
wt = self.make_branch_and_tree('.')
173
smart_add_tree(wt, (u".",))
84
branch = Branch.initialize(".")
85
smart_add_branch(branch, (".",))
174
86
for path in paths:
175
self.assertNotEqual(wt.path2id(path), None)
87
self.assertNotEqual(branch.inventory.path2id(path), None)
177
89
def test_add_dot_from_subdir(self):
178
90
"""Test adding . from a subdir of the tree."""
91
from bzrlib.add import smart_add_branch
179
92
paths = ("original/", "original/file1", "original/file2")
180
93
self.build_tree(paths)
181
wt = self.make_branch_and_tree('.')
94
branch = Branch.initialize(".")
182
95
os.chdir("original")
183
smart_add_tree(wt, (u".",))
96
smart_add_branch(branch, (".",))
184
97
for path in paths:
185
self.assertNotEqual(wt.path2id(path), None)
98
self.assertNotEqual(branch.inventory.path2id(path), None)
187
100
def test_add_tree_from_above_tree(self):
188
101
"""Test adding a tree from above the tree."""
102
from bzrlib.add import smart_add_branch
189
103
paths = ("original/", "original/file1", "original/file2")
190
104
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
191
105
"branch/original/file2")
192
106
self.build_tree(branch_paths)
193
tree = self.make_branch_and_tree('branch')
194
smart_add_tree(tree, ("branch",))
107
branch = Branch.initialize("branch")
108
smart_add_branch(branch, ("branch",))
195
109
for path in paths:
196
self.assertNotEqual(tree.path2id(path), None)
110
self.assertNotEqual(branch.inventory.path2id(path), None)
198
112
def test_add_above_tree_preserves_tree(self):
199
113
"""Test nested trees are not affect by an add above them."""
114
from bzrlib.add import smart_add_branch
200
115
paths = ("original/", "original/file1", "original/file2")
201
116
child_paths = ("path")
202
117
full_child_paths = ("original/child", "original/child/path")
203
118
build_paths = ("original/", "original/file1", "original/file2",
204
119
"original/child/", "original/child/path")
205
120
self.build_tree(build_paths)
206
tree = self.make_branch_and_tree('.')
207
child_tree = self.make_branch_and_tree("original/child")
208
smart_add_tree(tree, (u".",))
121
branch = Branch.initialize(".")
122
child_branch = Branch.initialize("original/child")
123
smart_add_branch(branch, (".",))
209
124
for path in paths:
210
self.assertNotEqual((path, tree.path2id(path)),
125
self.assertNotEqual((path, branch.inventory.path2id(path)),
212
127
for path in full_child_paths:
213
self.assertEqual((path, tree.path2id(path)),
128
self.assertEqual((path, branch.inventory.path2id(path)),
215
130
for path in child_paths:
216
self.assertEqual(child_tree.path2id(path), None)
131
self.assertEqual(child_branch.inventory.path2id(path), None)
218
133
def test_add_paths(self):
219
134
"""Test smart-adding a list of paths."""
135
from bzrlib.add import smart_add_branch
220
136
paths = ("file1", "file2")
221
137
self.build_tree(paths)
222
wt = self.make_branch_and_tree('.')
223
smart_add_tree(wt, paths)
138
branch = Branch.initialize(".")
139
smart_add_branch(branch, paths)
224
140
for path in paths:
225
self.assertNotEqual(wt.path2id(path), None)
227
def test_add_multiple_dirs(self):
228
"""Test smart adding multiple directories at once."""
229
added_paths = ['file1', 'file2',
230
'dir1/', 'dir1/file3',
231
'dir1/subdir2/', 'dir1/subdir2/file4',
232
'dir2/', 'dir2/file5',
234
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
235
self.build_tree(added_paths)
236
self.build_tree(not_added)
238
wt = self.make_branch_and_tree('.')
239
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
241
for path in added_paths:
242
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
243
'Failed to add path: %s' % (path,))
244
for path in not_added:
245
self.assertEqual(None, wt.path2id(path.rstrip('/')),
246
'Accidentally added path: %s' % (path,))
248
def test_custom_ids(self):
250
action = AddCustomIDAction(to_file=sio, should_print=True)
251
self.build_tree(['file1', 'dir1/', 'dir1/file2'])
253
wt = self.make_branch_and_tree('.')
254
smart_add_tree(wt, ['.'], action=action)
255
# The order of adds is not strictly fixed:
257
lines = sorted(sio.readlines())
258
self.assertEqualDiff(['added dir1 with id directory-dir1\n',
259
'added dir1/file2 with id file-dir1%file2\n',
260
'added file1 with id file-file1\n',
262
self.assertEqual([('', wt.inventory.root.file_id),
263
('dir1', 'directory-dir1'),
264
('dir1/file2', 'file-dir1%file2'),
265
('file1', 'file-file1'),
266
], [(path, ie.file_id) for path, ie
267
in wt.inventory.iter_entries()])
270
class TestAddFrom(TestCaseWithTransport):
271
"""Tests for AddFromBaseAction"""
273
def make_base_tree(self):
274
self.base_tree = self.make_branch_and_tree('base')
275
self.build_tree(['base/a', 'base/b',
276
'base/dir/', 'base/dir/a',
280
self.base_tree.add(['a', 'b', 'dir', 'dir/a',
281
'dir/subdir', 'dir/subdir/b'])
282
self.base_tree.commit('creating initial tree.')
284
def add_helper(self, base_tree, base_path, new_tree, file_list,
287
base_tree.lock_read()
289
new_tree.lock_write()
291
action = AddFromBaseAction(base_tree, base_path,
293
should_print=should_print)
294
smart_add_tree(new_tree, file_list, action=action)
299
return to_file.getvalue()
301
def test_copy_all(self):
302
self.make_base_tree()
303
new_tree = self.make_branch_and_tree('new')
309
self.build_tree(['new/' + fn for fn in files])
310
self.add_helper(self.base_tree, '', new_tree, ['new'])
313
base_file_id = self.base_tree.path2id(fn)
314
new_file_id = new_tree.path2id(fn)
315
self.assertEqual(base_file_id, new_file_id)
317
def test_copy_from_dir(self):
318
self.make_base_tree()
319
new_tree = self.make_branch_and_tree('new')
321
self.build_tree(['new/a', 'new/b', 'new/c',
322
'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
323
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
325
# We 'a' and 'b' exist in the root, and they are being added
326
# in a new 'root'. Since ROOT ids are not unique, we will
328
# TODO: This will probably change once trees have a unique root id
329
# It is definitely arguable that 'a' should get the id of
330
# 'dir/a' not of 'a'.
331
self.assertEqual(self.base_tree.path2id('a'),
332
new_tree.path2id('a'))
333
self.assertEqual(self.base_tree.path2id('b'),
334
new_tree.path2id('b'))
336
# Because we specified 'dir/' as the base path, and we have
337
# nothing named 'subdir' in the base tree, we should grab the
339
self.assertEqual(self.base_tree.path2id('dir/subdir'),
340
new_tree.path2id('subdir'))
341
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
342
new_tree.path2id('subdir/b'))
344
# These should get newly generated ids
345
c_id = new_tree.path2id('c')
346
self.assertNotEqual(None, c_id)
347
self.failIf(c_id in self.base_tree)
349
d_id = new_tree.path2id('subdir/d')
350
self.assertNotEqual(None, d_id)
351
self.failIf(d_id in self.base_tree)
353
def test_copy_existing_dir(self):
354
self.make_base_tree()
355
new_tree = self.make_branch_and_tree('new')
356
self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
358
subdir_file_id = self.base_tree.path2id('dir/subdir')
359
new_tree.add(['subby'], [subdir_file_id])
360
self.add_helper(self.base_tree, '', new_tree, ['new'])
361
# Because 'subby' already points to subdir, we should add
362
# 'b' with the same id
363
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
364
new_tree.path2id('subby/b'))
366
# 'subby/a' should be added with a new id because there is no
367
# matching path or child of 'subby'.
368
a_id = new_tree.path2id('subby/a')
369
self.assertNotEqual(None, a_id)
370
self.failIf(a_id in self.base_tree)
373
class TestAddNonNormalized(TestCaseWithTransport):
377
self.build_tree([u'a\u030a'])
379
raise TestSkipped('Filesystem cannot create unicode filenames')
381
self.wt = self.make_branch_and_tree('.')
383
def test_accessible_explicit(self):
385
orig = osutils.normalized_filename
386
osutils.normalized_filename = osutils._accessible_normalized_filename
388
smart_add_tree(self.wt, [u'a\u030a'])
389
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
390
[(path, ie.kind) for path,ie in
391
self.wt.inventory.iter_entries()])
393
osutils.normalized_filename = orig
395
def test_accessible_implicit(self):
397
orig = osutils.normalized_filename
398
osutils.normalized_filename = osutils._accessible_normalized_filename
400
smart_add_tree(self.wt, [])
401
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
402
[(path, ie.kind) for path,ie in
403
self.wt.inventory.iter_entries()])
405
osutils.normalized_filename = orig
407
def test_inaccessible_explicit(self):
409
orig = osutils.normalized_filename
410
osutils.normalized_filename = osutils._inaccessible_normalized_filename
412
self.assertRaises(errors.InvalidNormalization,
413
smart_add_tree, self.wt, [u'a\u030a'])
415
osutils.normalized_filename = orig
417
def test_inaccessible_implicit(self):
419
orig = osutils.normalized_filename
420
osutils.normalized_filename = osutils._inaccessible_normalized_filename
422
# TODO: jam 20060701 In the future, this should probably
423
# just ignore files that don't fit the normalization
424
# rules, rather than exploding
425
self.assertRaises(errors.InvalidNormalization,
426
smart_add_tree, self.wt, [])
428
osutils.normalized_filename = orig
431
class TestAddActions(TestCase):
433
def test_quiet(self):
436
def test__print(self):
437
self.run_action("added path\n")
439
def run_action(self, output):
440
from bzrlib.add import AddAction, FastPath
141
self.assertNotEqual(branch.inventory.path2id(path), None)
143
class TestAddCallbacks(TestCaseInTempDir):
146
from bzrlib.inventory import InventoryEntry
147
super(TestAddCallbacks, self).setUp()
148
self.entry = InventoryEntry("id", "name", "file", None)
150
def test_null_callback(self):
151
from bzrlib.add import add_reporter_null
152
add_reporter_null('path', 'file', self.entry)
154
def test_print_callback(self):
155
from bzrlib.add import add_reporter_print
156
from StringIO import StringIO
442
157
stdout = StringIO()
443
action = AddAction(to_file=stdout, should_print=bool(output))
445
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
446
self.assertEqual(stdout.getvalue(), output)
158
self.apply_redirected(None, stdout, None, add_reporter_print,
159
'path', 'file', self.entry)
160
self.assertEqual(stdout.getvalue(), "added path\n")
added
removed
bzrlib/selftest/test_smart_add.py
