13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests of the 'bzr add' command."""
28
def load_tests(standard_tests, module, loader):
29
"""Parameterize tests for view-aware vs not."""
30
to_adapt, result = tests.split_suite_by_condition(
31
standard_tests, tests.condition_isinstance(TestAdd))
33
('pre-views', {'branch_tree_format': 'pack-0.92'}),
34
('view-aware', {'branch_tree_format': 'development6-rich-root'}),
36
return tests.multiply_tests(to_adapt, scenarios, result)
39
class TestAdd(tests.TestCaseWithTransport):
41
def make_branch_and_tree(self, dir):
42
return super(TestAdd, self).make_branch_and_tree(
43
dir, format=self.branch_tree_format)
22
from bzrlib import ignores
24
from bzrlib.tests.blackbox import ExternalBase
27
class TestAdd(ExternalBase):
45
29
def test_add_reports(self):
46
30
"""add command prints the names of added files."""
47
tree = self.make_branch_and_tree('.')
31
ignores._set_user_ignores(['./.bazaar'])
48
34
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
49
35
self.build_tree_contents([('.bzrignore', 'CVS\n')])
50
out = self.run_bzr('add')[0]
36
out = self.run_bzr_captured(['add'], retcode=0)[0]
51
37
# the ordering is not defined at the moment
52
38
results = sorted(out.rstrip('\n').split('\n'))
53
self.assertEquals(['adding .bzrignore',
39
self.assertEquals(['If you wish to add some of these files, please'\
45
'ignored 2 file(s).'],
58
out = self.run_bzr('add -v')[0]
47
out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
59
48
results = sorted(out.rstrip('\n').split('\n'))
60
self.assertEquals(['ignored CVS matching "CVS"'],
49
self.assertEquals(['If you wish to add some of these files, please'\
51
'ignored .bazaar matching "./.bazaar"',
52
'ignored CVS matching "CVS"'],
63
55
def test_add_quiet_is(self):
64
56
"""add -q does not print the names of added files."""
65
tree = self.make_branch_and_tree('.')
66
58
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
67
out = self.run_bzr('add -q')[0]
59
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
68
60
# the ordering is not defined at the moment
69
61
results = sorted(out.rstrip('\n').split('\n'))
70
62
self.assertEquals([''], results)
75
67
"bzr add" should add the parent(s) as necessary.
77
tree = self.make_branch_and_tree('.')
69
ignores._set_user_ignores(['./.bazaar'])
78
72
self.build_tree(['inertiatic/', 'inertiatic/esp'])
79
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
80
self.run_bzr('add inertiatic/esp')
81
self.assertEquals(self.run_bzr('unknowns')[0], '')
73
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
74
self.run_bzr('add', 'inertiatic/esp')
75
self.assertEquals(self.capture('unknowns'), '')
83
77
# Multiple unversioned parents
84
78
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
85
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
86
self.run_bzr('add veil/cerpin/taxt')
87
self.assertEquals(self.run_bzr('unknowns')[0], '')
79
self.assertEquals(self.capture('unknowns'), 'veil\n')
80
self.run_bzr('add', 'veil/cerpin/taxt')
81
self.assertEquals(self.capture('unknowns'), '')
89
83
# Check whacky paths work
90
84
self.build_tree(['cicatriz/', 'cicatriz/esp'])
91
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
92
self.run_bzr('add inertiatic/../cicatriz/esp')
93
self.assertEquals(self.run_bzr('unknowns')[0], '')
85
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
86
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
87
self.assertEquals(self.capture('unknowns'), '')
95
89
def test_add_in_versioned(self):
96
90
"""Try to add a file in a versioned directory.
98
92
"bzr add" should do this happily.
100
tree = self.make_branch_and_tree('.')
94
ignores._set_user_ignores(['./.bazaar'])
101
97
self.build_tree(['inertiatic/', 'inertiatic/esp'])
102
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
103
self.run_bzr('add --no-recurse inertiatic')
104
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
105
self.run_bzr('add inertiatic/esp')
106
self.assertEquals(self.run_bzr('unknowns')[0], '')
98
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
99
self.run_bzr('add', '--no-recurse', 'inertiatic')
100
self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
101
self.run_bzr('add', 'inertiatic/esp')
102
self.assertEquals(self.capture('unknowns'), '')
108
104
def test_subdir_add(self):
109
105
"""Add in subdirectory should add only things from there down"""
110
106
from bzrlib.workingtree import WorkingTree
108
ignores._set_user_ignores(['./.bazaar'])
112
109
eq = self.assertEqual
113
110
ass = self.assertTrue
115
113
t = self.make_branch_and_tree('.')
117
115
self.build_tree(['src/', 'README'])
119
117
eq(sorted(t.unknowns()),
120
118
['README', 'src'])
122
self.run_bzr('add src')
120
self.run_bzr('add', 'src')
124
122
self.build_tree(['src/foo.c'])
126
# add with no arguments in a subdirectory gets only files below that
128
self.run_bzr('add', working_dir='src')
129
self.assertEquals('README\n',
130
self.run_bzr('unknowns', working_dir='src')[0])
131
# reopen to see the new changes
132
t = t.bzrdir.open_workingtree('src')
133
versioned = [path for path, entry in t.iter_entries_by_dir()]
134
self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
136
# add from the parent directory should pick up all file names
138
self.assertEquals(self.run_bzr('unknowns')[0], '')
127
self.assertEquals(self.capture('unknowns'), 'README\n')
128
eq(len(t.read_working_inventory()), 3)
132
self.assertEquals(self.capture('unknowns'), '')
139
133
self.run_bzr('check')
141
135
def test_add_missing(self):
142
136
"""bzr add foo where foo is missing should error."""
143
137
self.make_branch_and_tree('.')
144
self.run_bzr('add missing-file', retcode=3)
138
self.run_bzr('add', 'missing-file', retcode=3)
146
140
def test_add_from(self):
147
141
base_tree = self.make_branch_and_tree('base')
153
147
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
156
out, err = self.run_bzr('add --file-ids-from ../base')
150
out, err = self.run_bzr('add', '--file-ids-from', '../base')
157
151
self.assertEqual('', err)
158
self.assertEqualDiff('adding a w/ file id from a\n'
159
'adding b w/ file id from b\n'
160
'adding b/c w/ file id from b/c\n',
152
self.assertEqualDiff('added a w/ file id from a\n'
153
'added b w/ file id from b\n'
154
'added b/c w/ file id from b/c\n',
162
new_tree = new_tree.bzrdir.open_workingtree()
157
new_tree.read_working_inventory()
163
158
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
164
159
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
165
160
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
174
169
self.build_tree(['new/c', 'new/d'])
177
out, err = self.run_bzr('add --file-ids-from ../base/b')
172
out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
178
173
self.assertEqual('', err)
179
self.assertEqualDiff('adding c w/ file id from b/c\n'
180
'adding d w/ file id from b/d\n',
174
self.assertEqualDiff('added c w/ file id from b/c\n'
175
'added d w/ file id from b/d\n',
183
new_tree = new_tree.bzrdir.open_workingtree()
178
new_tree.read_working_inventory()
184
179
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
185
180
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
187
182
def test_add_dry_run(self):
188
"""Test a dry run add, make sure nothing is added."""
189
wt = self.make_branch_and_tree('.')
190
self.build_tree(['inertiatic/', 'inertiatic/esp'])
191
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
192
self.run_bzr('add --dry-run')
193
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
195
def test_add_control_dir(self):
196
"""The control dir and its content should be refused."""
197
self.make_branch_and_tree('.')
198
err = self.run_bzr('add .bzr', retcode=3)[1]
199
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
200
err = self.run_bzr('add .bzr/README', retcode=3)[1]
201
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
202
self.build_tree(['.bzr/crescent'])
203
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
204
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
206
def test_add_via_symlink(self):
207
self.requireFeature(tests.SymlinkFeature)
208
self.make_branch_and_tree('source')
209
self.build_tree(['source/top.txt'])
210
os.symlink('source', 'link')
211
out = self.run_bzr(['add', 'link/top.txt'])[0]
212
self.assertEquals(out, 'adding top.txt\n')
214
def test_add_symlink_to_abspath(self):
215
self.requireFeature(tests.SymlinkFeature)
216
self.make_branch_and_tree('tree')
217
os.symlink(osutils.abspath('target'), 'tree/link')
218
out = self.run_bzr(['add', 'tree/link'])[0]
219
self.assertEquals(out, 'adding link\n')
183
# ensure that --dry-run actually don't add anything
184
base_tree = self.make_branch_and_tree('.')
185
self.build_tree(['spam'])
186
out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
187
self.assertEquals('added spam\n', out)
188
out = self.run_bzr_captured(['added'], retcode=0)[0]
189
self.assertEquals('', out)
added
removed
bzrlib/tests/blackbox/test_add.py
