1
# Copyright (C) 2005, 2006, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from cStringIO import StringIO
19
from bzrlib import osutils
20
from bzrlib.add import (
24
from bzrlib.tests import TestCase, TestCaseWithTransport
25
from bzrlib.inventory import Inventory
28
class AddCustomIDAction(AddAction):
30
def __call__(self, inv, parent_ie, path, kind):
31
# The first part just logs if appropriate
32
# Now generate a custom id
33
file_id = osutils.safe_file_id(kind + '-'
34
+ path.raw_path.replace('/', '%'),
37
self._to_file.write('added %s with id %s\n'
38
% (path.raw_path, file_id))
42
class TestAddFrom(TestCaseWithTransport):
43
"""Tests for AddFromBaseAction"""
45
def make_base_tree(self):
46
self.base_tree = self.make_branch_and_tree('base')
47
self.build_tree(['base/a', 'base/b',
48
'base/dir/', 'base/dir/a',
52
self.base_tree.add(['a', 'b', 'dir', 'dir/a',
53
'dir/subdir', 'dir/subdir/b'])
54
self.base_tree.commit('creating initial tree.')
56
def add_helper(self, base_tree, base_path, new_tree, file_list,
63
action = AddFromBaseAction(base_tree, base_path,
65
should_print=should_print)
66
new_tree.smart_add(file_list, action=action)
71
return to_file.getvalue()
73
def test_copy_all(self):
75
new_tree = self.make_branch_and_tree('new')
81
self.build_tree(['new/' + fn for fn in files])
82
self.add_helper(self.base_tree, '', new_tree, ['new'])
85
base_file_id = self.base_tree.path2id(fn)
86
new_file_id = new_tree.path2id(fn)
87
self.assertEqual(base_file_id, new_file_id)
89
def test_copy_from_dir(self):
91
new_tree = self.make_branch_and_tree('new')
93
self.build_tree(['new/a', 'new/b', 'new/c',
94
'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
95
new_tree.set_root_id(self.base_tree.get_root_id())
96
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
98
# We know 'a' and 'b' exist in the root, and they are being added
99
# in a new 'root'. Since ROOT ids have been set as the same, we will
101
self.assertEqual(self.base_tree.path2id('a'),
102
new_tree.path2id('a'))
103
self.assertEqual(self.base_tree.path2id('b'),
104
new_tree.path2id('b'))
106
# Because we specified 'dir/' as the base path, and we have
107
# nothing named 'subdir' in the base tree, we should grab the
109
self.assertEqual(self.base_tree.path2id('dir/subdir'),
110
new_tree.path2id('subdir'))
111
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
112
new_tree.path2id('subdir/b'))
114
# These should get newly generated ids
115
c_id = new_tree.path2id('c')
116
self.assertNotEqual(None, c_id)
117
self.base_tree.lock_read()
118
self.addCleanup(self.base_tree.unlock)
119
self.failIf(c_id in self.base_tree)
121
d_id = new_tree.path2id('subdir/d')
122
self.assertNotEqual(None, d_id)
123
self.failIf(d_id in self.base_tree)
125
def test_copy_existing_dir(self):
126
self.make_base_tree()
127
new_tree = self.make_branch_and_tree('new')
128
self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
130
subdir_file_id = self.base_tree.path2id('dir/subdir')
131
new_tree.add(['subby'], [subdir_file_id])
132
self.add_helper(self.base_tree, '', new_tree, ['new'])
133
# Because 'subby' already points to subdir, we should add
134
# 'b' with the same id
135
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
136
new_tree.path2id('subby/b'))
138
# 'subby/a' should be added with a new id because there is no
139
# matching path or child of 'subby'.
140
a_id = new_tree.path2id('subby/a')
141
self.assertNotEqual(None, a_id)
142
self.base_tree.lock_read()
143
self.addCleanup(self.base_tree.unlock)
144
self.failIf(a_id in self.base_tree)
4
from bzrlib import errors, ignores, osutils
5
from bzrlib.add import smart_add, smart_add_tree
6
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
7
from bzrlib.errors import NoSuchFile
8
from bzrlib.inventory import InventoryFile, Inventory
9
from bzrlib.workingtree import WorkingTree
12
class TestSmartAdd(TestCaseWithTransport):
14
def test_add_dot_from_root(self):
15
"""Test adding . from the root of the tree."""
16
from bzrlib.add import smart_add
17
paths = ("original/", "original/file1", "original/file2")
18
self.build_tree(paths)
19
wt = self.make_branch_and_tree('.')
20
smart_add_tree(wt, (u".",))
22
self.assertNotEqual(wt.path2id(path), None)
24
def test_add_dot_from_subdir(self):
25
"""Test adding . from a subdir of the tree."""
26
from bzrlib.add import smart_add
27
paths = ("original/", "original/file1", "original/file2")
28
self.build_tree(paths)
29
wt = self.make_branch_and_tree('.')
31
smart_add_tree(wt, (u".",))
33
self.assertNotEqual(wt.path2id(path), None)
35
def test_add_tree_from_above_tree(self):
36
"""Test adding a tree from above the tree."""
37
from bzrlib.add import smart_add
38
paths = ("original/", "original/file1", "original/file2")
39
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
40
"branch/original/file2")
41
self.build_tree(branch_paths)
42
wt = self.make_branch_and_tree('branch')
43
smart_add_tree(wt, ("branch",))
45
self.assertNotEqual(wt.path2id(path), None)
47
def test_add_above_tree_preserves_tree(self):
48
"""Test nested trees are not affect by an add above them."""
49
from bzrlib.add import smart_add
50
paths = ("original/", "original/file1", "original/file2")
51
child_paths = ("path",)
52
full_child_paths = ("original/child", "original/child/path")
53
build_paths = ("original/", "original/file1", "original/file2",
54
"original/child/", "original/child/path")
56
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, (".",))
61
self.assertNotEqual((path, wt.path2id(path)),
63
for path in full_child_paths:
64
self.assertEqual((path, wt.path2id(path)),
66
for path in child_paths:
67
self.assertEqual(child_tree.path2id(path), None)
69
def test_add_paths(self):
70
"""Test smart-adding a list of paths."""
71
from bzrlib.add import smart_add
72
paths = ("file1", "file2")
73
self.build_tree(paths)
74
wt = self.make_branch_and_tree('.')
75
smart_add_tree(wt, paths)
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):
132
"""Test smart adds with a specified branch."""
134
def test_add_dot_from_root(self):
135
"""Test adding . from the root of the tree."""
136
paths = ("original/", "original/file1", "original/file2")
137
self.build_tree(paths)
138
wt = self.make_branch_and_tree('.')
139
smart_add_tree(wt, (u".",))
141
self.assertNotEqual(wt.path2id(path), None)
143
def test_add_dot_from_subdir(self):
144
"""Test adding . from a subdir of the tree."""
145
paths = ("original/", "original/file1", "original/file2")
146
self.build_tree(paths)
147
wt = self.make_branch_and_tree('.')
149
smart_add_tree(wt, (u".",))
151
self.assertNotEqual(wt.path2id(path), None)
153
def test_add_tree_from_above_tree(self):
154
"""Test adding a tree from above the tree."""
155
paths = ("original/", "original/file1", "original/file2")
156
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
157
"branch/original/file2")
158
self.build_tree(branch_paths)
159
tree = self.make_branch_and_tree('branch')
160
smart_add_tree(tree, ("branch",))
162
self.assertNotEqual(tree.path2id(path), None)
164
def test_add_above_tree_preserves_tree(self):
165
"""Test nested trees are not affect by an add above them."""
166
paths = ("original/", "original/file1", "original/file2")
167
child_paths = ("path")
168
full_child_paths = ("original/child", "original/child/path")
169
build_paths = ("original/", "original/file1", "original/file2",
170
"original/child/", "original/child/path")
171
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".",))
176
self.assertNotEqual((path, tree.path2id(path)),
178
for path in full_child_paths:
179
self.assertEqual((path, tree.path2id(path)),
181
for path in child_paths:
182
self.assertEqual(child_tree.path2id(path), None)
184
def test_add_paths(self):
185
"""Test smart-adding a list of paths."""
186
paths = ("file1", "file2")
187
self.build_tree(paths)
188
wt = self.make_branch_and_tree('.')
189
smart_add_tree(wt, 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([('', '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([('', '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
147
273
class TestAddActions(TestCase):
added
removed
bzrlib/tests/test_smart_add.py
