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."""
26
from bzrlib.tests import (
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
33
load_tests = load_tests_apply_scenarios
36
class TestAdd(tests.TestCaseWithTransport):
39
('pre-views', {'branch_tree_format': 'pack-0.92'}),
40
('view-aware', {'branch_tree_format': '2a'}),
43
def make_branch_and_tree(self, dir):
44
return super(TestAdd, self).make_branch_and_tree(
45
dir, format=self.branch_tree_format)
22
from bzrlib.tests.blackbox import ExternalBase
25
class TestAdd(ExternalBase):
47
27
def test_add_reports(self):
48
28
"""add command prints the names of added files."""
49
tree = self.make_branch_and_tree('.')
50
30
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
51
31
self.build_tree_contents([('.bzrignore', 'CVS\n')])
52
out = self.run_bzr('add')[0]
32
out = self.run_bzr_captured(['add'], retcode=0)[0]
53
33
# the ordering is not defined at the moment
54
34
results = sorted(out.rstrip('\n').split('\n'))
55
self.assertEqual(['adding .bzrignore',
35
self.assertEquals(['If you wish to add some of these files, please'\
41
'ignored 1 file(s).'],
60
out = self.run_bzr('add -v')[0]
43
out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
61
44
results = sorted(out.rstrip('\n').split('\n'))
62
self.assertEqual(['ignored CVS matching "CVS"'],
45
self.assertEquals(['If you wish to add some of these files, please'\
47
'ignored CVS matching "CVS"'],
65
50
def test_add_quiet_is(self):
66
51
"""add -q does not print the names of added files."""
67
tree = self.make_branch_and_tree('.')
68
53
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
69
out = self.run_bzr('add -q')[0]
54
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
70
55
# the ordering is not defined at the moment
71
56
results = sorted(out.rstrip('\n').split('\n'))
72
self.assertEqual([''], results)
57
self.assertEquals([''], results)
74
59
def test_add_in_unversioned(self):
75
60
"""Try to add a file in an unversioned directory.
77
62
"bzr add" should add the parent(s) as necessary.
79
tree = self.make_branch_and_tree('.')
80
65
self.build_tree(['inertiatic/', 'inertiatic/esp'])
81
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
82
self.run_bzr('add inertiatic/esp')
83
self.assertEqual(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'), '')
85
70
# Multiple unversioned parents
86
71
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
87
self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
88
self.run_bzr('add veil/cerpin/taxt')
89
self.assertEqual(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'), '')
91
76
# Check whacky paths work
92
77
self.build_tree(['cicatriz/', 'cicatriz/esp'])
93
self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
94
self.run_bzr('add inertiatic/../cicatriz/esp')
95
self.assertEqual(self.run_bzr('unknowns')[0], '')
97
def test_add_no_recurse(self):
98
tree = self.make_branch_and_tree('.')
99
self.build_tree(['inertiatic/', 'inertiatic/esp'])
100
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
101
self.run_bzr('add -N inertiatic')
102
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
78
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
79
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
80
self.assertEquals(self.capture('unknowns'), '')
104
82
def test_add_in_versioned(self):
105
83
"""Try to add a file in a versioned directory.
107
85
"bzr add" should do this happily.
109
tree = self.make_branch_and_tree('.')
110
88
self.build_tree(['inertiatic/', 'inertiatic/esp'])
111
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
112
self.run_bzr('add --no-recurse inertiatic')
113
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
114
self.run_bzr('add inertiatic/esp')
115
self.assertEqual(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'), '')
117
95
def test_subdir_add(self):
118
96
"""Add in subdirectory should add only things from there down"""
97
from bzrlib.workingtree import WorkingTree
119
99
eq = self.assertEqual
120
100
ass = self.assertTrue
122
103
t = self.make_branch_and_tree('.')
124
105
self.build_tree(['src/', 'README'])
126
107
eq(sorted(t.unknowns()),
127
108
['README', 'src'])
129
self.run_bzr('add src')
110
self.run_bzr('add', 'src')
131
112
self.build_tree(['src/foo.c'])
133
# add with no arguments in a subdirectory gets only files below that
135
self.run_bzr('add', working_dir='src')
136
self.assertEqual('README\n',
137
self.run_bzr('unknowns', working_dir='src')[0])
138
# reopen to see the new changes
139
t = t.bzrdir.open_workingtree('src')
140
versioned = [path for path, entry in t.iter_entries_by_dir()]
141
self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
143
# add from the parent directory should pick up all file names
145
self.assertEqual(self.run_bzr('unknowns')[0], '')
117
self.assertEquals(self.capture('unknowns'), 'README\n')
118
eq(len(t.read_working_inventory()), 3)
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)
128
self.run_bzr('add', 'missing-file', retcode=3)
153
130
def test_add_from(self):
154
131
base_tree = self.make_branch_and_tree('base')
180
158
new_tree = self.make_branch_and_tree('new')
181
159
self.build_tree(['new/c', 'new/d'])
183
out, err = self.run_bzr('add --file-ids-from ../base/b',
162
out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
185
163
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',
164
self.assertEqualDiff('added c w/ file id from b/c\n'
165
'added d w/ file id from b/d\n',
190
new_tree = new_tree.bzrdir.open_workingtree('new')
168
new_tree.read_working_inventory()
191
169
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
192
170
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
194
172
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(features.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.assertEqual(out, 'adding top.txt\n')
221
def test_add_symlink_to_abspath(self):
222
self.requireFeature(features.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.assertEqual(out, 'adding link\n')
228
def test_add_not_child(self):
229
# https://bugs.launchpad.net/bzr/+bug/98735
230
sr = script.ScriptRunner()
231
self.make_branch_and_tree('tree1')
232
self.make_branch_and_tree('tree2')
233
self.build_tree(['tree1/a', 'tree2/b'])
234
sr.run_script(self, '''
235
$ bzr add tree1/a tree2/b
236
2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
239
def test_add_multiple_files_in_unicode_cwd(self):
240
"""Adding multiple files in a non-ascii cwd, see lp:686611"""
241
self.requireFeature(features.UnicodeFilenameFeature)
242
self.make_branch_and_tree(u"\xA7")
243
self.build_tree([u"\xA7/a", u"\xA7/b"])
244
out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
245
self.assertEqual(out, "adding a\n" "adding b\n")
246
self.assertEqual(err, "")
248
def test_add_skip_large_files(self):
249
"""Test skipping files larger than add.maximum_file_size"""
250
tree = self.make_branch_and_tree('.')
251
self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
252
self.build_tree_contents([('small.txt', '0\n')])
253
self.build_tree_contents([('big.txt', '01234567890123456789\n')])
254
self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
255
tree.branch.get_config_stack().set('add.maximum_file_size', 5)
256
out = self.run_bzr('add')[0]
257
results = sorted(out.rstrip('\n').split('\n'))
258
self.assertEqual(['adding small.txt'], results)
259
# named items never skipped, even if over max
260
out, err = self.run_bzr(["add", "big2.txt"])
261
results = sorted(out.rstrip('\n').split('\n'))
262
self.assertEqual(['adding big2.txt'], results)
263
self.assertEqual("", err)
264
tree.branch.get_config_stack().set('add.maximum_file_size', 30)
265
out = self.run_bzr('add')[0]
266
results = sorted(out.rstrip('\n').split('\n'))
267
self.assertEqual(['adding big.txt'], results)
173
# ensure that --dry-run actually don't add anything
174
base_tree = self.make_branch_and_tree('.')
175
self.build_tree(['spam'])
176
out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
177
self.assertEquals('added spam\n', out)
178
out = self.run_bzr_captured(['added'], retcode=0)[0]
179
self.assertEquals('', out)
added
removed
bzrlib/tests/blackbox/test_add.py
