54
51
"original/child/", "original/child/path")
56
53
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, (".",))
54
branch = Branch(".", init=True)
55
child_branch = Branch("original/child", init=True)
56
smart_add((".",), True, add_reporter_null)
61
self.assertNotEqual((path, wt.path2id(path)),
58
self.assertNotEqual((path, branch.inventory.path2id(path)),
63
60
for path in full_child_paths:
64
self.assertEqual((path, wt.path2id(path)),
61
self.assertEqual((path, branch.inventory.path2id(path)),
66
63
for path in child_paths:
67
self.assertEqual(child_tree.path2id(path), None)
64
self.assertEqual(child_branch.inventory.path2id(path), None)
69
66
def test_add_paths(self):
70
67
"""Test smart-adding a list of paths."""
71
68
from bzrlib.add import smart_add
72
69
paths = ("file1", "file2")
73
70
self.build_tree(paths)
74
wt = self.make_branch_and_tree('.')
75
smart_add_tree(wt, paths)
71
branch = Branch(".", init=True)
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
eq = self.assertEqual
103
wt = self.make_branch_and_tree('.')
104
self.build_tree(['inertiatic/', 'inertiatic/esp'])
105
eq(list(wt.unknowns()), ['inertiatic'])
106
self.capture('add --dry-run .')
107
eq(list(wt.unknowns()), ['inertiatic'])
109
def test_add_non_existant(self):
110
"""Test smart-adding a file that does not exist."""
111
from bzrlib.add import smart_add
112
wt = self.make_branch_and_tree('.')
113
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
115
def test_returns_and_ignores(self):
116
"""Correctly returns added/ignored files"""
117
from bzrlib.commands import run_bzr
118
wt = self.make_branch_and_tree('.')
119
# no files should be ignored by default, so we need to create
120
# an ignore rule - we create one for the pyc files, which means
121
# CVS should not be ignored.
122
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
123
'inertiatic/foo.pyc'])
124
self.build_tree_contents([('.bzrignore', '*.py[oc]\n')])
125
added, ignored = smart_add_tree(wt, u'.')
126
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
128
self.assertSubset(('*.py[oc]',), ignored)
129
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
132
class TestSmartAddTree(TestCaseWithTransport):
74
self.assertNotEqual(branch.inventory.path2id(path), None)
76
class TestSmartAddBranch(TestCaseInTempDir):
133
77
"""Test smart adds with a specified branch."""
135
79
def test_add_dot_from_root(self):
136
80
"""Test adding . from the root of the tree."""
81
from bzrlib.add import smart_add_branch
137
82
paths = ("original/", "original/file1", "original/file2")
138
83
self.build_tree(paths)
139
wt = self.make_branch_and_tree('.')
140
smart_add_tree(wt, (u".",))
84
branch = Branch(".", init=True)
85
smart_add_branch(branch, (".",))
141
86
for path in paths:
142
self.assertNotEqual(wt.path2id(path), None)
87
self.assertNotEqual(branch.inventory.path2id(path), None)
144
89
def test_add_dot_from_subdir(self):
145
90
"""Test adding . from a subdir of the tree."""
91
from bzrlib.add import smart_add_branch
146
92
paths = ("original/", "original/file1", "original/file2")
147
93
self.build_tree(paths)
148
wt = self.make_branch_and_tree('.')
94
branch = Branch(".", init=True)
149
95
os.chdir("original")
150
smart_add_tree(wt, (u".",))
96
smart_add_branch(branch, (".",))
151
97
for path in paths:
152
self.assertNotEqual(wt.path2id(path), None)
98
self.assertNotEqual(branch.inventory.path2id(path), None)
154
100
def test_add_tree_from_above_tree(self):
155
101
"""Test adding a tree from above the tree."""
102
from bzrlib.add import smart_add_branch
156
103
paths = ("original/", "original/file1", "original/file2")
157
104
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
158
105
"branch/original/file2")
159
106
self.build_tree(branch_paths)
160
tree = self.make_branch_and_tree('branch')
161
smart_add_tree(tree, ("branch",))
107
branch = Branch("branch", init=True)
108
smart_add_branch(branch, ("branch",))
162
109
for path in paths:
163
self.assertNotEqual(tree.path2id(path), None)
110
self.assertNotEqual(branch.inventory.path2id(path), None)
165
112
def test_add_above_tree_preserves_tree(self):
166
113
"""Test nested trees are not affect by an add above them."""
114
from bzrlib.add import smart_add_branch
167
115
paths = ("original/", "original/file1", "original/file2")
168
116
child_paths = ("path")
169
117
full_child_paths = ("original/child", "original/child/path")
170
118
build_paths = ("original/", "original/file1", "original/file2",
171
119
"original/child/", "original/child/path")
172
120
self.build_tree(build_paths)
173
tree = self.make_branch_and_tree('.')
174
child_tree = self.make_branch_and_tree("original/child")
175
smart_add_tree(tree, (u".",))
121
branch = Branch(".", init=True)
122
child_branch = Branch("original/child", init=True)
123
smart_add_branch(branch, (".",))
176
124
for path in paths:
177
self.assertNotEqual((path, tree.path2id(path)),
125
self.assertNotEqual((path, branch.inventory.path2id(path)),
179
127
for path in full_child_paths:
180
self.assertEqual((path, tree.path2id(path)),
128
self.assertEqual((path, branch.inventory.path2id(path)),
182
130
for path in child_paths:
183
self.assertEqual(child_tree.path2id(path), None)
131
self.assertEqual(child_branch.inventory.path2id(path), None)
185
133
def test_add_paths(self):
186
134
"""Test smart-adding a list of paths."""
135
from bzrlib.add import smart_add_branch
187
136
paths = ("file1", "file2")
188
137
self.build_tree(paths)
189
wt = self.make_branch_and_tree('.')
190
smart_add_tree(wt, paths)
138
branch = Branch(".", init=True)
139
smart_add_branch(branch, paths)
191
140
for path in paths:
192
self.assertNotEqual(wt.path2id(path), None)
194
def test_add_multiple_dirs(self):
195
"""Test smart adding multiple directories at once."""
196
added_paths = ['file1', 'file2',
197
'dir1/', 'dir1/file3',
198
'dir1/subdir2/', 'dir1/subdir2/file4',
199
'dir2/', 'dir2/file5',
201
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
202
self.build_tree(added_paths)
203
self.build_tree(not_added)
205
wt = self.make_branch_and_tree('.')
206
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
208
for path in added_paths:
209
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
210
'Failed to add path: %s' % (path,))
211
for path in not_added:
212
self.assertEqual(None, wt.path2id(path.rstrip('/')),
213
'Accidentally added path: %s' % (path,))
216
class TestAddNonNormalized(TestCaseWithTransport):
220
self.build_tree([u'a\u030a'])
222
raise TestSkipped('Filesystem cannot create unicode filenames')
224
self.wt = self.make_branch_and_tree('.')
226
def test_accessible_explicit(self):
228
orig = osutils.normalized_filename
229
osutils.normalized_filename = osutils._accessible_normalized_filename
231
smart_add_tree(self.wt, [u'a\u030a'])
232
self.assertEqual([(u'\xe5', 'file')],
233
[(path, ie.kind) for path,ie in
234
self.wt.inventory.iter_entries()])
236
osutils.normalized_filename = orig
238
def test_accessible_implicit(self):
240
orig = osutils.normalized_filename
241
osutils.normalized_filename = osutils._accessible_normalized_filename
243
smart_add_tree(self.wt, [])
244
self.assertEqual([(u'\xe5', 'file')],
245
[(path, ie.kind) for path,ie in
246
self.wt.inventory.iter_entries()])
248
osutils.normalized_filename = orig
250
def test_inaccessible_explicit(self):
252
orig = osutils.normalized_filename
253
osutils.normalized_filename = osutils._inaccessible_normalized_filename
255
self.assertRaises(errors.InvalidNormalization,
256
smart_add_tree, self.wt, [u'a\u030a'])
258
osutils.normalized_filename = orig
260
def test_inaccessible_implicit(self):
262
orig = osutils.normalized_filename
263
osutils.normalized_filename = osutils._inaccessible_normalized_filename
265
# TODO: jam 20060701 In the future, this should probably
266
# just ignore files that don't fit the normalization
267
# rules, rather than exploding
268
self.assertRaises(errors.InvalidNormalization,
269
smart_add_tree, self.wt, [])
271
osutils.normalized_filename = orig
274
class TestAddActions(TestCase):
276
def test_quiet(self):
279
def test__print(self):
280
self.run_action("added path\n")
282
def run_action(self, output):
283
from bzrlib.add import AddAction, FastPath
284
from cStringIO import StringIO
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
286
157
stdout = StringIO()
287
action = AddAction(to_file=stdout, should_print=bool(output))
289
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
290
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
