1
# Copyright (C) 2005, 2006, 2007 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
18
"""Tests of the 'bzr add' command."""
22
from bzrlib.tests import (
24
split_suite_by_condition,
27
from bzrlib.tests.blackbox import ExternalBase
28
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
def load_tests(standard_tests, module, loader):
32
"""Parameterize tests for view-aware vs not."""
33
to_adapt, result = split_suite_by_condition(
34
standard_tests, condition_isinstance(TestAdd))
36
('pre-views', {'branch_tree_format': 'pack-0.92'}),
37
('view-aware', {'branch_tree_format': 'development-wt6'}),
39
return multiply_tests(to_adapt, scenarios, result)
42
class TestAdd(ExternalBase):
44
def make_branch_and_tree(self, dir):
45
return ExternalBase.make_branch_and_tree(self, dir,
46
format=self.branch_tree_format)
48
def test_add_reports(self):
49
"""add command prints the names of added files."""
50
tree = self.make_branch_and_tree('.')
51
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
52
self.build_tree_contents([('.bzrignore', 'CVS\n')])
53
out = self.run_bzr('add')[0]
54
# the ordering is not defined at the moment
55
results = sorted(out.rstrip('\n').split('\n'))
56
self.assertEquals(['If you wish to add some of these files, please'\
62
'ignored 1 file(s).'],
64
out = self.run_bzr('add -v')[0]
65
results = sorted(out.rstrip('\n').split('\n'))
66
self.assertEquals(['If you wish to add some of these files, please'\
68
'ignored CVS matching "CVS"'],
71
def test_add_quiet_is(self):
72
"""add -q does not print the names of added files."""
73
tree = self.make_branch_and_tree('.')
74
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
75
out = self.run_bzr('add -q')[0]
76
# the ordering is not defined at the moment
77
results = sorted(out.rstrip('\n').split('\n'))
78
self.assertEquals([''], results)
80
def test_add_in_unversioned(self):
81
"""Try to add a file in an unversioned directory.
83
"bzr add" should add the parent(s) as necessary.
85
tree = self.make_branch_and_tree('.')
86
self.build_tree(['inertiatic/', 'inertiatic/esp'])
87
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
88
self.run_bzr('add inertiatic/esp')
89
self.assertEquals(self.run_bzr('unknowns')[0], '')
91
# Multiple unversioned parents
92
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
93
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
94
self.run_bzr('add veil/cerpin/taxt')
95
self.assertEquals(self.run_bzr('unknowns')[0], '')
97
# Check whacky paths work
98
self.build_tree(['cicatriz/', 'cicatriz/esp'])
99
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
100
self.run_bzr('add inertiatic/../cicatriz/esp')
101
self.assertEquals(self.run_bzr('unknowns')[0], '')
103
def test_add_in_versioned(self):
104
"""Try to add a file in a versioned directory.
106
"bzr add" should do this happily.
108
tree = self.make_branch_and_tree('.')
109
self.build_tree(['inertiatic/', 'inertiatic/esp'])
110
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
111
self.run_bzr('add --no-recurse inertiatic')
112
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
113
self.run_bzr('add inertiatic/esp')
114
self.assertEquals(self.run_bzr('unknowns')[0], '')
116
def test_subdir_add(self):
117
"""Add in subdirectory should add only things from there down"""
118
from bzrlib.workingtree import WorkingTree
120
eq = self.assertEqual
121
ass = self.assertTrue
124
t = self.make_branch_and_tree('.')
126
self.build_tree(['src/', 'README'])
128
eq(sorted(t.unknowns()),
131
self.run_bzr('add src')
133
self.build_tree(['src/foo.c'])
135
# add with no arguments in a subdirectory gets only files below that
139
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
140
# reopen to see the new changes
141
t = t.bzrdir.open_workingtree()
142
versioned = [path for path, entry in t.iter_entries_by_dir()]
143
self.assertEquals(versioned,
144
['', 'src', 'src/foo.c'])
146
# add from the parent directory should pick up all file names
149
self.assertEquals(self.run_bzr('unknowns')[0], '')
150
self.run_bzr('check')
152
def test_add_missing(self):
153
"""bzr add foo where foo is missing should error."""
154
self.make_branch_and_tree('.')
155
self.run_bzr('add missing-file', retcode=3)
157
def test_add_from(self):
158
base_tree = self.make_branch_and_tree('base')
159
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
160
base_tree.add(['a', 'b', 'b/c'])
161
base_tree.commit('foo')
163
new_tree = self.make_branch_and_tree('new')
164
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
167
out, err = self.run_bzr('add --file-ids-from ../base')
168
self.assertEqual('', err)
169
self.assertEqualDiff('adding a w/ file id from a\n'
170
'adding b w/ file id from b\n'
171
'adding b/c w/ file id from b/c\n',
173
new_tree = new_tree.bzrdir.open_workingtree()
174
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
175
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
176
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
178
def test_add_from_subdir(self):
179
base_tree = self.make_branch_and_tree('base')
180
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
181
base_tree.add(['a', 'b', 'b/c', 'b/d'])
182
base_tree.commit('foo')
184
new_tree = self.make_branch_and_tree('new')
185
self.build_tree(['new/c', 'new/d'])
188
out, err = self.run_bzr('add --file-ids-from ../base/b')
189
self.assertEqual('', err)
190
self.assertEqualDiff('adding c w/ file id from b/c\n'
191
'adding d w/ file id from b/d\n',
194
new_tree = new_tree.bzrdir.open_workingtree()
195
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
196
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
198
def test_add_dry_run(self):
199
"""Test a dry run add, make sure nothing is added."""
200
wt = self.make_branch_and_tree('.')
201
self.build_tree(['inertiatic/', 'inertiatic/esp'])
202
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
203
self.run_bzr('add --dry-run')
204
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
206
def test_add_control_dir(self):
207
"""The control dir and its content should be refused."""
208
self.make_branch_and_tree('.')
209
err = self.run_bzr('add .bzr', retcode=3)[1]
210
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
211
err = self.run_bzr('add .bzr/README', retcode=3)[1]
212
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
213
self.build_tree(['.bzr/crescent'])
214
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
215
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
217
def test_add_with_wildcards(self):
218
self.requireFeature(NeedsGlobExpansionFeature)
219
self.make_branch_and_tree('.')
220
self.build_tree(['a1', 'a2', 'b', 'c33'])
221
self.run_bzr(['add', 'a?', 'c*'])
222
self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
224
def test_add_with_wildcards_unicode(self):
225
self.requireFeature(NeedsGlobExpansionFeature)
226
self.make_branch_and_tree('.')
227
self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
228
self.run_bzr(['add', u'\u1234?', u'\u1235*'])
229
self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
added
removed
bzrlib/tests/blackbox/test_add.py
