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
23
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
26
class TestAdd(ExternalBase):
28
def test_add_reports(self):
29
"""add command prints the names of added files."""
30
tree = self.make_branch_and_tree('.')
31
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
32
self.build_tree_contents([('.bzrignore', 'CVS\n')])
33
out = self.run_bzr('add')[0]
34
# the ordering is not defined at the moment
35
results = sorted(out.rstrip('\n').split('\n'))
36
self.assertEquals(['If you wish to add some of these files, please'\
42
'ignored 1 file(s).'],
44
out = self.run_bzr('add -v')[0]
45
results = sorted(out.rstrip('\n').split('\n'))
46
self.assertEquals(['If you wish to add some of these files, please'\
48
'ignored CVS matching "CVS"'],
51
def test_add_quiet_is(self):
52
"""add -q does not print the names of added files."""
53
tree = self.make_branch_and_tree('.')
54
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
out = self.run_bzr('add -q')[0]
56
# the ordering is not defined at the moment
57
results = sorted(out.rstrip('\n').split('\n'))
58
self.assertEquals([''], results)
60
def test_add_in_unversioned(self):
61
"""Try to add a file in an unversioned directory.
63
"bzr add" should add the parent(s) as necessary.
65
tree = self.make_branch_and_tree('.')
66
self.build_tree(['inertiatic/', 'inertiatic/esp'])
67
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
68
self.run_bzr('add inertiatic/esp')
69
self.assertEquals(self.run_bzr('unknowns')[0], '')
71
# Multiple unversioned parents
72
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
73
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
74
self.run_bzr('add veil/cerpin/taxt')
75
self.assertEquals(self.run_bzr('unknowns')[0], '')
77
# Check whacky paths work
78
self.build_tree(['cicatriz/', 'cicatriz/esp'])
79
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
80
self.run_bzr('add inertiatic/../cicatriz/esp')
81
self.assertEquals(self.run_bzr('unknowns')[0], '')
83
def test_add_in_versioned(self):
84
"""Try to add a file in a versioned directory.
86
"bzr add" should do this happily.
88
tree = self.make_branch_and_tree('.')
89
self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
91
self.run_bzr('add --no-recurse inertiatic')
92
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
93
self.run_bzr('add inertiatic/esp')
94
self.assertEquals(self.run_bzr('unknowns')[0], '')
96
def test_subdir_add(self):
97
"""Add in subdirectory should add only things from there down"""
98
from bzrlib.workingtree import WorkingTree
100
eq = self.assertEqual
101
ass = self.assertTrue
104
t = self.make_branch_and_tree('.')
106
self.build_tree(['src/', 'README'])
108
eq(sorted(t.unknowns()),
111
self.run_bzr('add src')
113
self.build_tree(['src/foo.c'])
115
# add with no arguments in a subdirectory gets only files below that
119
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
120
# reopen to see the new changes
121
t = t.bzrdir.open_workingtree()
122
versioned = [path for path, entry in t.iter_entries_by_dir()]
123
self.assertEquals(versioned,
124
['', 'src', 'src/foo.c'])
126
# add from the parent directory should pick up all file names
129
self.assertEquals(self.run_bzr('unknowns')[0], '')
130
self.run_bzr('check')
132
def test_add_missing(self):
133
"""bzr add foo where foo is missing should error."""
134
self.make_branch_and_tree('.')
135
self.run_bzr('add missing-file', retcode=3)
137
def test_add_from(self):
138
base_tree = self.make_branch_and_tree('base')
139
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
140
base_tree.add(['a', 'b', 'b/c'])
141
base_tree.commit('foo')
143
new_tree = self.make_branch_and_tree('new')
144
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
147
out, err = self.run_bzr('add --file-ids-from ../base')
148
self.assertEqual('', err)
149
self.assertEqualDiff('added a w/ file id from a\n'
150
'added b w/ file id from b\n'
151
'added b/c w/ file id from b/c\n',
153
new_tree = new_tree.bzrdir.open_workingtree()
154
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
155
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
156
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
158
def test_add_from_subdir(self):
159
base_tree = self.make_branch_and_tree('base')
160
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
161
base_tree.add(['a', 'b', 'b/c', 'b/d'])
162
base_tree.commit('foo')
164
new_tree = self.make_branch_and_tree('new')
165
self.build_tree(['new/c', 'new/d'])
168
out, err = self.run_bzr('add --file-ids-from ../base/b')
169
self.assertEqual('', err)
170
self.assertEqualDiff('added c w/ file id from b/c\n'
171
'added d w/ file id from b/d\n',
174
new_tree = new_tree.bzrdir.open_workingtree()
175
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
176
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
178
def test_add_dry_run(self):
179
"""Test a dry run add, make sure nothing is added."""
180
wt = self.make_branch_and_tree('.')
181
self.build_tree(['inertiatic/', 'inertiatic/esp'])
182
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
183
self.run_bzr('add --dry-run')
184
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
186
def test_add_control_dir(self):
187
"""The control dir and its content should be refused."""
188
self.make_branch_and_tree('.')
189
err = self.run_bzr('add .bzr', retcode=3)[1]
190
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
191
err = self.run_bzr('add .bzr/README', retcode=3)[1]
192
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
193
self.build_tree(['.bzr/crescent'])
194
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
195
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
197
def test_add_with_wildcards(self):
198
self.requireFeature(NeedsGlobExpansionFeature)
199
self.make_branch_and_tree('.')
200
self.build_tree(['a1', 'a2', 'b', 'c33'])
201
self.run_bzr(['add', 'a?', 'c*'])
202
self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
204
def test_add_with_wildcards_unicode(self):
205
self.requireFeature(NeedsGlobExpansionFeature)
206
self.make_branch_and_tree('.')
207
self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
208
self.run_bzr(['add', u'\u1234?', u'\u1235*'])
209
self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
added
removed
bzrlib/tests/blackbox/test_add.py
