76
52
"original/child/", "original/child/path")
78
54
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, (".",))
55
branch = Branch.initialize(".")
56
child_branch = Branch.initialize("original/child")
57
smart_add((".",), True, add_reporter_null)
83
self.assertNotEqual((path, wt.path2id(path)),
59
self.assertNotEqual((path, branch.inventory.path2id(path)),
85
61
for path in full_child_paths:
86
self.assertEqual((path, wt.path2id(path)),
62
self.assertEqual((path, branch.inventory.path2id(path)),
88
64
for path in child_paths:
89
self.assertEqual(child_tree.path2id(path), None)
65
self.assertEqual(child_branch.inventory.path2id(path), None)
91
67
def test_add_paths(self):
92
68
"""Test smart-adding a list of paths."""
93
69
from bzrlib.add import smart_add
94
70
paths = ("file1", "file2")
95
71
self.build_tree(paths)
96
wt = self.make_branch_and_tree('.')
97
smart_add_tree(wt, paths)
72
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
eq = self.assertEqual
125
wt = self.make_branch_and_tree('.')
126
self.build_tree(['inertiatic/', 'inertiatic/esp'])
127
eq(list(wt.unknowns()), ['inertiatic'])
128
self.capture('add --dry-run .')
129
eq(list(wt.unknowns()), ['inertiatic'])
131
def test_add_non_existant(self):
132
"""Test smart-adding a file that does not exist."""
133
from bzrlib.add import smart_add
134
wt = self.make_branch_and_tree('.')
135
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
137
def test_returns_and_ignores(self):
138
"""Correctly returns added/ignored files"""
139
from bzrlib.commands import run_bzr
140
wt = self.make_branch_and_tree('.')
141
# The default ignore list includes '*.py[co]', but not CVS
142
ignores._set_user_ignores(['*.py[co]'])
143
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
144
'inertiatic/foo.pyc'])
145
added, ignored = smart_add_tree(wt, u'.')
146
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
148
self.assertSubset(('*.py[co]',), ignored)
149
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
152
class AddCustomIDAction(AddAction):
154
def __call__(self, inv, parent_ie, path, kind):
155
# The first part just logs if appropriate
156
# Now generate a custom id
157
file_id = kind + '-' + path.raw_path.replace('/', '%')
158
if self.should_print:
159
self._to_file.write('added %s with id %s\n'
160
% (path.raw_path, file_id))
164
class TestSmartAddTree(TestCaseWithTransport):
75
self.assertNotEqual(branch.inventory.path2id(path), None)
77
class TestSmartAddBranch(TestCaseInTempDir):
165
78
"""Test smart adds with a specified branch."""
167
80
def test_add_dot_from_root(self):
168
81
"""Test adding . from the root of the tree."""
82
from bzrlib.add import smart_add_branch
169
83
paths = ("original/", "original/file1", "original/file2")
170
84
self.build_tree(paths)
171
wt = self.make_branch_and_tree('.')
172
smart_add_tree(wt, (u".",))
85
branch = Branch.initialize(".")
86
smart_add_branch(branch, (".",))
173
87
for path in paths:
174
self.assertNotEqual(wt.path2id(path), None)
88
self.assertNotEqual(branch.inventory.path2id(path), None)
176
90
def test_add_dot_from_subdir(self):
177
91
"""Test adding . from a subdir of the tree."""
92
from bzrlib.add import smart_add_branch
178
93
paths = ("original/", "original/file1", "original/file2")
179
94
self.build_tree(paths)
180
wt = self.make_branch_and_tree('.')
95
branch = Branch.initialize(".")
181
96
os.chdir("original")
182
smart_add_tree(wt, (u".",))
97
smart_add_branch(branch, (".",))
183
98
for path in paths:
184
self.assertNotEqual(wt.path2id(path), None)
99
self.assertNotEqual(branch.inventory.path2id(path), None)
186
101
def test_add_tree_from_above_tree(self):
187
102
"""Test adding a tree from above the tree."""
103
from bzrlib.add import smart_add_branch
188
104
paths = ("original/", "original/file1", "original/file2")
189
105
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
190
106
"branch/original/file2")
191
107
self.build_tree(branch_paths)
192
tree = self.make_branch_and_tree('branch')
193
smart_add_tree(tree, ("branch",))
108
branch = Branch.initialize("branch")
109
smart_add_branch(branch, ("branch",))
194
110
for path in paths:
195
self.assertNotEqual(tree.path2id(path), None)
111
self.assertNotEqual(branch.inventory.path2id(path), None)
197
113
def test_add_above_tree_preserves_tree(self):
198
114
"""Test nested trees are not affect by an add above them."""
115
from bzrlib.add import smart_add_branch
199
116
paths = ("original/", "original/file1", "original/file2")
200
117
child_paths = ("path")
201
118
full_child_paths = ("original/child", "original/child/path")
202
119
build_paths = ("original/", "original/file1", "original/file2",
203
120
"original/child/", "original/child/path")
204
121
self.build_tree(build_paths)
205
tree = self.make_branch_and_tree('.')
206
child_tree = self.make_branch_and_tree("original/child")
207
smart_add_tree(tree, (u".",))
122
branch = Branch.initialize(".")
123
child_branch = Branch.initialize("original/child")
124
smart_add_branch(branch, (".",))
208
125
for path in paths:
209
self.assertNotEqual((path, tree.path2id(path)),
126
self.assertNotEqual((path, branch.inventory.path2id(path)),
211
128
for path in full_child_paths:
212
self.assertEqual((path, tree.path2id(path)),
129
self.assertEqual((path, branch.inventory.path2id(path)),
214
131
for path in child_paths:
215
self.assertEqual(child_tree.path2id(path), None)
132
self.assertEqual(child_branch.inventory.path2id(path), None)
217
134
def test_add_paths(self):
218
135
"""Test smart-adding a list of paths."""
136
from bzrlib.add import smart_add_branch
219
137
paths = ("file1", "file2")
220
138
self.build_tree(paths)
221
wt = self.make_branch_and_tree('.')
222
smart_add_tree(wt, paths)
139
branch = Branch.initialize(".")
140
smart_add_branch(branch, paths)
223
141
for path in paths:
224
self.assertNotEqual(wt.path2id(path), None)
226
def test_add_multiple_dirs(self):
227
"""Test smart adding multiple directories at once."""
228
added_paths = ['file1', 'file2',
229
'dir1/', 'dir1/file3',
230
'dir1/subdir2/', 'dir1/subdir2/file4',
231
'dir2/', 'dir2/file5',
233
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
234
self.build_tree(added_paths)
235
self.build_tree(not_added)
237
wt = self.make_branch_and_tree('.')
238
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
240
for path in added_paths:
241
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
242
'Failed to add path: %s' % (path,))
243
for path in not_added:
244
self.assertEqual(None, wt.path2id(path.rstrip('/')),
245
'Accidentally added path: %s' % (path,))
247
def test_custom_ids(self):
249
action = AddCustomIDAction(to_file=sio, should_print=True)
250
self.build_tree(['file1', 'dir1/', 'dir1/file2'])
252
wt = self.make_branch_and_tree('.')
253
smart_add_tree(wt, ['.'], action=action)
254
# The order of adds is not strictly fixed:
256
lines = sorted(sio.readlines())
257
self.assertEqualDiff(['added dir1 with id directory-dir1\n',
258
'added dir1/file2 with id file-dir1%file2\n',
259
'added file1 with id file-file1\n',
261
self.assertEqual([('', wt.inventory.root.file_id),
262
('dir1', 'directory-dir1'),
263
('dir1/file2', 'file-dir1%file2'),
264
('file1', 'file-file1'),
265
], [(path, ie.file_id) for path, ie
266
in wt.inventory.iter_entries()])
269
class TestAddFrom(TestCaseWithTransport):
270
"""Tests for AddFromBaseAction"""
272
def make_base_tree(self):
273
self.base_tree = self.make_branch_and_tree('base')
274
self.build_tree(['base/a', 'base/b',
275
'base/dir/', 'base/dir/a',
279
self.base_tree.add(['a', 'b', 'dir', 'dir/a',
280
'dir/subdir', 'dir/subdir/b'])
281
self.base_tree.commit('creating initial tree.')
283
def add_helper(self, base_tree, base_path, new_tree, file_list,
286
base_tree.lock_read()
288
new_tree.lock_write()
290
action = AddFromBaseAction(base_tree, base_path,
292
should_print=should_print)
293
smart_add_tree(new_tree, file_list, action=action)
298
return to_file.getvalue()
300
def test_copy_all(self):
301
self.make_base_tree()
302
new_tree = self.make_branch_and_tree('new')
308
self.build_tree(['new/' + fn for fn in files])
309
self.add_helper(self.base_tree, '', new_tree, ['new'])
312
base_file_id = self.base_tree.path2id(fn)
313
new_file_id = new_tree.path2id(fn)
314
self.assertEqual(base_file_id, new_file_id)
316
def test_copy_from_dir(self):
317
self.make_base_tree()
318
new_tree = self.make_branch_and_tree('new')
320
self.build_tree(['new/a', 'new/b', 'new/c',
321
'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
322
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
324
# We 'a' and 'b' exist in the root, and they are being added
325
# in a new 'root'. Since ROOT ids are not unique, we will
327
# TODO: This will probably change once trees have a unique root id
328
# It is definitely arguable that 'a' should get the id of
329
# 'dir/a' not of 'a'.
330
self.assertEqual(self.base_tree.path2id('a'),
331
new_tree.path2id('a'))
332
self.assertEqual(self.base_tree.path2id('b'),
333
new_tree.path2id('b'))
335
# Because we specified 'dir/' as the base path, and we have
336
# nothing named 'subdir' in the base tree, we should grab the
338
self.assertEqual(self.base_tree.path2id('dir/subdir'),
339
new_tree.path2id('subdir'))
340
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
341
new_tree.path2id('subdir/b'))
343
# These should get newly generated ids
344
c_id = new_tree.path2id('c')
345
self.assertNotEqual(None, c_id)
346
self.failIf(c_id in self.base_tree)
348
d_id = new_tree.path2id('subdir/d')
349
self.assertNotEqual(None, d_id)
350
self.failIf(d_id in self.base_tree)
352
def test_copy_existing_dir(self):
353
self.make_base_tree()
354
new_tree = self.make_branch_and_tree('new')
355
self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
357
subdir_file_id = self.base_tree.path2id('dir/subdir')
358
new_tree.add(['subby'], [subdir_file_id])
359
self.add_helper(self.base_tree, '', new_tree, ['new'])
360
# Because 'subby' already points to subdir, we should add
361
# 'b' with the same id
362
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
363
new_tree.path2id('subby/b'))
365
# 'subby/a' should be added with a new id because there is no
366
# matching path or child of 'subby'.
367
a_id = new_tree.path2id('subby/a')
368
self.assertNotEqual(None, a_id)
369
self.failIf(a_id in self.base_tree)
372
class TestAddNonNormalized(TestCaseWithTransport):
376
self.build_tree([u'a\u030a'])
378
raise TestSkipped('Filesystem cannot create unicode filenames')
380
self.wt = self.make_branch_and_tree('.')
382
def test_accessible_explicit(self):
384
orig = osutils.normalized_filename
385
osutils.normalized_filename = osutils._accessible_normalized_filename
387
smart_add_tree(self.wt, [u'a\u030a'])
388
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
389
[(path, ie.kind) for path,ie in
390
self.wt.inventory.iter_entries()])
392
osutils.normalized_filename = orig
394
def test_accessible_implicit(self):
396
orig = osutils.normalized_filename
397
osutils.normalized_filename = osutils._accessible_normalized_filename
399
smart_add_tree(self.wt, [])
400
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
401
[(path, ie.kind) for path,ie in
402
self.wt.inventory.iter_entries()])
404
osutils.normalized_filename = orig
406
def test_inaccessible_explicit(self):
408
orig = osutils.normalized_filename
409
osutils.normalized_filename = osutils._inaccessible_normalized_filename
411
self.assertRaises(errors.InvalidNormalization,
412
smart_add_tree, self.wt, [u'a\u030a'])
414
osutils.normalized_filename = orig
416
def test_inaccessible_implicit(self):
418
orig = osutils.normalized_filename
419
osutils.normalized_filename = osutils._inaccessible_normalized_filename
421
# TODO: jam 20060701 In the future, this should probably
422
# just ignore files that don't fit the normalization
423
# rules, rather than exploding
424
self.assertRaises(errors.InvalidNormalization,
425
smart_add_tree, self.wt, [])
427
osutils.normalized_filename = orig
430
class TestAddActions(TestCase):
432
def test_quiet(self):
435
def test__print(self):
436
self.run_action("added path\n")
438
def run_action(self, output):
439
from bzrlib.add import AddAction, FastPath
142
self.assertNotEqual(branch.inventory.path2id(path), None)
144
class TestAddCallbacks(TestCaseInTempDir):
147
super(TestAddCallbacks, self).setUp()
148
self.entry = InventoryFile("id", "name", 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
441
157
stdout = StringIO()
442
action = AddAction(to_file=stdout, should_print=bool(output))
444
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
445
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
