54
52
"original/child/", "original/child/path")
56
54
self.build_tree(build_paths)
57
wt = self.make_branch_and_tree('.')
58
child_tree = self.make_branch_and_tree('original/child')
59
smart_add_tree(wt, (".",))
55
branch = Branch.initialize(".")
56
child_branch = Branch.initialize("original/child")
57
smart_add((".",), True, add_reporter_null)
61
self.assertNotEqual((path, wt.path2id(path)),
59
self.assertNotEqual((path, branch.inventory.path2id(path)),
63
61
for path in full_child_paths:
64
self.assertEqual((path, wt.path2id(path)),
62
self.assertEqual((path, branch.inventory.path2id(path)),
66
64
for path in child_paths:
67
self.assertEqual(child_tree.path2id(path), None)
65
self.assertEqual(child_branch.inventory.path2id(path), None)
69
67
def test_add_paths(self):
70
68
"""Test smart-adding a list of paths."""
71
69
from bzrlib.add import smart_add
72
70
paths = ("file1", "file2")
73
71
self.build_tree(paths)
74
wt = self.make_branch_and_tree('.')
75
smart_add_tree(wt, paths)
72
branch = Branch.initialize(".")
77
self.assertNotEqual(wt.path2id(path), None)
79
def test_add_ignored_nested_paths(self):
80
"""Test smart-adding a list of paths which includes ignored ones."""
81
wt = self.make_branch_and_tree('.')
82
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
83
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
84
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
85
self.build_tree(tree_shape)
86
smart_add_tree(wt, add_paths)
87
for path in expected_paths:
88
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
90
def test_save_false(self):
91
"""Test smart-adding a path with save set to false."""
92
wt = self.make_branch_and_tree('.')
93
self.build_tree(['file'])
94
smart_add_tree(wt, ['file'], save=False)
95
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
96
wt.read_working_inventory()
97
self.assertEqual(wt.path2id('file'), None)
99
def test_add_dry_run(self):
100
"""Test a dry run add, make sure nothing is added."""
101
from bzrlib.commands import run_bzr
102
ignores._set_user_ignores(['./.bazaar'])
103
eq = self.assertEqual
104
wt = self.make_branch_and_tree('.')
105
self.build_tree(['inertiatic/', 'inertiatic/esp'])
106
eq(list(wt.unknowns()), ['inertiatic'])
107
self.capture('add --dry-run .')
108
eq(list(wt.unknowns()), ['inertiatic'])
110
def test_add_non_existant(self):
111
"""Test smart-adding a file that does not exist."""
112
from bzrlib.add import smart_add
113
wt = self.make_branch_and_tree('.')
114
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
116
def test_returns_and_ignores(self):
117
"""Correctly returns added/ignored files"""
118
from bzrlib.commands import run_bzr
119
wt = self.make_branch_and_tree('.')
120
# The default ignore list includes '*.py[co]', but not CVS
121
ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
122
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
123
'inertiatic/foo.pyc'])
124
added, ignored = smart_add_tree(wt, u'.')
125
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
127
self.assertSubset(('*.py[co]',), ignored)
128
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
131
class TestSmartAddTree(TestCaseWithTransport):
75
self.assertNotEqual(branch.inventory.path2id(path), None)
77
class TestSmartAddBranch(TestCaseInTempDir):
132
78
"""Test smart adds with a specified branch."""
134
80
def test_add_dot_from_root(self):
135
81
"""Test adding . from the root of the tree."""
82
from bzrlib.add import smart_add_branch
136
83
paths = ("original/", "original/file1", "original/file2")
137
84
self.build_tree(paths)
138
wt = self.make_branch_and_tree('.')
139
smart_add_tree(wt, (u".",))
85
branch = Branch.initialize(".")
86
smart_add_branch(branch, (".",))
140
87
for path in paths:
141
self.assertNotEqual(wt.path2id(path), None)
88
self.assertNotEqual(branch.inventory.path2id(path), None)
143
90
def test_add_dot_from_subdir(self):
144
91
"""Test adding . from a subdir of the tree."""
92
from bzrlib.add import smart_add_branch
145
93
paths = ("original/", "original/file1", "original/file2")
146
94
self.build_tree(paths)
147
wt = self.make_branch_and_tree('.')
95
branch = Branch.initialize(".")
148
96
os.chdir("original")
149
smart_add_tree(wt, (u".",))
97
smart_add_branch(branch, (".",))
150
98
for path in paths:
151
self.assertNotEqual(wt.path2id(path), None)
99
self.assertNotEqual(branch.inventory.path2id(path), None)
153
101
def test_add_tree_from_above_tree(self):
154
102
"""Test adding a tree from above the tree."""
103
from bzrlib.add import smart_add_branch
155
104
paths = ("original/", "original/file1", "original/file2")
156
105
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
157
106
"branch/original/file2")
158
107
self.build_tree(branch_paths)
159
tree = self.make_branch_and_tree('branch')
160
smart_add_tree(tree, ("branch",))
108
branch = Branch.initialize("branch")
109
smart_add_branch(branch, ("branch",))
161
110
for path in paths:
162
self.assertNotEqual(tree.path2id(path), None)
111
self.assertNotEqual(branch.inventory.path2id(path), None)
164
113
def test_add_above_tree_preserves_tree(self):
165
114
"""Test nested trees are not affect by an add above them."""
115
from bzrlib.add import smart_add_branch
166
116
paths = ("original/", "original/file1", "original/file2")
167
117
child_paths = ("path")
168
118
full_child_paths = ("original/child", "original/child/path")
169
119
build_paths = ("original/", "original/file1", "original/file2",
170
120
"original/child/", "original/child/path")
171
121
self.build_tree(build_paths)
172
tree = self.make_branch_and_tree('.')
173
child_tree = self.make_branch_and_tree("original/child")
174
smart_add_tree(tree, (u".",))
122
branch = Branch.initialize(".")
123
child_branch = Branch.initialize("original/child")
124
smart_add_branch(branch, (".",))
175
125
for path in paths:
176
self.assertNotEqual((path, tree.path2id(path)),
126
self.assertNotEqual((path, branch.inventory.path2id(path)),
178
128
for path in full_child_paths:
179
self.assertEqual((path, tree.path2id(path)),
129
self.assertEqual((path, branch.inventory.path2id(path)),
181
131
for path in child_paths:
182
self.assertEqual(child_tree.path2id(path), None)
132
self.assertEqual(child_branch.inventory.path2id(path), None)
184
134
def test_add_paths(self):
185
135
"""Test smart-adding a list of paths."""
136
from bzrlib.add import smart_add_branch
186
137
paths = ("file1", "file2")
187
138
self.build_tree(paths)
188
wt = self.make_branch_and_tree('.')
189
smart_add_tree(wt, paths)
139
branch = Branch.initialize(".")
140
smart_add_branch(branch, paths)
190
141
for path in paths:
191
self.assertNotEqual(wt.path2id(path), None)
193
def test_add_multiple_dirs(self):
194
"""Test smart adding multiple directories at once."""
195
added_paths = ['file1', 'file2',
196
'dir1/', 'dir1/file3',
197
'dir1/subdir2/', 'dir1/subdir2/file4',
198
'dir2/', 'dir2/file5',
200
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
201
self.build_tree(added_paths)
202
self.build_tree(not_added)
204
wt = self.make_branch_and_tree('.')
205
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
207
for path in added_paths:
208
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
209
'Failed to add path: %s' % (path,))
210
for path in not_added:
211
self.assertEqual(None, wt.path2id(path.rstrip('/')),
212
'Accidentally added path: %s' % (path,))
215
class TestAddNonNormalized(TestCaseWithTransport):
219
self.build_tree([u'a\u030a'])
221
raise TestSkipped('Filesystem cannot create unicode filenames')
223
self.wt = self.make_branch_and_tree('.')
225
def test_accessible_explicit(self):
227
orig = osutils.normalized_filename
228
osutils.normalized_filename = osutils._accessible_normalized_filename
230
smart_add_tree(self.wt, [u'a\u030a'])
231
self.assertEqual([('', 'root_directory'), (u'\xe5', 'file')],
232
[(path, ie.kind) for path,ie in
233
self.wt.inventory.iter_entries()])
235
osutils.normalized_filename = orig
237
def test_accessible_implicit(self):
239
orig = osutils.normalized_filename
240
osutils.normalized_filename = osutils._accessible_normalized_filename
242
smart_add_tree(self.wt, [])
243
self.assertEqual([('', 'root_directory'), (u'\xe5', 'file')],
244
[(path, ie.kind) for path,ie in
245
self.wt.inventory.iter_entries()])
247
osutils.normalized_filename = orig
249
def test_inaccessible_explicit(self):
251
orig = osutils.normalized_filename
252
osutils.normalized_filename = osutils._inaccessible_normalized_filename
254
self.assertRaises(errors.InvalidNormalization,
255
smart_add_tree, self.wt, [u'a\u030a'])
257
osutils.normalized_filename = orig
259
def test_inaccessible_implicit(self):
261
orig = osutils.normalized_filename
262
osutils.normalized_filename = osutils._inaccessible_normalized_filename
264
# TODO: jam 20060701 In the future, this should probably
265
# just ignore files that don't fit the normalization
266
# rules, rather than exploding
267
self.assertRaises(errors.InvalidNormalization,
268
smart_add_tree, self.wt, [])
270
osutils.normalized_filename = orig
273
class TestAddActions(TestCase):
275
def test_quiet(self):
278
def test__print(self):
279
self.run_action("added path\n")
281
def run_action(self, output):
282
from bzrlib.add import AddAction, FastPath
283
from cStringIO import StringIO
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
285
157
stdout = StringIO()
286
action = AddAction(to_file=stdout, should_print=bool(output))
288
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
289
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
