4
from bzrlib.tests import TestCaseInTempDir, TestCase
5
from bzrlib.branch import Branch
6
from bzrlib.errors import NotBranchError, NoSuchFile
7
from bzrlib.inventory import InventoryFile, Inventory
8
from bzrlib.workingtree import WorkingTree
9
from bzrlib.add import smart_add
11
class TestSmartAdd(TestCaseInTempDir):
13
def test_add_dot_from_root(self):
14
"""Test adding . from the root of the tree."""
15
from bzrlib.add import smart_add
16
paths = ("original/", "original/file1", "original/file2")
17
self.build_tree(paths)
18
branch = Branch.initialize(u".")
21
self.assertNotEqual(branch.working_tree().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
branch = Branch.initialize(u".")
32
self.assertNotEqual(branch.working_tree().path2id(path), None)
34
def test_add_tree_from_above_tree(self):
35
"""Test adding a tree from above the tree."""
36
from bzrlib.add import smart_add
37
paths = ("original/", "original/file1", "original/file2")
38
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
39
"branch/original/file2")
40
self.build_tree(branch_paths)
41
branch = Branch.initialize("branch")
42
smart_add(("branch",))
44
self.assertNotEqual(branch.working_tree().path2id(path), None)
46
def test_add_above_tree_preserves_tree(self):
47
"""Test nested trees are not affect by an add above them."""
48
from bzrlib.add import smart_add
49
paths = ("original/", "original/file1", "original/file2")
50
child_paths = ("path",)
51
full_child_paths = ("original/child", "original/child/path")
52
build_paths = ("original/", "original/file1", "original/file2",
53
"original/child/", "original/child/path")
55
self.build_tree(build_paths)
56
branch = Branch.initialize(u".")
57
child_branch = Branch.initialize("original/child")
60
self.assertNotEqual((path, branch.working_tree().path2id(path)),
62
for path in full_child_paths:
63
self.assertEqual((path, branch.working_tree().path2id(path)),
65
for path in child_paths:
66
self.assertEqual(child_branch.working_tree().path2id(path), None)
68
def test_add_paths(self):
69
"""Test smart-adding a list of paths."""
70
from bzrlib.add import smart_add
71
paths = ("file1", "file2")
72
self.build_tree(paths)
73
branch = Branch.initialize(u".")
76
self.assertNotEqual(branch.working_tree().path2id(path), None)
78
def test_add_dry_run(self):
79
"""Test a dry run add, make sure nothing is added."""
80
from bzrlib.commands import run_bzr
82
b = Branch.initialize(u'.')
84
self.build_tree(['inertiatic/', 'inertiatic/esp'])
85
eq(list(t.unknowns()), ['inertiatic'])
86
self.capture('add --dry-run .')
87
eq(list(t.unknowns()), ['inertiatic'])
89
def test_add_non_existant(self):
90
"""Test smart-adding a file that does not exist."""
91
from bzrlib.add import smart_add
92
branch = Branch.initialize(u".")
93
self.assertRaises(NoSuchFile, smart_add, 'non-existant-file')
95
def test_returns(self):
96
"""Correctly returns added/ignored files"""
97
from bzrlib.commands import run_bzr
98
b = Branch.initialize(u'.')
100
self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
101
'inertiatic/foo.pyc'])
102
added, ignored = smart_add(u'.')
103
self.AssertSubset(('inertiatic', 'inertiatic/esp'), added)
104
self.AssertSubset(('CVS', '*.py[oc]'), ignored)
105
self.AssertSubset(('inertiatic/CVS',), ignored['CVS'])
106
self.AssertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
109
class TestSmartAddBranch(TestCaseInTempDir):
110
"""Test smart adds with a specified branch."""
112
def test_add_dot_from_root(self):
113
"""Test adding . from the root of the tree."""
114
from bzrlib.add import smart_add_tree
115
paths = ("original/", "original/file1", "original/file2")
116
self.build_tree(paths)
117
Branch.initialize(u".")
119
smart_add_tree(tree, (u".",))
121
self.assertNotEqual(tree.path2id(path), None)
123
def test_add_dot_from_subdir(self):
124
"""Test adding . from a subdir of the tree."""
125
from bzrlib.add import smart_add_tree
126
paths = ("original/", "original/file1", "original/file2")
127
self.build_tree(paths)
128
Branch.initialize(u".")
131
smart_add_tree(tree, (u".",))
133
self.assertNotEqual(tree.path2id(path), None)
135
def test_add_tree_from_above_tree(self):
136
"""Test adding a tree from above the tree."""
137
from bzrlib.add import smart_add_tree
138
paths = ("original/", "original/file1", "original/file2")
139
branch_paths = ("branch/", "branch/original/", "branch/original/file1",
140
"branch/original/file2")
141
self.build_tree(branch_paths)
142
Branch.initialize("branch")
143
tree = WorkingTree("branch")
144
smart_add_tree(tree, ("branch",))
146
self.assertNotEqual(tree.path2id(path), None)
148
def test_add_above_tree_preserves_tree(self):
149
"""Test nested trees are not affect by an add above them."""
150
from bzrlib.add import smart_add_tree
151
paths = ("original/", "original/file1", "original/file2")
152
child_paths = ("path")
153
full_child_paths = ("original/child", "original/child/path")
154
build_paths = ("original/", "original/file1", "original/file2",
155
"original/child/", "original/child/path")
156
self.build_tree(build_paths)
157
Branch.initialize(u".")
159
child_branch = Branch.initialize("original/child")
160
smart_add_tree(tree, (u".",))
162
self.assertNotEqual((path, tree.path2id(path)),
164
for path in full_child_paths:
165
self.assertEqual((path, tree.path2id(path)),
167
for path in child_paths:
168
self.assertEqual(child_branch.working_tree().path2id(path), None)
170
def test_add_paths(self):
171
"""Test smart-adding a list of paths."""
172
from bzrlib.add import smart_add_tree
173
paths = ("file1", "file2")
174
self.build_tree(paths)
175
Branch.initialize(u".")
177
smart_add_tree(tree, paths)
179
self.assertNotEqual(tree.path2id(path), None)
182
class TestAddActions(TestCaseInTempDir):
185
from bzrlib.add import add_action_null
186
self.run_action(add_action_null, "", False)
189
self.entry = InventoryFile("id", "name", None)
190
from bzrlib.add import add_action_add
191
self.run_action(add_action_add, "", True)
193
def test_add_and_print(self):
194
from bzrlib.add import add_action_add_and_print
195
self.run_action(add_action_add_and_print, "added path\n", True)
197
def test_print(self):
198
from bzrlib.add import add_action_print
199
self.run_action(add_action_print, "added path\n", False)
201
def run_action(self, action, output, should_add):
202
from StringIO import StringIO
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)
147
class TestAddActions(TestCase):
149
def test_quiet(self):
152
def test__print(self):
153
self.run_action("added path\n")
155
def run_action(self, output):
156
from bzrlib.add import AddAction
157
from bzrlib.mutabletree import _FastPath
203
158
inv = Inventory()
204
159
stdout = StringIO()
160
action = AddAction(to_file=stdout, should_print=bool(output))
206
self.apply_redirected(None, stdout, None, action, inv, 'path', 'file')
162
self.apply_redirected(None, stdout, None, action, inv, None,
163
_FastPath('path'), 'file')
207
164
self.assertEqual(stdout.getvalue(), output)
210
self.assertNotEqual(inv.path2id('path'), None)
212
self.assertEqual(inv.path2id('path'), None)
added
removed
bzrlib/tests/test_smart_add.py
