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
17
from cStringIO import StringIO
19
from bzrlib import osutils
20
from bzrlib.add import (
24
from bzrlib.tests import TestCase, TestCaseWithTransport
25
from bzrlib.inventory import Inventory
28
class AddCustomIDAction(AddAction):
30
def __call__(self, inv, parent_ie, path, kind):
31
# The first part just logs if appropriate
32
# Now generate a custom id
33
file_id = osutils.safe_file_id(kind + '-'
34
+ path.raw_path.replace('/', '%'),
37
self._to_file.write('added %s with id %s\n'
38
% (path.raw_path, file_id))
42
class TestAddFrom(TestCaseWithTransport):
43
"""Tests for AddFromBaseAction"""
45
def make_base_tree(self):
46
self.base_tree = self.make_branch_and_tree('base')
47
self.build_tree(['base/a', 'base/b',
48
'base/dir/', 'base/dir/a',
52
self.base_tree.add(['a', 'b', 'dir', 'dir/a',
53
'dir/subdir', 'dir/subdir/b'])
54
self.base_tree.commit('creating initial tree.')
56
def add_helper(self, base_tree, base_path, new_tree, file_list,
63
action = AddFromBaseAction(base_tree, base_path,
65
should_print=should_print)
66
new_tree.smart_add(file_list, action=action)
71
return to_file.getvalue()
73
def test_copy_all(self):
75
new_tree = self.make_branch_and_tree('new')
81
self.build_tree(['new/' + fn for fn in files])
82
self.add_helper(self.base_tree, '', new_tree, ['new'])
85
base_file_id = self.base_tree.path2id(fn)
86
new_file_id = new_tree.path2id(fn)
87
self.assertEqual(base_file_id, new_file_id)
89
def test_copy_from_dir(self):
91
new_tree = self.make_branch_and_tree('new')
93
self.build_tree(['new/a', 'new/b', 'new/c',
94
'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
95
new_tree.set_root_id(self.base_tree.get_root_id())
96
self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
98
# We know 'a' and 'b' exist in the root, and they are being added
99
# in a new 'root'. Since ROOT ids have been set as the same, we will
101
self.assertEqual(self.base_tree.path2id('a'),
102
new_tree.path2id('a'))
103
self.assertEqual(self.base_tree.path2id('b'),
104
new_tree.path2id('b'))
106
# Because we specified 'dir/' as the base path, and we have
107
# nothing named 'subdir' in the base tree, we should grab the
109
self.assertEqual(self.base_tree.path2id('dir/subdir'),
110
new_tree.path2id('subdir'))
111
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
112
new_tree.path2id('subdir/b'))
114
# These should get newly generated ids
115
c_id = new_tree.path2id('c')
116
self.assertNotEqual(None, c_id)
117
self.base_tree.lock_read()
118
self.addCleanup(self.base_tree.unlock)
119
self.failIf(c_id in self.base_tree)
121
d_id = new_tree.path2id('subdir/d')
122
self.assertNotEqual(None, d_id)
123
self.failIf(d_id in self.base_tree)
125
def test_copy_existing_dir(self):
126
self.make_base_tree()
127
new_tree = self.make_branch_and_tree('new')
128
self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
130
subdir_file_id = self.base_tree.path2id('dir/subdir')
131
new_tree.add(['subby'], [subdir_file_id])
132
self.add_helper(self.base_tree, '', new_tree, ['new'])
133
# Because 'subby' already points to subdir, we should add
134
# 'b' with the same id
135
self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
136
new_tree.path2id('subby/b'))
138
# 'subby/a' should be added with a new id because there is no
139
# matching path or child of 'subby'.
140
a_id = new_tree.path2id('subby/a')
141
self.assertNotEqual(None, a_id)
142
self.base_tree.lock_read()
143
self.addCleanup(self.base_tree.unlock)
144
self.failIf(a_id in self.base_tree)
4
from bzrlib.add import smart_add, smart_add_tree
5
from bzrlib.tests import TestCaseWithTransport, TestCase
6
from bzrlib.errors import NoSuchFile
7
from bzrlib.inventory import InventoryFile, Inventory
8
from bzrlib.workingtree import WorkingTree
10
class TestSmartAdd(TestCaseWithTransport):
12
def test_add_dot_from_root(self):
13
"""Test adding . from the root of the tree."""
14
from bzrlib.add import smart_add
15
paths = ("original/", "original/file1", "original/file2")
16
self.build_tree(paths)
17
wt = self.make_branch_and_tree('.')
19
smart_add_tree(wt, (u".",))
21
self.assertNotEqual(wt.path2id(path), None)
23
def test_add_dot_from_subdir(self):
24
"""Test adding . from a subdir of the tree."""
25
from bzrlib.add import smart_add
26
paths = ("original/", "original/file1", "original/file2")
27
self.build_tree(paths)
28
wt = self.make_branch_and_tree('.')
31
smart_add_tree(wt, (u".",))
33
self.assertNotEqual(wt.path2id(path), None)
35
def test_add_tree_from_above_tree(self):
36
"""Test adding a tree from above the tree."""
37
from bzrlib.add import smart_add
38
paths = ("original/", "original/file1", "original/file2")
39
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
40
"branch/original/file2")
41
self.build_tree(branch_paths)
42
wt = self.make_branch_and_tree('branch')
44
smart_add_tree(wt, ("branch",))
46
self.assertNotEqual(wt.path2id(path), None)
48
def test_add_above_tree_preserves_tree(self):
49
"""Test nested trees are not affect by an add above them."""
50
from bzrlib.add import smart_add
51
paths = ("original/", "original/file1", "original/file2")
52
child_paths = ("path",)
53
full_child_paths = ("original/child", "original/child/path")
54
build_paths = ("original/", "original/file1", "original/file2",
55
"original/child/", "original/child/path")
57
self.build_tree(build_paths)
58
wt = self.make_branch_and_tree('.')
60
child_tree = self.make_branch_and_tree('original/child')
61
smart_add_tree(wt, (".",))
63
self.assertNotEqual((path, wt.path2id(path)),
65
for path in full_child_paths:
66
self.assertEqual((path, wt.path2id(path)),
68
for path in child_paths:
69
self.assertEqual(child_tree.path2id(path), None)
71
def test_add_paths(self):
72
"""Test smart-adding a list of paths."""
73
from bzrlib.add import smart_add
74
paths = ("file1", "file2")
75
self.build_tree(paths)
76
wt = self.make_branch_and_tree('.')
77
smart_add_tree(wt, paths)
79
self.assertNotEqual(wt.path2id(path), None)
81
def test_add_ignored_nested_paths(self):
82
"""Test smart-adding a list of paths which includes ignored ones."""
83
wt = self.make_branch_and_tree('.')
84
tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
85
add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
86
expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
87
self.build_tree(tree_shape)
88
smart_add_tree(wt, add_paths)
89
for path in expected_paths:
90
self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
92
def test_save_false(self):
93
"""Test smart-adding a path with save set to false."""
94
wt = self.make_branch_and_tree('.')
95
self.build_tree(['file'])
96
smart_add_tree(wt, ['file'], save=False)
97
self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
98
wt.read_working_inventory()
99
self.assertEqual(wt.path2id('file'), None)
101
def test_add_dry_run(self):
102
"""Test a dry run add, make sure nothing is added."""
103
from bzrlib.commands import run_bzr
104
eq = self.assertEqual
105
wt = self.make_branch_and_tree('.')
107
self.build_tree(['inertiatic/', 'inertiatic/esp'])
108
eq(list(wt.unknowns()), ['inertiatic'])
109
self.capture('add --dry-run .')
110
eq(list(wt.unknowns()), ['inertiatic'])
112
def test_add_non_existant(self):
113
"""Test smart-adding a file that does not exist."""
114
from bzrlib.add import smart_add
115
wt = self.make_branch_and_tree('.')
117
self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
119
def test_returns_and_ignores(self):
120
"""Correctly returns added/ignored files"""
121
from bzrlib.commands import run_bzr
122
wt = self.make_branch_and_tree('.')
124
# no files should be ignored by default, so we need to create
125
# an ignore rule - we create one for the pyc files, which means
126
# CVS should not be ignored.
127
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
128
'inertiatic/foo.pyc'])
129
self.build_tree_contents([('.bzrignore', '*.py[oc]\n')])
130
added, ignored = smart_add_tree(wt, u'.')
131
self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
133
self.assertSubset(('*.py[oc]',), ignored)
134
self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
137
class TestSmartAddTree(TestCaseWithTransport):
138
"""Test smart adds with a specified branch."""
140
def test_add_dot_from_root(self):
141
"""Test adding . from the root of the tree."""
142
paths = ("original/", "original/file1", "original/file2")
143
self.build_tree(paths)
144
wt = self.make_branch_and_tree('.')
146
smart_add_tree(wt, (u".",))
148
self.assertNotEqual(wt.path2id(path), None)
150
def test_add_dot_from_subdir(self):
151
"""Test adding . from a subdir of the tree."""
152
from bzrlib.add import smart_add_tree
153
paths = ("original/", "original/file1", "original/file2")
154
self.build_tree(paths)
155
wt = self.make_branch_and_tree('.')
158
smart_add_tree(wt, (u".",))
160
self.assertNotEqual(wt.path2id(path), None)
162
def test_add_tree_from_above_tree(self):
163
"""Test adding a tree from above the tree."""
164
from bzrlib.add import smart_add_tree
165
paths = ("original/", "original/file1", "original/file2")
166
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
167
"branch/original/file2")
168
self.build_tree(branch_paths)
169
tree = self.make_branch_and_tree('branch')
171
smart_add_tree(tree, ("branch",))
173
self.assertNotEqual(tree.path2id(path), None)
175
def test_add_above_tree_preserves_tree(self):
176
"""Test nested trees are not affect by an add above them."""
177
from bzrlib.add import smart_add_tree
178
paths = ("original/", "original/file1", "original/file2")
179
child_paths = ("path")
180
full_child_paths = ("original/child", "original/child/path")
181
build_paths = ("original/", "original/file1", "original/file2",
182
"original/child/", "original/child/path")
183
self.build_tree(build_paths)
184
tree = self.make_branch_and_tree('.')
186
child_tree = self.make_branch_and_tree("original/child")
187
smart_add_tree(tree, (u".",))
189
self.assertNotEqual((path, tree.path2id(path)),
191
for path in full_child_paths:
192
self.assertEqual((path, tree.path2id(path)),
194
for path in child_paths:
195
self.assertEqual(child_tree.path2id(path), None)
197
def test_add_paths(self):
198
"""Test smart-adding a list of paths."""
199
from bzrlib.add import smart_add_tree
200
paths = ("file1", "file2")
201
self.build_tree(paths)
202
wt = self.make_branch_and_tree('.')
204
smart_add_tree(wt, paths)
206
self.assertNotEqual(wt.path2id(path), None)
147
209
class TestAddActions(TestCase):
added
removed
bzrlib/tests/test_smart_add.py
