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.add import smart_add, smart_add_tree
5
from bzrlib.tests import TestCaseWithTransport, TestCase
6
from bzrlib.errors import NotBranchError, NoSuchFile
7
from bzrlib.inventory import InventoryFile, Inventory
8
from bzrlib.workingtree import WorkingTree
11
class TestSmartAdd(TestCaseWithTransport):
13
def test_add_dot_from_root(self):
14
"""Test adding . from the root of the tree."""
15
from bzrlib.add import smart_add
16
paths = ("original/", "original/file1", "original/file2")
17
self.build_tree(paths)
18
wt = self.make_branch_and_tree('.')
19
smart_add_tree(wt, (u".",))
21
self.assertNotEqual(wt.path2id(path), None)
23
def test_add_dot_from_subdir(self):
24
"""Test adding . from a subdir of the tree."""
25
from bzrlib.add import smart_add
26
paths = ("original/", "original/file1", "original/file2")
27
self.build_tree(paths)
28
wt = self.make_branch_and_tree('.')
30
smart_add_tree(wt, (u".",))
32
self.assertNotEqual(wt.path2id(path), None)
34
def test_add_tree_from_above_tree(self):
35
"""Test adding a tree from above the tree."""
36
from bzrlib.add import smart_add
37
paths = ("original/", "original/file1", "original/file2")
38
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
39
"branch/original/file2")
40
self.build_tree(branch_paths)
41
wt = self.make_branch_and_tree('branch')
42
smart_add_tree(wt, ("branch",))
44
self.assertNotEqual(wt.path2id(path), None)
46
def test_add_above_tree_preserves_tree(self):
47
"""Test nested trees are not affect by an add above them."""
48
from bzrlib.add import smart_add
49
paths = ("original/", "original/file1", "original/file2")
50
child_paths = ("path",)
51
full_child_paths = ("original/child", "original/child/path")
52
build_paths = ("original/", "original/file1", "original/file2",
53
"original/child/", "original/child/path")
55
self.build_tree(build_paths)
56
wt = self.make_branch_and_tree('.')
57
child_tree = self.make_branch_and_tree('original/child')
58
smart_add_tree(wt, (".",))
60
self.assertNotEqual((path, wt.path2id(path)),
62
for path in full_child_paths:
63
self.assertEqual((path, wt.path2id(path)),
65
for path in child_paths:
66
self.assertEqual(child_tree.path2id(path), None)
68
def test_add_paths(self):
69
"""Test smart-adding a list of paths."""
70
from bzrlib.add import smart_add
71
paths = ("file1", "file2")
72
self.build_tree(paths)
73
wt = self.make_branch_and_tree('.')
74
smart_add_tree(wt, paths)
76
self.assertNotEqual(wt.path2id(path), None)
78
def test_add_ignored_nested_paths(self):
79
"""Test smart-adding a list of paths which includes ignored ones."""
80
wt = self.make_branch_and_tree('.')
81
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
82
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
83
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
84
self.build_tree(tree_shape)
85
smart_add_tree(wt, add_paths)
86
for path in expected_paths:
87
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
89
def test_save_false(self):
90
"""Test smart-adding a path with save set to false."""
91
wt = self.make_branch_and_tree('.')
92
self.build_tree(['file'])
93
smart_add_tree(wt, ['file'], save=False)
94
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
95
wt.read_working_inventory()
96
self.assertEqual(wt.path2id('file'), None)
98
def test_add_dry_run(self):
99
"""Test a dry run add, make sure nothing is added."""
100
from bzrlib.commands import run_bzr
101
eq = self.assertEqual
102
wt = self.make_branch_and_tree('.')
103
self.build_tree(['inertiatic/', 'inertiatic/esp'])
104
eq(list(wt.unknowns()), ['inertiatic'])
105
self.capture('add --dry-run .')
106
eq(list(wt.unknowns()), ['inertiatic'])
108
def test_add_non_existant(self):
109
"""Test smart-adding a file that does not exist."""
110
from bzrlib.add import smart_add
111
wt = self.make_branch_and_tree('.')
112
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
114
def test_returns(self):
115
"""Correctly returns added/ignored files"""
116
from bzrlib.commands import run_bzr
117
wt = self.make_branch_and_tree('.')
118
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
119
'inertiatic/foo.pyc'])
120
added, ignored = smart_add_tree(wt, u'.')
121
self.assertSubset(('inertiatic', 'inertiatic/esp'), added)
122
self.assertSubset(('CVS', '*.py[oc]'), ignored)
123
self.assertSubset(('inertiatic/CVS',), ignored['CVS'])
124
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
127
class TestSmartAddBranch(TestCaseWithTransport):
128
"""Test smart adds with a specified branch."""
130
def test_add_dot_from_root(self):
131
"""Test adding . from the root of the tree."""
132
paths = ("original/", "original/file1", "original/file2")
133
self.build_tree(paths)
134
wt = self.make_branch_and_tree('.')
135
smart_add_tree(wt, (u".",))
137
self.assertNotEqual(wt.path2id(path), None)
139
def test_add_dot_from_subdir(self):
140
"""Test adding . from a subdir of the tree."""
141
from bzrlib.add import smart_add_tree
142
paths = ("original/", "original/file1", "original/file2")
143
self.build_tree(paths)
144
wt = self.make_branch_and_tree('.')
146
smart_add_tree(wt, (u".",))
148
self.assertNotEqual(wt.path2id(path), None)
150
def test_add_tree_from_above_tree(self):
151
"""Test adding a tree from above the tree."""
152
from bzrlib.add import smart_add_tree
153
paths = ("original/", "original/file1", "original/file2")
154
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
155
"branch/original/file2")
156
self.build_tree(branch_paths)
157
tree = self.make_branch_and_tree('branch')
158
smart_add_tree(tree, ("branch",))
160
self.assertNotEqual(tree.path2id(path), None)
162
def test_add_above_tree_preserves_tree(self):
163
"""Test nested trees are not affect by an add above them."""
164
from bzrlib.add import smart_add_tree
165
paths = ("original/", "original/file1", "original/file2")
166
child_paths = ("path")
167
full_child_paths = ("original/child", "original/child/path")
168
build_paths = ("original/", "original/file1", "original/file2",
169
"original/child/", "original/child/path")
170
self.build_tree(build_paths)
171
tree = self.make_branch_and_tree('.')
172
child_tree = self.make_branch_and_tree("original/child")
173
smart_add_tree(tree, (u".",))
175
self.assertNotEqual((path, tree.path2id(path)),
177
for path in full_child_paths:
178
self.assertEqual((path, tree.path2id(path)),
180
for path in child_paths:
181
self.assertEqual(child_tree.path2id(path), None)
183
def test_add_paths(self):
184
"""Test smart-adding a list of paths."""
185
from bzrlib.add import smart_add_tree
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)
194
class TestAddActions(TestCase):
148
196
def test_quiet(self):
149
197
self.run_action("")
151
199
def test__print(self):
152
self.run_action("adding path\n")
200
self.run_action("added path\n")
154
202
def run_action(self, output):
155
from bzrlib.mutabletree import _FastPath
156
inv = inventory.Inventory()
203
from bzrlib.add import AddAction, FastPath
204
from cStringIO import StringIO
157
206
stdout = StringIO()
158
action = add.AddAction(to_file=stdout, should_print=bool(output))
207
action = AddAction(to_file=stdout, should_print=bool(output))
160
self.apply_redirected(None, stdout, None, action, inv, None,
161
_FastPath('path'), 'file')
209
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
162
210
self.assertEqual(stdout.getvalue(), output)
added
removed
bzrlib/tests/test_smart_add.py
