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
# Subclasses may override this
29
branch_tree_format = "pack-0.92"
31
def make_branch_and_tree(self, dir):
32
return ExternalBase.make_branch_and_tree(self, dir,
33
format=self.branch_tree_format)
35
def test_add_reports(self):
36
"""add command prints the names of added files."""
37
tree = self.make_branch_and_tree('.')
38
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
39
self.build_tree_contents([('.bzrignore', 'CVS\n')])
40
out = self.run_bzr('add')[0]
41
# the ordering is not defined at the moment
42
results = sorted(out.rstrip('\n').split('\n'))
43
self.assertEquals(['If you wish to add some of these files, please'\
49
'ignored 1 file(s).'],
51
out = self.run_bzr('add -v')[0]
52
results = sorted(out.rstrip('\n').split('\n'))
53
self.assertEquals(['If you wish to add some of these files, please'\
55
'ignored CVS matching "CVS"'],
58
def test_add_quiet_is(self):
59
"""add -q does not print the names of added files."""
60
tree = self.make_branch_and_tree('.')
61
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
62
out = self.run_bzr('add -q')[0]
63
# the ordering is not defined at the moment
64
results = sorted(out.rstrip('\n').split('\n'))
65
self.assertEquals([''], results)
67
def test_add_in_unversioned(self):
68
"""Try to add a file in an unversioned directory.
70
"bzr add" should add the parent(s) as necessary.
72
tree = self.make_branch_and_tree('.')
73
self.build_tree(['inertiatic/', 'inertiatic/esp'])
74
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
75
self.run_bzr('add inertiatic/esp')
76
self.assertEquals(self.run_bzr('unknowns')[0], '')
78
# Multiple unversioned parents
79
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
80
self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
81
self.run_bzr('add veil/cerpin/taxt')
82
self.assertEquals(self.run_bzr('unknowns')[0], '')
84
# Check whacky paths work
85
self.build_tree(['cicatriz/', 'cicatriz/esp'])
86
self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
87
self.run_bzr('add inertiatic/../cicatriz/esp')
88
self.assertEquals(self.run_bzr('unknowns')[0], '')
90
def test_add_in_versioned(self):
91
"""Try to add a file in a versioned directory.
93
"bzr add" should do this happily.
95
tree = self.make_branch_and_tree('.')
96
self.build_tree(['inertiatic/', 'inertiatic/esp'])
97
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
98
self.run_bzr('add --no-recurse inertiatic')
99
self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
100
self.run_bzr('add inertiatic/esp')
101
self.assertEquals(self.run_bzr('unknowns')[0], '')
103
def test_subdir_add(self):
104
"""Add in subdirectory should add only things from there down"""
105
from bzrlib.workingtree import WorkingTree
107
eq = self.assertEqual
108
ass = self.assertTrue
111
t = self.make_branch_and_tree('.')
113
self.build_tree(['src/', 'README'])
115
eq(sorted(t.unknowns()),
118
self.run_bzr('add src')
120
self.build_tree(['src/foo.c'])
122
# add with no arguments in a subdirectory gets only files below that
126
self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
127
# reopen to see the new changes
128
t = t.bzrdir.open_workingtree()
129
versioned = [path for path, entry in t.iter_entries_by_dir()]
130
self.assertEquals(versioned,
131
['', 'src', 'src/foo.c'])
133
# add from the parent directory should pick up all file names
136
self.assertEquals(self.run_bzr('unknowns')[0], '')
137
self.run_bzr('check')
139
def test_add_missing(self):
140
"""bzr add foo where foo is missing should error."""
141
self.make_branch_and_tree('.')
142
self.run_bzr('add missing-file', retcode=3)
144
def test_add_from(self):
145
base_tree = self.make_branch_and_tree('base')
146
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
147
base_tree.add(['a', 'b', 'b/c'])
148
base_tree.commit('foo')
150
new_tree = self.make_branch_and_tree('new')
151
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
154
out, err = self.run_bzr('add --file-ids-from ../base')
155
self.assertEqual('', err)
156
self.assertEqualDiff('adding a w/ file id from a\n'
157
'adding b w/ file id from b\n'
158
'adding b/c w/ file id from b/c\n',
160
new_tree = new_tree.bzrdir.open_workingtree()
161
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
162
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
163
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
165
def test_add_from_subdir(self):
166
base_tree = self.make_branch_and_tree('base')
167
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
168
base_tree.add(['a', 'b', 'b/c', 'b/d'])
169
base_tree.commit('foo')
171
new_tree = self.make_branch_and_tree('new')
172
self.build_tree(['new/c', 'new/d'])
175
out, err = self.run_bzr('add --file-ids-from ../base/b')
176
self.assertEqual('', err)
177
self.assertEqualDiff('adding c w/ file id from b/c\n'
178
'adding d w/ file id from b/d\n',
181
new_tree = new_tree.bzrdir.open_workingtree()
182
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
183
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
185
def test_add_dry_run(self):
186
"""Test a dry run add, make sure nothing is added."""
187
wt = self.make_branch_and_tree('.')
188
self.build_tree(['inertiatic/', 'inertiatic/esp'])
189
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
190
self.run_bzr('add --dry-run')
191
self.assertEqual(list(wt.unknowns()), ['inertiatic'])
193
def test_add_control_dir(self):
194
"""The control dir and its content should be refused."""
195
self.make_branch_and_tree('.')
196
err = self.run_bzr('add .bzr', retcode=3)[1]
197
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
198
err = self.run_bzr('add .bzr/README', retcode=3)[1]
199
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
200
self.build_tree(['.bzr/crescent'])
201
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
202
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
204
def test_add_with_wildcards(self):
205
self.requireFeature(NeedsGlobExpansionFeature)
206
self.make_branch_and_tree('.')
207
self.build_tree(['a1', 'a2', 'b', 'c33'])
208
self.run_bzr(['add', 'a?', 'c*'])
209
self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
211
def test_add_with_wildcards_unicode(self):
212
self.requireFeature(NeedsGlobExpansionFeature)
213
self.make_branch_and_tree('.')
214
self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
215
self.run_bzr(['add', u'\u1234?', u'\u1235*'])
216
self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
219
class TestAddInTreeSupportingViews(TestAdd):
221
branch_tree_format = "development-wt5"
added
removed
bzrlib/tests/blackbox/test_add.py
