1
# Copyright (C) 2006, 2007, 2009-2012, 2016 Canonical Ltd
1
# Copyright (C) 2006, 2007, 2009-2012 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
52
52
out = self.run_bzr('add')[0]
53
53
# the ordering is not defined at the moment
54
54
results = sorted(out.rstrip('\n').split('\n'))
55
self.assertEqual(['adding .bzrignore',
55
self.assertEquals(['adding .bzrignore',
57
57
'adding dir/sub.txt',
60
60
out = self.run_bzr('add -v')[0]
61
61
results = sorted(out.rstrip('\n').split('\n'))
62
self.assertEqual(['ignored CVS matching "CVS"'],
62
self.assertEquals(['ignored CVS matching "CVS"'],
65
65
def test_add_quiet_is(self):
69
69
out = self.run_bzr('add -q')[0]
70
70
# the ordering is not defined at the moment
71
71
results = sorted(out.rstrip('\n').split('\n'))
72
self.assertEqual([''], results)
72
self.assertEquals([''], results)
74
74
def test_add_in_unversioned(self):
75
75
"""Try to add a file in an unversioned directory.
79
79
tree = self.make_branch_and_tree('.')
80
80
self.build_tree(['inertiatic/', 'inertiatic/esp'])
81
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
81
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
82
82
self.run_bzr('add inertiatic/esp')
83
self.assertEqual(self.run_bzr('unknowns')[0], '')
83
self.assertEquals(self.run_bzr('unknowns')[0], '')
85
85
# Multiple unversioned parents
86
86
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
87
self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
87
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
88
88
self.run_bzr('add veil/cerpin/taxt')
89
self.assertEqual(self.run_bzr('unknowns')[0], '')
89
self.assertEquals(self.run_bzr('unknowns')[0], '')
91
91
# Check whacky paths work
92
92
self.build_tree(['cicatriz/', 'cicatriz/esp'])
93
self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
93
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
94
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')
95
self.assertEquals(self.run_bzr('unknowns')[0], '')
104
97
def test_add_in_versioned(self):
105
98
"""Try to add a file in a versioned directory.
109
102
tree = self.make_branch_and_tree('.')
110
103
self.build_tree(['inertiatic/', 'inertiatic/esp'])
111
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
104
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
112
105
self.run_bzr('add --no-recurse inertiatic')
113
self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
106
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
114
107
self.run_bzr('add inertiatic/esp')
115
self.assertEqual(self.run_bzr('unknowns')[0], '')
108
self.assertEquals(self.run_bzr('unknowns')[0], '')
117
110
def test_subdir_add(self):
118
111
"""Add in subdirectory should add only things from there down"""
112
from bzrlib.workingtree import WorkingTree
119
114
eq = self.assertEqual
120
115
ass = self.assertTrue
133
128
# add with no arguments in a subdirectory gets only files below that
135
130
self.run_bzr('add', working_dir='src')
136
self.assertEqual('README\n',
131
self.assertEquals('README\n',
137
132
self.run_bzr('unknowns', working_dir='src')[0])
138
133
# reopen to see the new changes
139
134
t = t.bzrdir.open_workingtree('src')
140
135
versioned = [path for path, entry in t.iter_entries_by_dir()]
141
self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
136
self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
143
138
# add from the parent directory should pick up all file names
144
139
self.run_bzr('add')
145
self.assertEqual(self.run_bzr('unknowns')[0], '')
140
self.assertEquals(self.run_bzr('unknowns')[0], '')
146
141
self.run_bzr('check')
148
143
def test_add_missing(self):
216
211
self.build_tree(['source/top.txt'])
217
212
os.symlink('source', 'link')
218
213
out = self.run_bzr(['add', 'link/top.txt'])[0]
219
self.assertEqual(out, 'adding top.txt\n')
214
self.assertEquals(out, 'adding top.txt\n')
221
216
def test_add_symlink_to_abspath(self):
222
217
self.requireFeature(features.SymlinkFeature)
223
218
self.make_branch_and_tree('tree')
224
219
os.symlink(osutils.abspath('target'), 'tree/link')
225
220
out = self.run_bzr(['add', 'tree/link'])[0]
226
self.assertEqual(out, 'adding link\n')
221
self.assertEquals(out, 'adding link\n')
228
223
def test_add_not_child(self):
229
224
# https://bugs.launchpad.net/bzr/+bug/98735
242
237
self.make_branch_and_tree(u"\xA7")
243
238
self.build_tree([u"\xA7/a", u"\xA7/b"])
244
239
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, "")
240
self.assertEquals(out, "adding a\n" "adding b\n")
241
self.assertEquals(err, "")
248
243
def test_add_skip_large_files(self):
249
244
"""Test skipping files larger than add.maximum_file_size"""
252
247
self.build_tree_contents([('small.txt', '0\n')])
253
248
self.build_tree_contents([('big.txt', '01234567890123456789\n')])
254
249
self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
255
tree.branch.get_config_stack().set('add.maximum_file_size', 5)
250
tree.branch.get_config().set_user_option('add.maximum_file_size', 5)
256
251
out = self.run_bzr('add')[0]
257
252
results = sorted(out.rstrip('\n').split('\n'))
258
self.assertEqual(['adding small.txt'], results)
253
self.assertEquals(['adding small.txt'], results)
259
254
# named items never skipped, even if over max
260
255
out, err = self.run_bzr(["add", "big2.txt"])
261
256
results = sorted(out.rstrip('\n').split('\n'))
262
self.assertEqual(['adding big2.txt'], results)
263
self.assertEqual("", err)
257
self.assertEquals(['adding big2.txt'], results)
258
self.assertEquals("", err)
264
259
tree.branch.get_config_stack().set('add.maximum_file_size', 30)
265
260
out = self.run_bzr('add')[0]
266
261
results = sorted(out.rstrip('\n').split('\n'))
267
self.assertEqual(['adding big.txt'], results)
262
self.assertEquals(['adding big.txt'], results)