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."""
22
from bzrlib import osutils
23
from bzrlib.tests import (
25
split_suite_by_condition,
29
22
from bzrlib.tests.blackbox import ExternalBase
32
def load_tests(standard_tests, module, loader):
33
"""Parameterize tests for view-aware vs not."""
34
to_adapt, result = split_suite_by_condition(
35
standard_tests, condition_isinstance(TestAdd))
37
('pre-views', {'branch_tree_format': 'pack-0.92'}),
38
('view-aware', {'branch_tree_format': 'development6-rich-root'}),
40
return multiply_tests(to_adapt, scenarios, result)
43
25
class TestAdd(ExternalBase):
45
def make_branch_and_tree(self, dir):
46
return ExternalBase.make_branch_and_tree(self, dir,
47
format=self.branch_tree_format)
49
27
def test_add_reports(self):
50
28
"""add command prints the names of added files."""
51
tree = self.make_branch_and_tree('.')
52
30
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
53
31
self.build_tree_contents([('.bzrignore', 'CVS\n')])
54
out = self.run_bzr('add')[0]
32
out = self.run_bzr_captured(['add'], retcode=0)[0]
55
33
# the ordering is not defined at the moment
56
34
results = sorted(out.rstrip('\n').split('\n'))
57
self.assertEquals(['adding .bzrignore',
35
self.assertEquals(['If you wish to add some of these files, please'\
41
'ignored 1 file(s).'],
62
out = self.run_bzr('add -v')[0]
43
out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
63
44
results = sorted(out.rstrip('\n').split('\n'))
64
self.assertEquals(['ignored CVS matching "CVS"'],
45
self.assertEquals(['If you wish to add some of these files, please'\
47
'ignored CVS matching "CVS"'],
67
50
def test_add_quiet_is(self):
68
51
"""add -q does not print the names of added files."""
69
tree = self.make_branch_and_tree('.')
70
53
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
71
out = self.run_bzr('add -q')[0]
54
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
72
55
# the ordering is not defined at the moment
73
56
results = sorted(out.rstrip('\n').split('\n'))
74
57
self.assertEquals([''], results)
79
62
"bzr add" should add the parent(s) as necessary.
81
tree = self.make_branch_and_tree('.')
82
65
self.build_tree(['inertiatic/', 'inertiatic/esp'])
83
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
84
self.run_bzr('add inertiatic/esp')
85
self.assertEquals(self.run_bzr('unknowns')[0], '')
66
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
67
self.run_bzr('add', 'inertiatic/esp')
68
self.assertEquals(self.capture('unknowns'), '')
87
70
# Multiple unversioned parents
88
71
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
89
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
90
self.run_bzr('add veil/cerpin/taxt')
91
self.assertEquals(self.run_bzr('unknowns')[0], '')
72
self.assertEquals(self.capture('unknowns'), 'veil\n')
73
self.run_bzr('add', 'veil/cerpin/taxt')
74
self.assertEquals(self.capture('unknowns'), '')
93
76
# Check whacky paths work
94
77
self.build_tree(['cicatriz/', 'cicatriz/esp'])
95
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
96
self.run_bzr('add inertiatic/../cicatriz/esp')
97
self.assertEquals(self.run_bzr('unknowns')[0], '')
78
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
79
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
80
self.assertEquals(self.capture('unknowns'), '')
99
82
def test_add_in_versioned(self):
100
83
"""Try to add a file in a versioned directory.
102
85
"bzr add" should do this happily.
104
tree = self.make_branch_and_tree('.')
105
88
self.build_tree(['inertiatic/', 'inertiatic/esp'])
106
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
107
self.run_bzr('add --no-recurse inertiatic')
108
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
109
self.run_bzr('add inertiatic/esp')
110
self.assertEquals(self.run_bzr('unknowns')[0], '')
89
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
90
self.run_bzr('add', '--no-recurse', 'inertiatic')
91
self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
92
self.run_bzr('add', 'inertiatic/esp')
93
self.assertEquals(self.capture('unknowns'), '')
112
95
def test_subdir_add(self):
113
96
"""Add in subdirectory should add only things from there down"""
114
97
from bzrlib.workingtree import WorkingTree
116
99
eq = self.assertEqual
117
ass = self.assertTrue
120
103
t = self.make_branch_and_tree('.')
122
105
self.build_tree(['src/', 'README'])
124
107
eq(sorted(t.unknowns()),
125
108
['README', 'src'])
127
self.run_bzr('add src')
110
self.run_bzr('add', 'src')
129
112
self.build_tree(['src/foo.c'])
131
# add with no arguments in a subdirectory gets only files below that
134
115
self.run_bzr('add')
135
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
136
# reopen to see the new changes
137
t = t.bzrdir.open_workingtree()
138
versioned = [path for path, entry in t.iter_entries_by_dir()]
139
self.assertEquals(versioned,
140
['', 'src', 'src/foo.c'])
142
# add from the parent directory should pick up all file names
117
self.assertEquals(self.capture('unknowns'), 'README\n')
118
eq(len(t.read_working_inventory()), 3)
144
121
self.run_bzr('add')
145
self.assertEquals(self.run_bzr('unknowns')[0], '')
122
self.assertEquals(self.capture('unknowns'), '')
146
123
self.run_bzr('check')
148
125
def test_add_missing(self):
149
126
"""bzr add foo where foo is missing should error."""
150
127
self.make_branch_and_tree('.')
151
self.run_bzr('add missing-file', retcode=3)
153
def test_add_from(self):
154
base_tree = self.make_branch_and_tree('base')
155
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
156
base_tree.add(['a', 'b', 'b/c'])
157
base_tree.commit('foo')
159
new_tree = self.make_branch_and_tree('new')
160
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
163
out, err = self.run_bzr('add --file-ids-from ../base')
164
self.assertEqual('', err)
165
self.assertEqualDiff('adding a w/ file id from a\n'
166
'adding b w/ file id from b\n'
167
'adding b/c w/ file id from b/c\n',
169
new_tree = new_tree.bzrdir.open_workingtree()
170
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
171
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
172
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
174
def test_add_from_subdir(self):
175
base_tree = self.make_branch_and_tree('base')
176
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
177
base_tree.add(['a', 'b', 'b/c', 'b/d'])
178
base_tree.commit('foo')
180
new_tree = self.make_branch_and_tree('new')
181
self.build_tree(['new/c', 'new/d'])
184
out, err = self.run_bzr('add --file-ids-from ../base/b')
185
self.assertEqual('', err)
186
self.assertEqualDiff('adding c w/ file id from b/c\n'
187
'adding d w/ file id from b/d\n',
190
new_tree = new_tree.bzrdir.open_workingtree()
191
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
192
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
194
def test_add_dry_run(self):
195
"""Test a dry run add, make sure nothing is added."""
196
wt = self.make_branch_and_tree('.')
197
self.build_tree(['inertiatic/', 'inertiatic/esp'])
198
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
199
self.run_bzr('add --dry-run')
200
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
202
def test_add_control_dir(self):
203
"""The control dir and its content should be refused."""
204
self.make_branch_and_tree('.')
205
err = self.run_bzr('add .bzr', retcode=3)[1]
206
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
207
err = self.run_bzr('add .bzr/README', retcode=3)[1]
208
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
209
self.build_tree(['.bzr/crescent'])
210
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
211
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
213
def test_add_via_symlink(self):
214
self.requireFeature(SymlinkFeature)
215
self.make_branch_and_tree('source')
216
self.build_tree(['source/top.txt'])
217
os.symlink('source', 'link')
218
out = self.run_bzr(['add', 'link/top.txt'])[0]
219
self.assertEquals(out, 'adding top.txt\n')
221
def test_add_symlink_to_abspath(self):
222
self.requireFeature(SymlinkFeature)
223
self.make_branch_and_tree('tree')
224
os.symlink(osutils.abspath('target'), 'tree/link')
225
out = self.run_bzr(['add', 'tree/link'])[0]
226
self.assertEquals(out, 'adding link\n')
128
self.run_bzr('add', 'missing-file', retcode=3)
added
removed
bzrlib/tests/blackbox/test_add.py
