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
|
import os
import unittest
from bzrlib.add import smart_add, smart_add_tree
from bzrlib.tests import TestCaseWithTransport, TestCase
from bzrlib.branch import Branch
from bzrlib.errors import NotBranchError, 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('.')
branch = wt.branch
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('.')
branch = wt.branch
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')
branch = wt.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('.')
branch = wt.branch
child_tree = self.make_branch_and_tree('original/child')
smart_add_tree(wt, (u".",))
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('.')
branch = wt.branch
smart_add_tree(wt, paths)
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
def test_add_dry_run(self):
"""Test a dry run add, make sure nothing is added."""
from bzrlib.commands import run_bzr
eq = self.assertEqual
wt = self.make_branch_and_tree('.')
branch = wt.branch
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('.')
branch = wt.branch
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
def test_returns(self):
"""Correctly returns added/ignored files"""
from bzrlib.commands import run_bzr
wt = self.make_branch_and_tree('.')
branch = wt.branch
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
'inertiatic/foo.pyc'])
added, ignored = smart_add_tree(wt, u'.')
self.assertSubset(('inertiatic', 'inertiatic/esp'), added)
self.assertSubset(('CVS', '*.py[oc]'), ignored)
self.assertSubset(('inertiatic/CVS',), ignored['CVS'])
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
class TestSmartAddBranch(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('.')
branch = wt.branch
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_tree
paths = ("original/", "original/file1", "original/file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
branch = wt.branch
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_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')
branch = 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."""
from bzrlib.add import smart_add_tree
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('.')
branch = tree.branch
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."""
from bzrlib.add import smart_add_tree
paths = ("file1", "file2")
self.build_tree(paths)
wt = self.make_branch_and_tree('.')
branch = wt.branch
smart_add_tree(wt, paths)
for path in paths:
self.assertNotEqual(wt.path2id(path), None)
class TestAddActions(TestCase):
def test_null(self):
from bzrlib.add import add_action_null
self.run_action(add_action_null, "", False)
def test_add(self):
self.entry = InventoryFile("id", "name", None)
from bzrlib.add import add_action_add
self.run_action(add_action_add, "", True)
def test_add_and_print(self):
from bzrlib.add import add_action_add_and_print
self.run_action(add_action_add_and_print, "added path\n", True)
def test_print(self):
from bzrlib.add import add_action_print
self.run_action(add_action_print, "added path\n", False)
def run_action(self, action, output, should_add):
from StringIO import StringIO
inv = Inventory()
stdout = StringIO()
self.apply_redirected(None, stdout, None, action, inv, None, 'path', 'file')
self.assertEqual(stdout.getvalue(), output)
if should_add:
self.assertNotEqual(inv.path2id('path'), None)
else:
self.assertEqual(inv.path2id('path'), None)
|