1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import StringIO
21
from bzrlib import errors, ignores, osutils
22
from bzrlib.add import (
28
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
29
from bzrlib.errors import NoSuchFile
30
from bzrlib.inventory import InventoryFile, Inventory
31
from bzrlib.workingtree import WorkingTree
34
class TestSmartAdd(TestCaseWithTransport):
36
def test_add_dot_from_root(self):
37
"""Test adding . from the root of the tree."""
38
from bzrlib.add import smart_add
39
paths = ("original/", "original/file1", "original/file2")
40
self.build_tree(paths)
41
wt = self.make_branch_and_tree('.')
42
smart_add_tree(wt, (u".",))
44
self.assertNotEqual(wt.path2id(path), None)
46
def test_add_dot_from_subdir(self):
47
"""Test adding . from a subdir of the tree."""
48
from bzrlib.add import smart_add
49
paths = ("original/", "original/file1", "original/file2")
50
self.build_tree(paths)
51
wt = self.make_branch_and_tree('.')
53
smart_add_tree(wt, (u".",))
55
self.assertNotEqual(wt.path2id(path), None)
57
def test_add_tree_from_above_tree(self):
58
"""Test adding a tree from above the tree."""
59
from bzrlib.add import smart_add
60
paths = ("original/", "original/file1", "original/file2")
61
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
62
"branch/original/file2")
63
self.build_tree(branch_paths)
64
wt = self.make_branch_and_tree('branch')
65
smart_add_tree(wt, ("branch",))
67
self.assertNotEqual(wt.path2id(path), None)
69
def test_add_above_tree_preserves_tree(self):
70
"""Test nested trees are not affect by an add above them."""
71
from bzrlib.add import smart_add
72
paths = ("original/", "original/file1", "original/file2")
73
child_paths = ("path",)
74
full_child_paths = ("original/child", "original/child/path")
75
build_paths = ("original/", "original/file1", "original/file2",
76
"original/child/", "original/child/path")
78
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, (".",))
83
self.assertNotEqual((path, wt.path2id(path)),
85
for path in full_child_paths:
86
self.assertEqual((path, wt.path2id(path)),
88
for path in child_paths:
89
self.assertEqual(child_tree.path2id(path), None)
91
def test_add_paths(self):
92
"""Test smart-adding a list of paths."""
93
from bzrlib.add import smart_add
94
paths = ("file1", "file2")
95
self.build_tree(paths)
96
wt = self.make_branch_and_tree('.')
97
smart_add_tree(wt, paths)
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.assertEqual(wt.path2id('file'), None)
119
def test_add_dry_run(self):
120
"""Test a dry run add, make sure nothing is added."""
121
from bzrlib.commands import run_bzr
122
eq = self.assertEqual
123
wt = self.make_branch_and_tree('.')
124
self.build_tree(['inertiatic/', 'inertiatic/esp'])
125
eq(list(wt.unknowns()), ['inertiatic'])
126
self.capture('add --dry-run .')
127
eq(list(wt.unknowns()), ['inertiatic'])
129
def test_add_non_existant(self):
130
"""Test smart-adding a file that does not exist."""
131
from bzrlib.add import smart_add
132
wt = self.make_branch_and_tree('.')
133
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
135
def test_returns_and_ignores(self):
136
"""Correctly returns added/ignored files"""
137
from bzrlib.commands import run_bzr
138
wt = self.make_branch_and_tree('.')
139
# The default ignore list includes '*.py[co]', but not CVS
140
ignores._set_user_ignores(['*.py[co]'])
141
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
142
'inertiatic/foo.pyc'])
143
added, ignored = smart_add_tree(wt, u'.')
144
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
146
self.assertSubset(('*.py[co]',), ignored)
147
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
150
class AddCustomIDAction(AddAction):
152
def __call__(self, inv, parent_ie, path, kind):
153
# The first part just logs if appropriate
154
# Now generate a custom id
155
file_id = kind + '-' + path.raw_path.replace('/', '%')
156
if self.should_print:
157
self._to_file.write('added %s with id %s\n'
158
% (path.raw_path, file_id))
162
class TestSmartAddTree(TestCaseWithTransport):
163
"""Test smart adds with a specified branch."""
165
def test_add_dot_from_root(self):
166
"""Test adding . from the root of the tree."""
167
paths = ("original/", "original/file1", "original/file2")
168
self.build_tree(paths)
169
wt = self.make_branch_and_tree('.')
170
smart_add_tree(wt, (u".",))
172
self.assertNotEqual(wt.path2id(path), None)
174
def test_add_dot_from_subdir(self):
175
"""Test adding . from a subdir of the tree."""
176
paths = ("original/", "original/file1", "original/file2")
177
self.build_tree(paths)
178
wt = self.make_branch_and_tree('.')
180
smart_add_tree(wt, (u".",))
182
self.assertNotEqual(wt.path2id(path), None)
184
def test_add_tree_from_above_tree(self):
185
"""Test adding a tree from above the tree."""
186
paths = ("original/", "original/file1", "original/file2")
187
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
188
"branch/original/file2")
189
self.build_tree(branch_paths)
190
tree = self.make_branch_and_tree('branch')
191
smart_add_tree(tree, ("branch",))
193
self.assertNotEqual(tree.path2id(path), None)
195
def test_add_above_tree_preserves_tree(self):
196
"""Test nested trees are not affect by an add above them."""
197
paths = ("original/", "original/file1", "original/file2")
198
child_paths = ("path")
199
full_child_paths = ("original/child", "original/child/path")
200
build_paths = ("original/", "original/file1", "original/file2",
201
"original/child/", "original/child/path")
202
self.build_tree(build_paths)
203
tree = self.make_branch_and_tree('.')
204
child_tree = self.make_branch_and_tree("original/child")
205
smart_add_tree(tree, (u".",))
207
self.assertNotEqual((path, tree.path2id(path)),
209
for path in full_child_paths:
210
self.assertEqual((path, tree.path2id(path)),
212
for path in child_paths:
213
self.assertEqual(child_tree.path2id(path), None)
215
def test_add_paths(self):
216
"""Test smart-adding a list of paths."""
217
paths = ("file1", "file2")
218
self.build_tree(paths)
219
wt = self.make_branch_and_tree('.')
220
smart_add_tree(wt, paths)
222
self.assertNotEqual(wt.path2id(path), None)
224
def test_add_multiple_dirs(self):
225
"""Test smart adding multiple directories at once."""
226
added_paths = ['file1', 'file2',
227
'dir1/', 'dir1/file3',
228
'dir1/subdir2/', 'dir1/subdir2/file4',
229
'dir2/', 'dir2/file5',
231
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
232
self.build_tree(added_paths)
233
self.build_tree(not_added)
235
wt = self.make_branch_and_tree('.')
236
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
238
for path in added_paths:
239
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
240
'Failed to add path: %s' % (path,))
241
for path in not_added:
242
self.assertEqual(None, wt.path2id(path.rstrip('/')),
243
'Accidentally added path: %s' % (path,))
245
def test_custom_ids(self):
247
action = AddCustomIDAction(to_file=sio, should_print=True)
248
self.build_tree(['file1', 'dir1/', 'dir1/file2'])
250
wt = self.make_branch_and_tree('.')
251
smart_add_tree(wt, ['.'], action=action)
252
# The order of adds is not strictly fixed:
254
lines = sorted(sio.readlines())
255
self.assertEqualDiff(['added dir1 with id directory-dir1\n',
256
'added dir1/file2 with id file-dir1%file2\n',
257
'added file1 with id file-file1\n',
260
self.addCleanup(wt.unlock)
261
self.assertEqual([('', wt.path2id('')),
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
new_tree.set_root_id(self.base_tree.get_root_id())
323
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
325
# We know 'a' and 'b' exist in the root, and they are being added
326
# in a new 'root'. Since ROOT ids have been set as the same, we will
328
self.assertEqual(self.base_tree.path2id('a'),
329
new_tree.path2id('a'))
330
self.assertEqual(self.base_tree.path2id('b'),
331
new_tree.path2id('b'))
333
# Because we specified 'dir/' as the base path, and we have
334
# nothing named 'subdir' in the base tree, we should grab the
336
self.assertEqual(self.base_tree.path2id('dir/subdir'),
337
new_tree.path2id('subdir'))
338
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
339
new_tree.path2id('subdir/b'))
341
# These should get newly generated ids
342
c_id = new_tree.path2id('c')
343
self.assertNotEqual(None, c_id)
344
self.base_tree.lock_read()
345
self.addCleanup(self.base_tree.unlock)
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.base_tree.lock_read()
370
self.addCleanup(self.base_tree.unlock)
371
self.failIf(a_id in self.base_tree)
374
class TestAddNonNormalized(TestCaseWithTransport):
378
self.build_tree([u'a\u030a'])
380
raise TestSkipped('Filesystem cannot create unicode filenames')
382
self.wt = self.make_branch_and_tree('.')
384
def test_accessible_explicit(self):
386
orig = osutils.normalized_filename
387
osutils.normalized_filename = osutils._accessible_normalized_filename
389
smart_add_tree(self.wt, [u'a\u030a'])
391
self.addCleanup(self.wt.unlock)
392
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
393
[(path, ie.kind) for path,ie in
394
self.wt.inventory.iter_entries()])
396
osutils.normalized_filename = orig
398
def test_accessible_implicit(self):
400
orig = osutils.normalized_filename
401
osutils.normalized_filename = osutils._accessible_normalized_filename
403
smart_add_tree(self.wt, [])
405
self.addCleanup(self.wt.unlock)
406
self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
407
[(path, ie.kind) for path,ie in
408
self.wt.inventory.iter_entries()])
410
osutils.normalized_filename = orig
412
def test_inaccessible_explicit(self):
414
orig = osutils.normalized_filename
415
osutils.normalized_filename = osutils._inaccessible_normalized_filename
417
self.assertRaises(errors.InvalidNormalization,
418
smart_add_tree, self.wt, [u'a\u030a'])
420
osutils.normalized_filename = orig
422
def test_inaccessible_implicit(self):
424
orig = osutils.normalized_filename
425
osutils.normalized_filename = osutils._inaccessible_normalized_filename
427
# TODO: jam 20060701 In the future, this should probably
428
# just ignore files that don't fit the normalization
429
# rules, rather than exploding
430
self.assertRaises(errors.InvalidNormalization,
431
smart_add_tree, self.wt, [])
433
osutils.normalized_filename = orig
436
class TestAddActions(TestCase):
438
def test_quiet(self):
441
def test__print(self):
442
self.run_action("added path\n")
444
def run_action(self, output):
445
from bzrlib.add import AddAction, FastPath
448
action = AddAction(to_file=stdout, should_print=bool(output))
450
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
451
self.assertEqual(stdout.getvalue(), output)
added
removed
bzrlib/tests/test_smart_add.py
