1
# Copyright (C) 2005, 2006, 2007, 2009 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 import osutils
23
from bzrlib.tests import (
25
split_suite_by_condition,
29
from bzrlib.tests.blackbox import ExternalBase
30
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
33
def load_tests(standard_tests, module, loader):
34
"""Parameterize tests for view-aware vs not."""
35
to_adapt, result = split_suite_by_condition(
36
standard_tests, condition_isinstance(TestAdd))
38
('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
('view-aware', {'branch_tree_format': 'development6-rich-root'}),
41
return multiply_tests(to_adapt, scenarios, result)
44
class TestAdd(ExternalBase):
46
def make_branch_and_tree(self, dir):
47
return ExternalBase.make_branch_and_tree(self, dir,
48
format=self.branch_tree_format)
50
def test_add_reports(self):
51
"""add command prints the names of added files."""
52
tree = self.make_branch_and_tree('.')
53
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
54
self.build_tree_contents([('.bzrignore', 'CVS\n')])
55
out = self.run_bzr('add')[0]
56
# the ordering is not defined at the moment
57
results = sorted(out.rstrip('\n').split('\n'))
58
self.assertEquals(['adding .bzrignore',
63
out = self.run_bzr('add -v')[0]
64
results = sorted(out.rstrip('\n').split('\n'))
65
self.assertEquals(['ignored CVS matching "CVS"'],
68
def test_add_quiet_is(self):
69
"""add -q does not print the names of added files."""
70
tree = self.make_branch_and_tree('.')
71
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
72
out = self.run_bzr('add -q')[0]
73
# the ordering is not defined at the moment
74
results = sorted(out.rstrip('\n').split('\n'))
75
self.assertEquals([''], results)
77
def test_add_in_unversioned(self):
78
"""Try to add a file in an unversioned directory.
80
"bzr add" should add the parent(s) as necessary.
82
tree = self.make_branch_and_tree('.')
83
self.build_tree(['inertiatic/', 'inertiatic/esp'])
84
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
85
self.run_bzr('add inertiatic/esp')
86
self.assertEquals(self.run_bzr('unknowns')[0], '')
88
# Multiple unversioned parents
89
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
90
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
91
self.run_bzr('add veil/cerpin/taxt')
92
self.assertEquals(self.run_bzr('unknowns')[0], '')
94
# Check whacky paths work
95
self.build_tree(['cicatriz/', 'cicatriz/esp'])
96
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
97
self.run_bzr('add inertiatic/../cicatriz/esp')
98
self.assertEquals(self.run_bzr('unknowns')[0], '')
100
def test_add_in_versioned(self):
101
"""Try to add a file in a versioned directory.
103
"bzr add" should do this happily.
105
tree = self.make_branch_and_tree('.')
106
self.build_tree(['inertiatic/', 'inertiatic/esp'])
107
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
108
self.run_bzr('add --no-recurse inertiatic')
109
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
110
self.run_bzr('add inertiatic/esp')
111
self.assertEquals(self.run_bzr('unknowns')[0], '')
113
def test_subdir_add(self):
114
"""Add in subdirectory should add only things from there down"""
115
from bzrlib.workingtree import WorkingTree
117
eq = self.assertEqual
118
ass = self.assertTrue
121
t = self.make_branch_and_tree('.')
123
self.build_tree(['src/', 'README'])
125
eq(sorted(t.unknowns()),
128
self.run_bzr('add src')
130
self.build_tree(['src/foo.c'])
132
# add with no arguments in a subdirectory gets only files below that
136
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
137
# reopen to see the new changes
138
t = t.bzrdir.open_workingtree()
139
versioned = [path for path, entry in t.iter_entries_by_dir()]
140
self.assertEquals(versioned,
141
['', 'src', 'src/foo.c'])
143
# add from the parent directory should pick up all file names
146
self.assertEquals(self.run_bzr('unknowns')[0], '')
147
self.run_bzr('check')
149
def test_add_missing(self):
150
"""bzr add foo where foo is missing should error."""
151
self.make_branch_and_tree('.')
152
self.run_bzr('add missing-file', retcode=3)
154
def test_add_from(self):
155
base_tree = self.make_branch_and_tree('base')
156
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
157
base_tree.add(['a', 'b', 'b/c'])
158
base_tree.commit('foo')
160
new_tree = self.make_branch_and_tree('new')
161
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
164
out, err = self.run_bzr('add --file-ids-from ../base')
165
self.assertEqual('', err)
166
self.assertEqualDiff('adding a w/ file id from a\n'
167
'adding b w/ file id from b\n'
168
'adding b/c w/ file id from b/c\n',
170
new_tree = new_tree.bzrdir.open_workingtree()
171
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
172
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
173
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
175
def test_add_from_subdir(self):
176
base_tree = self.make_branch_and_tree('base')
177
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
178
base_tree.add(['a', 'b', 'b/c', 'b/d'])
179
base_tree.commit('foo')
181
new_tree = self.make_branch_and_tree('new')
182
self.build_tree(['new/c', 'new/d'])
185
out, err = self.run_bzr('add --file-ids-from ../base/b')
186
self.assertEqual('', err)
187
self.assertEqualDiff('adding c w/ file id from b/c\n'
188
'adding d w/ file id from b/d\n',
191
new_tree = new_tree.bzrdir.open_workingtree()
192
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
193
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
195
def test_add_dry_run(self):
196
"""Test a dry run add, make sure nothing is added."""
197
wt = self.make_branch_and_tree('.')
198
self.build_tree(['inertiatic/', 'inertiatic/esp'])
199
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
200
self.run_bzr('add --dry-run')
201
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
203
def test_add_control_dir(self):
204
"""The control dir and its content should be refused."""
205
self.make_branch_and_tree('.')
206
err = self.run_bzr('add .bzr', retcode=3)[1]
207
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
208
err = self.run_bzr('add .bzr/README', retcode=3)[1]
209
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
210
self.build_tree(['.bzr/crescent'])
211
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
212
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
214
def test_add_with_wildcards(self):
215
self.requireFeature(NeedsGlobExpansionFeature)
216
self.make_branch_and_tree('.')
217
self.build_tree(['a1', 'a2', 'b', 'c33'])
218
self.run_bzr(['add', 'a?', 'c*'])
219
self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
221
def test_add_with_wildcards_unicode(self):
222
self.requireFeature(NeedsGlobExpansionFeature)
223
self.make_branch_and_tree('.')
224
self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
225
self.run_bzr(['add', u'\u1234?', u'\u1235*'])
226
self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
228
def test_add_via_symlink(self):
229
self.requireFeature(SymlinkFeature)
230
self.make_branch_and_tree('source')
231
self.build_tree(['source/top.txt'])
232
os.symlink('source', 'link')
233
out = self.run_bzr(['add', 'link/top.txt'])[0]
234
self.assertEquals(out, 'adding top.txt\n')
236
def test_add_symlink_to_abspath(self):
237
self.requireFeature(SymlinkFeature)
238
self.make_branch_and_tree('tree')
239
os.symlink(osutils.abspath('target'), 'tree/link')
240
out = self.run_bzr(['add', 'tree/link'])[0]
241
self.assertEquals(out, 'adding link\n')
added
removed
bzrlib/tests/blackbox/test_add.py
