1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
|
import os
import unittest
from bzrlib import errors, ignores, osutils
from bzrlib.add import smart_add, smart_add_tree
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
from bzrlib.errors import NoSuchFile
from bzrlib.inventory import InventoryFile, Inventory
from bzrlib.workingtree import WorkingTree
class TestSmartAdd(TestCaseWithTransport):
def test_add_dot_from_root(self):
"""Test adding . from the root of the tree."""
from bzrlib.add import smart_add
paths = ("original/", "original/file1", "original/file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
smart_add_tree(wt, (u".",))
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_dot_from_subdir(self):
"""Test adding . from a subdir of the tree."""
from bzrlib.add import smart_add
paths = ("original/", "original/file1", "original/file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
os.chdir("original")
smart_add_tree(wt, (u".",))
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_tree_from_above_tree(self):
"""Test adding a tree from above the tree."""
from bzrlib.add import smart_add
paths = ("original/", "original/file1", "original/file2")
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
"branch/original/file2")
self.build_tree(branch_paths)
wt = self.make_branch_and_tree('branch')
smart_add_tree(wt, ("branch",))
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_above_tree_preserves_tree(self):
"""Test nested trees are not affect by an add above them."""
from bzrlib.add import smart_add
paths = ("original/", "original/file1", "original/file2")
child_paths = ("path",)
full_child_paths = ("original/child", "original/child/path")
build_paths = ("original/", "original/file1", "original/file2",
"original/child/", "original/child/path")
self.build_tree(build_paths)
wt = self.make_branch_and_tree('.')
child_tree = self.make_branch_and_tree('original/child')
smart_add_tree(wt, (".",))
for path in paths:
self.assertNotEqual((path, wt.path2id(path)),
(path, None))
for path in full_child_paths:
self.assertEqual((path, wt.path2id(path)),
(path, None))
for path in child_paths:
self.assertEqual(child_tree.path2id(path), None)
def test_add_paths(self):
"""Test smart-adding a list of paths."""
from bzrlib.add import smart_add
paths = ("file1", "file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
smart_add_tree(wt, paths)
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_ignored_nested_paths(self):
"""Test smart-adding a list of paths which includes ignored ones."""
wt = self.make_branch_and_tree('.')
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
self.build_tree(tree_shape)
smart_add_tree(wt, add_paths)
for path in expected_paths:
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
def test_save_false(self):
"""Test smart-adding a path with save set to false."""
wt = self.make_branch_and_tree('.')
self.build_tree(['file'])
smart_add_tree(wt, ['file'], save=False)
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
wt.read_working_inventory()
self.assertEqual(wt.path2id('file'), None)
def test_add_dry_run(self):
"""Test a dry run add, make sure nothing is added."""
from bzrlib.commands import run_bzr
ignores._set_user_ignores(['./.bazaar'])
eq = self.assertEqual
wt = self.make_branch_and_tree('.')
self.build_tree(['inertiatic/', 'inertiatic/esp'])
eq(list(wt.unknowns()), ['inertiatic'])
self.capture('add --dry-run .')
eq(list(wt.unknowns()), ['inertiatic'])
def test_add_non_existant(self):
"""Test smart-adding a file that does not exist."""
from bzrlib.add import smart_add
wt = self.make_branch_and_tree('.')
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
def test_returns_and_ignores(self):
"""Correctly returns added/ignored files"""
from bzrlib.commands import run_bzr
wt = self.make_branch_and_tree('.')
# The default ignore list includes '*.py[co]', but not CVS
ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
'inertiatic/foo.pyc'])
added, ignored = smart_add_tree(wt, u'.')
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
added)
self.assertSubset(('*.py[co]',), ignored)
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
class TestSmartAddTree(TestCaseWithTransport):
"""Test smart adds with a specified branch."""
def test_add_dot_from_root(self):
"""Test adding . from the root of the tree."""
paths = ("original/", "original/file1", "original/file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
smart_add_tree(wt, (u".",))
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_dot_from_subdir(self):
"""Test adding . from a subdir of the tree."""
paths = ("original/", "original/file1", "original/file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
os.chdir("original")
smart_add_tree(wt, (u".",))
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_tree_from_above_tree(self):
"""Test adding a tree from above the tree."""
paths = ("original/", "original/file1", "original/file2")
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
"branch/original/file2")
self.build_tree(branch_paths)
tree = self.make_branch_and_tree('branch')
smart_add_tree(tree, ("branch",))
for path in paths:
self.assertNotEqual(tree.path2id(path), None)
def test_add_above_tree_preserves_tree(self):
"""Test nested trees are not affect by an add above them."""
paths = ("original/", "original/file1", "original/file2")
child_paths = ("path")
full_child_paths = ("original/child", "original/child/path")
build_paths = ("original/", "original/file1", "original/file2",
"original/child/", "original/child/path")
self.build_tree(build_paths)
tree = self.make_branch_and_tree('.')
child_tree = self.make_branch_and_tree("original/child")
smart_add_tree(tree, (u".",))
for path in paths:
self.assertNotEqual((path, tree.path2id(path)),
(path, None))
for path in full_child_paths:
self.assertEqual((path, tree.path2id(path)),
(path, None))
for path in child_paths:
self.assertEqual(child_tree.path2id(path), None)
def test_add_paths(self):
"""Test smart-adding a list of paths."""
paths = ("file1", "file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
smart_add_tree(wt, paths)
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_multiple_dirs(self):
"""Test smart adding multiple directories at once."""
added_paths = ['file1', 'file2',
'dir1/', 'dir1/file3',
'dir1/subdir2/', 'dir1/subdir2/file4',
'dir2/', 'dir2/file5',
]
not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
self.build_tree(added_paths)
self.build_tree(not_added)
wt = self.make_branch_and_tree('.')
smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
for path in added_paths:
self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
'Failed to add path: %s' % (path,))
for path in not_added:
self.assertEqual(None, wt.path2id(path.rstrip('/')),
'Accidentally added path: %s' % (path,))
class TestAddNonNormalized(TestCaseWithTransport):
def make(self):
try:
self.build_tree([u'a\u030a'])
except UnicodeError:
raise TestSkipped('Filesystem cannot create unicode filenames')
self.wt = self.make_branch_and_tree('.')
def test_accessible_explicit(self):
self.make()
orig = osutils.normalized_filename
osutils.normalized_filename = osutils._accessible_normalized_filename
try:
smart_add_tree(self.wt, [u'a\u030a'])
self.assertEqual([(u'\xe5', 'file')],
[(path, ie.kind) for path,ie in
self.wt.inventory.iter_entries()])
finally:
osutils.normalized_filename = orig
def test_accessible_implicit(self):
self.make()
orig = osutils.normalized_filename
osutils.normalized_filename = osutils._accessible_normalized_filename
try:
smart_add_tree(self.wt, [])
self.assertEqual([(u'\xe5', 'file')],
[(path, ie.kind) for path,ie in
self.wt.inventory.iter_entries()])
finally:
osutils.normalized_filename = orig
def test_inaccessible_explicit(self):
self.make()
orig = osutils.normalized_filename
osutils.normalized_filename = osutils._inaccessible_normalized_filename
try:
self.assertRaises(errors.InvalidNormalization,
smart_add_tree, self.wt, [u'a\u030a'])
finally:
osutils.normalized_filename = orig
def test_inaccessible_implicit(self):
self.make()
orig = osutils.normalized_filename
osutils.normalized_filename = osutils._inaccessible_normalized_filename
try:
# TODO: jam 20060701 In the future, this should probably
# just ignore files that don't fit the normalization
# rules, rather than exploding
self.assertRaises(errors.InvalidNormalization,
smart_add_tree, self.wt, [])
finally:
osutils.normalized_filename = orig
class TestAddActions(TestCase):
def test_quiet(self):
self.run_action("")
def test__print(self):
self.run_action("added path\n")
def run_action(self, output):
from bzrlib.add import AddAction, FastPath
from cStringIO import StringIO
inv = Inventory()
stdout = StringIO()
action = AddAction(to_file=stdout, should_print=bool(output))
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
self.assertEqual(stdout.getvalue(), output)
|