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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Tests of the 'bzr add' command."""
22
from bzrlib.tests.blackbox import ExternalBase
25
class TestAdd(ExternalBase):
27
def test_add_reports(self):
28
"""add command prints the names of added files."""
30
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
31
self.build_tree_contents([('.bzrignore', 'CVS\n')])
32
out = self.run_bzr('add')[0]
33
# the ordering is not defined at the moment
34
results = sorted(out.rstrip('\n').split('\n'))
35
self.assertEquals(['If you wish to add some of these files, please'\
41
'ignored 1 file(s).'],
43
out = self.run_bzr('add -v')[0]
44
results = sorted(out.rstrip('\n').split('\n'))
45
self.assertEquals(['If you wish to add some of these files, please'\
47
'ignored CVS matching "CVS"'],
50
def test_add_quiet_is(self):
51
"""add -q does not print the names of added files."""
53
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
54
out = self.run_bzr('add -q')[0]
55
# the ordering is not defined at the moment
56
results = sorted(out.rstrip('\n').split('\n'))
57
self.assertEquals([''], results)
59
def test_add_in_unversioned(self):
60
"""Try to add a file in an unversioned directory.
62
"bzr add" should add the parent(s) as necessary.
65
self.build_tree(['inertiatic/', 'inertiatic/esp'])
66
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
67
self.run_bzr('add inertiatic/esp')
68
self.assertEquals(self.run_bzr('unknowns')[0], '')
70
# Multiple unversioned parents
71
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
72
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
73
self.run_bzr('add veil/cerpin/taxt')
74
self.assertEquals(self.run_bzr('unknowns')[0], '')
76
# Check whacky paths work
77
self.build_tree(['cicatriz/', 'cicatriz/esp'])
78
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
79
self.run_bzr('add inertiatic/../cicatriz/esp')
80
self.assertEquals(self.run_bzr('unknowns')[0], '')
82
def test_add_in_versioned(self):
83
"""Try to add a file in a versioned directory.
85
"bzr add" should do this happily.
88
self.build_tree(['inertiatic/', 'inertiatic/esp'])
89
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
90
self.run_bzr('add --no-recurse inertiatic')
91
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
92
self.run_bzr('add inertiatic/esp')
93
self.assertEquals(self.run_bzr('unknowns')[0], '')
95
def test_subdir_add(self):
96
"""Add in subdirectory should add only things from there down"""
97
from bzrlib.workingtree import WorkingTree
100
ass = self.assertTrue
103
t = self.make_branch_and_tree('.')
105
self.build_tree(['src/', 'README'])
107
eq(sorted(t.unknowns()),
110
self.run_bzr('add src')
112
self.build_tree(['src/foo.c'])
114
# add with no arguments in a subdirectory gets only files below that
118
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
119
# reopen to see the new changes
120
t = t.bzrdir.open_workingtree()
121
versioned = [path for path, entry in t.iter_entries_by_dir()]
122
self.assertEquals(versioned,
123
['', 'src', 'src/foo.c'])
125
# add from the parent directory should pick up all file names
128
self.assertEquals(self.run_bzr('unknowns')[0], '')
129
self.run_bzr('check')
131
def test_add_missing(self):
132
"""bzr add foo where foo is missing should error."""
133
self.make_branch_and_tree('.')
134
self.run_bzr('add missing-file', retcode=3)
136
def test_add_from(self):
137
base_tree = self.make_branch_and_tree('base')
138
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
139
base_tree.add(['a', 'b', 'b/c'])
140
base_tree.commit('foo')
142
new_tree = self.make_branch_and_tree('new')
143
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
146
out, err = self.run_bzr('add --file-ids-from ../base')
147
self.assertEqual('', err)
148
self.assertEqualDiff('added a w/ file id from a\n'
149
'added b w/ file id from b\n'
150
'added b/c w/ file id from b/c\n',
152
new_tree = new_tree.bzrdir.open_workingtree()
153
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
154
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
155
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
157
def test_add_from_subdir(self):
158
base_tree = self.make_branch_and_tree('base')
159
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
160
base_tree.add(['a', 'b', 'b/c', 'b/d'])
161
base_tree.commit('foo')
163
new_tree = self.make_branch_and_tree('new')
164
self.build_tree(['new/c', 'new/d'])
167
out, err = self.run_bzr('add --file-ids-from ../base/b')
168
self.assertEqual('', err)
169
self.assertEqualDiff('added c w/ file id from b/c\n'
170
'added d w/ file id from b/d\n',
173
new_tree = new_tree.bzrdir.open_workingtree()
174
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
175
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
177
def test_add_dry_run(self):
178
"""Test a dry run add, make sure nothing is added."""
179
wt = self.make_branch_and_tree('.')
180
self.build_tree(['inertiatic/', 'inertiatic/esp'])
181
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
182
self.run_bzr('add --dry-run')
183
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
185
def test_add_control_dir(self):
186
"""The control dir and its content should be refused."""
187
self.make_branch_and_tree('.')
188
err = self.run_bzr('add .bzr', retcode=3)[1]
189
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
190
err = self.run_bzr('add .bzr/README', retcode=3)[1]
191
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
192
self.build_tree(['.bzr/crescent'])
193
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
194
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
added
removed
bzrlib/tests/blackbox/test_add.py
