4
from bzrlib.add import smart_add, smart_add_tree
5
from bzrlib.tests import TestCaseWithTransport, TestCase
6
from bzrlib.branch import Branch
7
from bzrlib.errors import NotBranchError, NoSuchFile
8
from bzrlib.inventory import InventoryFile, Inventory
9
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('.')
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('.')
32
smart_add_tree(wt, (u".",))
34
self.assertNotEqual(wt.path2id(path), None)
36
def test_add_tree_from_above_tree(self):
37
"""Test adding a tree from above the tree."""
38
from bzrlib.add import smart_add
39
paths = ("original/", "original/file1", "original/file2")
40
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
41
"branch/original/file2")
42
self.build_tree(branch_paths)
43
wt = self.make_branch_and_tree('branch')
45
smart_add_tree(wt, ("branch",))
47
self.assertNotEqual(wt.path2id(path), None)
49
def test_add_above_tree_preserves_tree(self):
50
"""Test nested trees are not affect by an add above them."""
51
from bzrlib.add import smart_add
52
paths = ("original/", "original/file1", "original/file2")
53
child_paths = ("path",)
54
full_child_paths = ("original/child", "original/child/path")
55
build_paths = ("original/", "original/file1", "original/file2",
56
"original/child/", "original/child/path")
58
self.build_tree(build_paths)
59
wt = self.make_branch_and_tree('.')
61
child_tree = self.make_branch_and_tree('original/child')
62
smart_add_tree(wt, (".",))
64
self.assertNotEqual((path, wt.path2id(path)),
66
for path in full_child_paths:
67
self.assertEqual((path, wt.path2id(path)),
69
for path in child_paths:
70
self.assertEqual(child_tree.path2id(path), None)
72
def test_add_paths(self):
73
"""Test smart-adding a list of paths."""
74
from bzrlib.add import smart_add
75
paths = ("file1", "file2")
76
self.build_tree(paths)
77
wt = self.make_branch_and_tree('.')
78
smart_add_tree(wt, paths)
80
self.assertNotEqual(wt.path2id(path), None)
82
def test_add_ignored_nested_paths(self):
83
"""Test smart-adding a list of paths which includes ignored ones."""
84
wt = self.make_branch_and_tree('.')
85
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
86
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
87
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
88
self.build_tree(tree_shape)
89
smart_add_tree(wt, add_paths)
90
for path in expected_paths:
91
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
93
def test_save_false(self):
94
"""Test smart-adding a path with save set to false."""
95
wt = self.make_branch_and_tree('.')
96
self.build_tree(['file'])
97
smart_add_tree(wt, ['file'], save=False)
98
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
99
wt.read_working_inventory()
100
self.assertEqual(wt.path2id('file'), None)
102
def test_add_dry_run(self):
103
"""Test a dry run add, make sure nothing is added."""
104
from bzrlib.commands import run_bzr
105
eq = self.assertEqual
106
wt = self.make_branch_and_tree('.')
108
self.build_tree(['inertiatic/', 'inertiatic/esp'])
109
eq(list(wt.unknowns()), ['inertiatic'])
110
self.capture('add --dry-run .')
111
eq(list(wt.unknowns()), ['inertiatic'])
113
def test_add_non_existant(self):
114
"""Test smart-adding a file that does not exist."""
115
from bzrlib.add import smart_add
116
wt = self.make_branch_and_tree('.')
118
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
120
def test_returns(self):
121
"""Correctly returns added/ignored files"""
122
from bzrlib.commands import run_bzr
123
wt = self.make_branch_and_tree('.')
125
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
126
'inertiatic/foo.pyc'])
127
added, ignored = smart_add_tree(wt, u'.')
128
self.assertSubset(('inertiatic', 'inertiatic/esp'), added)
129
self.assertSubset(('CVS', '*.py[oc]'), ignored)
130
self.assertSubset(('inertiatic/CVS',), ignored['CVS'])
131
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
134
class TestSmartAddBranch(TestCaseWithTransport):
135
"""Test smart adds with a specified branch."""
137
def test_add_dot_from_root(self):
138
"""Test adding . from the root of the tree."""
139
paths = ("original/", "original/file1", "original/file2")
140
self.build_tree(paths)
141
wt = self.make_branch_and_tree('.')
143
smart_add_tree(wt, (u".",))
145
self.assertNotEqual(wt.path2id(path), None)
147
def test_add_dot_from_subdir(self):
148
"""Test adding . from a subdir of the tree."""
149
from bzrlib.add import smart_add_tree
150
paths = ("original/", "original/file1", "original/file2")
151
self.build_tree(paths)
152
wt = self.make_branch_and_tree('.')
155
smart_add_tree(wt, (u".",))
157
self.assertNotEqual(wt.path2id(path), None)
159
def test_add_tree_from_above_tree(self):
160
"""Test adding a tree from above the tree."""
161
from bzrlib.add import smart_add_tree
162
paths = ("original/", "original/file1", "original/file2")
163
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
164
"branch/original/file2")
165
self.build_tree(branch_paths)
166
tree = self.make_branch_and_tree('branch')
168
smart_add_tree(tree, ("branch",))
170
self.assertNotEqual(tree.path2id(path), None)
172
def test_add_above_tree_preserves_tree(self):
173
"""Test nested trees are not affect by an add above them."""
174
from bzrlib.add import smart_add_tree
175
paths = ("original/", "original/file1", "original/file2")
176
child_paths = ("path")
177
full_child_paths = ("original/child", "original/child/path")
178
build_paths = ("original/", "original/file1", "original/file2",
179
"original/child/", "original/child/path")
180
self.build_tree(build_paths)
181
tree = self.make_branch_and_tree('.')
183
child_tree = self.make_branch_and_tree("original/child")
184
smart_add_tree(tree, (u".",))
186
self.assertNotEqual((path, tree.path2id(path)),
188
for path in full_child_paths:
189
self.assertEqual((path, tree.path2id(path)),
191
for path in child_paths:
192
self.assertEqual(child_tree.path2id(path), None)
194
def test_add_paths(self):
195
"""Test smart-adding a list of paths."""
196
from bzrlib.add import smart_add_tree
197
paths = ("file1", "file2")
198
self.build_tree(paths)
199
wt = self.make_branch_and_tree('.')
201
smart_add_tree(wt, paths)
203
self.assertNotEqual(wt.path2id(path), None)
206
class TestAddActions(TestCase):
208
def test_quiet(self):
211
def test__print(self):
212
self.run_action("added path\n")
214
def run_action(self, output):
215
from bzrlib.add import AddAction, FastPath
216
from cStringIO import StringIO
219
action = AddAction(to_file=stdout, should_print=bool(output))
221
self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
222
self.assertEqual(stdout.getvalue(), output)
added
removed
bzrlib/tests/test_smart_add.py
