1
# Copyright (C) 2005, 2006 by 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 import ignores
24
from bzrlib.tests.blackbox import ExternalBase
27
class TestAdd(ExternalBase):
29
def test_add_reports(self):
30
"""add command prints the names of added files."""
31
ignores._set_user_ignores(['./.bazaar'])
34
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
35
self.build_tree_contents([('.bzrignore', 'CVS\n')])
36
out = self.run_bzr_captured(['add'], retcode=0)[0]
37
# the ordering is not defined at the moment
38
results = sorted(out.rstrip('\n').split('\n'))
39
self.assertEquals(['If you wish to add some of these files, please'\
45
'ignored 2 file(s).'],
47
out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
48
results = sorted(out.rstrip('\n').split('\n'))
49
self.assertEquals(['If you wish to add some of these files, please'\
51
'ignored .bazaar matching "./.bazaar"',
52
'ignored CVS matching "CVS"'],
55
def test_add_quiet_is(self):
56
"""add -q does not print the names of added files."""
58
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
59
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
60
# the ordering is not defined at the moment
61
results = sorted(out.rstrip('\n').split('\n'))
62
self.assertEquals([''], results)
64
def test_add_in_unversioned(self):
65
"""Try to add a file in an unversioned directory.
67
"bzr add" should add the parent(s) as necessary.
69
ignores._set_user_ignores(['./.bazaar'])
72
self.build_tree(['inertiatic/', 'inertiatic/esp'])
73
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
74
self.run_bzr('add', 'inertiatic/esp')
75
self.assertEquals(self.capture('unknowns'), '')
77
# Multiple unversioned parents
78
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
79
self.assertEquals(self.capture('unknowns'), 'veil\n')
80
self.run_bzr('add', 'veil/cerpin/taxt')
81
self.assertEquals(self.capture('unknowns'), '')
83
# Check whacky paths work
84
self.build_tree(['cicatriz/', 'cicatriz/esp'])
85
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
86
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
87
self.assertEquals(self.capture('unknowns'), '')
89
def test_add_in_versioned(self):
90
"""Try to add a file in a versioned directory.
92
"bzr add" should do this happily.
94
ignores._set_user_ignores(['./.bazaar'])
97
self.build_tree(['inertiatic/', 'inertiatic/esp'])
98
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
99
self.run_bzr('add', '--no-recurse', 'inertiatic')
100
self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
101
self.run_bzr('add', 'inertiatic/esp')
102
self.assertEquals(self.capture('unknowns'), '')
104
def test_subdir_add(self):
105
"""Add in subdirectory should add only things from there down"""
106
from bzrlib.workingtree import WorkingTree
108
ignores._set_user_ignores(['./.bazaar'])
109
eq = self.assertEqual
110
ass = self.assertTrue
113
t = self.make_branch_and_tree('.')
115
self.build_tree(['src/', 'README'])
117
eq(sorted(t.unknowns()),
120
self.run_bzr('add', 'src')
122
self.build_tree(['src/foo.c'])
127
self.assertEquals(self.capture('unknowns'), 'README\n')
128
eq(len(t.read_working_inventory()), 3)
132
self.assertEquals(self.capture('unknowns'), '')
133
self.run_bzr('check')
135
def test_add_missing(self):
136
"""bzr add foo where foo is missing should error."""
137
self.make_branch_and_tree('.')
138
self.run_bzr('add', 'missing-file', retcode=3)
140
def test_add_from(self):
141
base_tree = self.make_branch_and_tree('base')
142
self.build_tree(['base/a', 'base/b/', 'base/b/c'])
143
base_tree.add(['a', 'b', 'b/c'])
144
base_tree.commit('foo')
146
new_tree = self.make_branch_and_tree('new')
147
self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
150
out, err = self.run_bzr('add', '--file-ids-from', '../base')
151
self.assertEqual('', err)
152
self.assertEqualDiff('added a w/ file id from a\n'
153
'added b w/ file id from b\n'
154
'added b/c w/ file id from b/c\n',
157
new_tree.read_working_inventory()
158
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
159
self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
160
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
162
def test_add_from_subdir(self):
163
base_tree = self.make_branch_and_tree('base')
164
self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
165
base_tree.add(['a', 'b', 'b/c', 'b/d'])
166
base_tree.commit('foo')
168
new_tree = self.make_branch_and_tree('new')
169
self.build_tree(['new/c', 'new/d'])
172
out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
173
self.assertEqual('', err)
174
self.assertEqualDiff('added c w/ file id from b/c\n'
175
'added d w/ file id from b/d\n',
178
new_tree.read_working_inventory()
179
self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
180
self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
182
def test_add_dry_run(self):
183
# ensure that --dry-run actually don't add anything
184
base_tree = self.make_branch_and_tree('.')
185
self.build_tree(['spam'])
186
out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
187
self.assertEquals('added spam\n', out)
188
out = self.run_bzr_captured(['added'], retcode=0)[0]
189
self.assertEquals('', out)
added
removed
bzrlib/tests/blackbox/test_add.py
