1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 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
27
class AddCustomIDAction(add.AddAction):
29
def __call__(self, inv, parent_ie, path, kind):
30
# The first part just logs if appropriate
31
# Now generate a custom id
32
file_id = osutils.safe_file_id(kind + '-'
33
+ path.raw_path.replace('/', '%'),
36
self._to_file.write('added %s with id %s\n'
37
% (path.raw_path, file_id))
41
class TestAddFrom(tests.TestCaseWithTransport):
42
"""Tests for AddFromBaseAction"""
44
def make_base_tree(self):
45
self.base_tree = self.make_branch_and_tree('base')
46
self.build_tree(['base/a', 'base/b',
47
'base/dir/', 'base/dir/a',
51
self.base_tree.add(['a', 'b', 'dir', 'dir/a',
52
'dir/subdir', 'dir/subdir/b'])
53
self.base_tree.commit('creating initial tree.')
55
def add_helper(self, base_tree, base_path, new_tree, file_list,
62
action = add.AddFromBaseAction(base_tree, base_path,
64
should_print=should_print)
65
new_tree.smart_add(file_list, action=action)
70
return to_file.getvalue()
72
def test_copy_all(self):
74
new_tree = self.make_branch_and_tree('new')
80
self.build_tree(['new/' + fn for fn in files])
81
self.add_helper(self.base_tree, '', new_tree, ['new'])
84
base_file_id = self.base_tree.path2id(fn)
85
new_file_id = new_tree.path2id(fn)
86
self.assertEqual(base_file_id, new_file_id)
88
def test_copy_from_dir(self):
90
new_tree = self.make_branch_and_tree('new')
92
self.build_tree(['new/a', 'new/b', 'new/c',
93
'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
94
new_tree.set_root_id(self.base_tree.get_root_id())
95
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
97
# We know 'a' and 'b' exist in the root, and they are being added
98
# in a new 'root'. Since ROOT ids have been set as the same, we will
100
self.assertEqual(self.base_tree.path2id('a'),
101
new_tree.path2id('a'))
102
self.assertEqual(self.base_tree.path2id('b'),
103
new_tree.path2id('b'))
105
# Because we specified 'dir/' as the base path, and we have
106
# nothing named 'subdir' in the base tree, we should grab the
108
self.assertEqual(self.base_tree.path2id('dir/subdir'),
109
new_tree.path2id('subdir'))
110
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
111
new_tree.path2id('subdir/b'))
113
# These should get newly generated ids
114
c_id = new_tree.path2id('c')
115
self.assertNotEqual(None, c_id)
116
self.base_tree.lock_read()
117
self.addCleanup(self.base_tree.unlock)
118
self.failIf(c_id in self.base_tree)
120
d_id = new_tree.path2id('subdir/d')
121
self.assertNotEqual(None, d_id)
122
self.failIf(d_id in self.base_tree)
124
def test_copy_existing_dir(self):
125
self.make_base_tree()
126
new_tree = self.make_branch_and_tree('new')
127
self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
129
subdir_file_id = self.base_tree.path2id('dir/subdir')
130
new_tree.add(['subby'], [subdir_file_id])
131
self.add_helper(self.base_tree, '', new_tree, ['new'])
132
# Because 'subby' already points to subdir, we should add
133
# 'b' with the same id
134
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
135
new_tree.path2id('subby/b'))
137
# 'subby/a' should be added with a new id because there is no
138
# matching path or child of 'subby'.
139
a_id = new_tree.path2id('subby/a')
140
self.assertNotEqual(None, a_id)
141
self.base_tree.lock_read()
142
self.addCleanup(self.base_tree.unlock)
143
self.failIf(a_id in self.base_tree)
146
class TestAddActions(tests.TestCase):
4
from bzrlib import errors, 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
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):
133
"""Test smart adds with a specified branch."""
135
def test_add_dot_from_root(self):
136
"""Test adding . from the root of the tree."""
137
paths = ("original/", "original/file1", "original/file2")
138
self.build_tree(paths)
139
wt = self.make_branch_and_tree('.')
140
smart_add_tree(wt, (u".",))
142
self.assertNotEqual(wt.path2id(path), None)
144
def test_add_dot_from_subdir(self):
145
"""Test adding . from a subdir of the tree."""
146
paths = ("original/", "original/file1", "original/file2")
147
self.build_tree(paths)
148
wt = self.make_branch_and_tree('.')
150
smart_add_tree(wt, (u".",))
152
self.assertNotEqual(wt.path2id(path), None)
154
def test_add_tree_from_above_tree(self):
155
"""Test adding a tree from above the tree."""
156
paths = ("original/", "original/file1", "original/file2")
157
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
158
"branch/original/file2")
159
self.build_tree(branch_paths)
160
tree = self.make_branch_and_tree('branch')
161
smart_add_tree(tree, ("branch",))
163
self.assertNotEqual(tree.path2id(path), None)
165
def test_add_above_tree_preserves_tree(self):
166
"""Test nested trees are not affect by an add above them."""
167
paths = ("original/", "original/file1", "original/file2")
168
child_paths = ("path")
169
full_child_paths = ("original/child", "original/child/path")
170
build_paths = ("original/", "original/file1", "original/file2",
171
"original/child/", "original/child/path")
172
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".",))
177
self.assertNotEqual((path, tree.path2id(path)),
179
for path in full_child_paths:
180
self.assertEqual((path, tree.path2id(path)),
182
for path in child_paths:
183
self.assertEqual(child_tree.path2id(path), None)
185
def test_add_paths(self):
186
"""Test smart-adding a list of paths."""
187
paths = ("file1", "file2")
188
self.build_tree(paths)
189
wt = self.make_branch_and_tree('.')
190
smart_add_tree(wt, paths)
192
self.assertNotEqual(wt.path2id(path), None)
195
class TestAddNonNormalized(TestCaseWithTransport):
199
self.build_tree([u'a\u030a'])
201
raise TestSkipped('Filesystem cannot create unicode filenames')
203
self.wt = self.make_branch_and_tree('.')
205
def test_accessible_explicit(self):
207
orig = osutils.normalized_filename
208
osutils.normalized_filename = osutils._accessible_normalized_filename
210
smart_add_tree(self.wt, [u'a\u030a'])
211
self.assertEqual([(u'\xe5', 'file')],
212
[(path, ie.kind) for path,ie in
213
self.wt.inventory.iter_entries()])
215
osutils.normalized_filename = orig
217
def test_accessible_implicit(self):
219
orig = osutils.normalized_filename
220
osutils.normalized_filename = osutils._accessible_normalized_filename
222
smart_add_tree(self.wt, [])
223
self.assertEqual([(u'\xe5', 'file')],
224
[(path, ie.kind) for path,ie in
225
self.wt.inventory.iter_entries()])
227
osutils.normalized_filename = orig
229
def test_inaccessible_explicit(self):
231
orig = osutils.normalized_filename
232
osutils.normalized_filename = osutils._inaccessible_normalized_filename
234
self.assertRaises(errors.InvalidNormalization,
235
smart_add_tree, self.wt, [u'a\u030a'])
237
osutils.normalized_filename = orig
239
def test_inaccessible_implicit(self):
241
orig = osutils.normalized_filename
242
osutils.normalized_filename = osutils._inaccessible_normalized_filename
244
# TODO: jam 20060701 In the future, this should probably
245
# just ignore files that don't fit the normalization
246
# rules, rather than exploding
247
self.assertRaises(errors.InvalidNormalization,
248
smart_add_tree, self.wt, [])
250
osutils.normalized_filename = orig
253
class TestAddActions(TestCase):
148
255
def test_quiet(self):
149
256
self.run_action("")
151
258
def test__print(self):
152
self.run_action("adding path\n")
259
self.run_action("added path\n")
154
261
def run_action(self, output):
155
from bzrlib.mutabletree import _FastPath
156
inv = inventory.Inventory()
262
from bzrlib.add import AddAction, FastPath
263
from cStringIO import StringIO
157
265
stdout = StringIO()
158
action = add.AddAction(to_file=stdout, should_print=bool(output))
266
action = AddAction(to_file=stdout, should_print=bool(output))
160
self.apply_redirected(None, stdout, None, action, inv, None,
161
_FastPath('path'), 'file')
268
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
162
269
self.assertEqual(stdout.getvalue(), output)
added
removed
bzrlib/tests/test_smart_add.py
