← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

Deprecate compare_trees and move its body to InterTree.changes_from.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
 
1
import os
 
2
import unittest
 
3
 
 
4
from bzrlib import errors, ignores, osutils
 
5
from bzrlib.add import smart_add, smart_add_tree
 
6
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
 
7
from bzrlib.errors import NoSuchFile
 
8
from bzrlib.inventory import InventoryFile, Inventory
 
9
from bzrlib.workingtree import WorkingTree
 
10
 
 
11
 
 
12
class TestSmartAdd(TestCaseWithTransport):
 
13
 
 
14
    def test_add_dot_from_root(self):
 
15
        """Test adding . from the root of the tree.""" 
 
16
        from bzrlib.add import smart_add
 
17
        paths = ("original/", "original/file1", "original/file2")
 
18
        self.build_tree(paths)
 
19
        wt = self.make_branch_and_tree('.')
 
20
        smart_add_tree(wt, (u".",))
 
21
        for path in paths:
 
22
            self.assertNotEqual(wt.path2id(path), None)
 
23
 
 
24
    def test_add_dot_from_subdir(self):
 
25
        """Test adding . from a subdir of the tree.""" 
 
26
        from bzrlib.add import smart_add
 
27
        paths = ("original/", "original/file1", "original/file2")
 
28
        self.build_tree(paths)
 
29
        wt = self.make_branch_and_tree('.')
 
30
        os.chdir("original")
 
31
        smart_add_tree(wt, (u".",))
 
32
        for path in paths:
 
33
            self.assertNotEqual(wt.path2id(path), None)
 
34
 
 
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')
 
43
        smart_add_tree(wt, ("branch",))
 
44
        for path in paths:
 
45
            self.assertNotEqual(wt.path2id(path), None)
 
46
 
 
47
    def test_add_above_tree_preserves_tree(self):
 
48
        """Test nested trees are not affect by an add above them."""
 
49
        from bzrlib.add import smart_add
 
50
        paths = ("original/", "original/file1", "original/file2")
 
51
        child_paths = ("path",)
 
52
        full_child_paths = ("original/child", "original/child/path")
 
53
        build_paths = ("original/", "original/file1", "original/file2", 
 
54
                       "original/child/", "original/child/path")
 
55
        
 
56
        self.build_tree(build_paths)
 
57
        wt = self.make_branch_and_tree('.')
 
58
        child_tree = self.make_branch_and_tree('original/child')
 
59
        smart_add_tree(wt, (".",))
 
60
        for path in paths:
 
61
            self.assertNotEqual((path, wt.path2id(path)),
 
62
                                (path, None))
 
63
        for path in full_child_paths:
 
64
            self.assertEqual((path, wt.path2id(path)),
 
65
                             (path, None))
 
66
        for path in child_paths:
 
67
            self.assertEqual(child_tree.path2id(path), None)
 
68
 
 
69
    def test_add_paths(self):
 
70
        """Test smart-adding a list of paths."""
 
71
        from bzrlib.add import smart_add
 
72
        paths = ("file1", "file2")
 
73
        self.build_tree(paths)
 
74
        wt = self.make_branch_and_tree('.')
 
75
        smart_add_tree(wt, paths)
 
76
        for path in paths:
 
77
            self.assertNotEqual(wt.path2id(path), None)
 
78
    
 
79
    def test_add_ignored_nested_paths(self):
 
80
        """Test smart-adding a list of paths which includes ignored ones."""
 
81
        wt = self.make_branch_and_tree('.')
 
82
        tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
 
83
        add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
 
84
        expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
 
85
        self.build_tree(tree_shape)
 
86
        smart_add_tree(wt, add_paths)
 
87
        for path in expected_paths:
 
88
            self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
 
89
 
 
90
    def test_save_false(self):
 
91
        """Test smart-adding a path with save set to false."""
 
92
        wt = self.make_branch_and_tree('.')
 
93
        self.build_tree(['file'])
 
94
        smart_add_tree(wt, ['file'], save=False)
 
95
        self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
 
96
        wt.read_working_inventory()
 
97
        self.assertEqual(wt.path2id('file'), None)
 
98
 
 
99
    def test_add_dry_run(self):
 
100
        """Test a dry run add, make sure nothing is added."""
 
101
        from bzrlib.commands import run_bzr
 
102
        ignores._set_user_ignores(['./.bazaar'])
 
103
        eq = self.assertEqual
 
104
        wt = self.make_branch_and_tree('.')
 
105
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
106
        eq(list(wt.unknowns()), ['inertiatic'])
 
107
        self.capture('add --dry-run .')
 
108
        eq(list(wt.unknowns()), ['inertiatic'])
 
109
 
 
110
    def test_add_non_existant(self):
 
111
        """Test smart-adding a file that does not exist."""
 
112
        from bzrlib.add import smart_add
 
113
        wt = self.make_branch_and_tree('.')
 
114
        self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
 
115
 
 
116
    def test_returns_and_ignores(self):
 
117
        """Correctly returns added/ignored files"""
 
118
        from bzrlib.commands import run_bzr
 
119
        wt = self.make_branch_and_tree('.')
 
120
        # The default ignore list includes '*.py[co]', but not CVS
 
121
        ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
 
122
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
 
123
                        'inertiatic/foo.pyc'])
 
124
        added, ignored = smart_add_tree(wt, u'.')
 
125
        self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
 
126
                          added)
 
127
        self.assertSubset(('*.py[co]',), ignored)
 
128
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
 
129
 
 
130
 
 
131
class TestSmartAddTree(TestCaseWithTransport):
 
132
    """Test smart adds with a specified branch."""
 
133
 
 
134
    def test_add_dot_from_root(self):
 
135
        """Test adding . from the root of the tree.""" 
 
136
        paths = ("original/", "original/file1", "original/file2")
 
137
        self.build_tree(paths)
 
138
        wt = self.make_branch_and_tree('.')
 
139
        smart_add_tree(wt, (u".",))
 
140
        for path in paths:
 
141
            self.assertNotEqual(wt.path2id(path), None)
 
142
 
 
143
    def test_add_dot_from_subdir(self):
 
144
        """Test adding . from a subdir of the tree.""" 
 
145
        paths = ("original/", "original/file1", "original/file2")
 
146
        self.build_tree(paths)
 
147
        wt = self.make_branch_and_tree('.')
 
148
        os.chdir("original")
 
149
        smart_add_tree(wt, (u".",))
 
150
        for path in paths:
 
151
            self.assertNotEqual(wt.path2id(path), None)
 
152
 
 
153
    def test_add_tree_from_above_tree(self):
 
154
        """Test adding a tree from above the tree.""" 
 
155
        paths = ("original/", "original/file1", "original/file2")
 
156
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
157
                        "branch/original/file2")
 
158
        self.build_tree(branch_paths)
 
159
        tree = self.make_branch_and_tree('branch')
 
160
        smart_add_tree(tree, ("branch",))
 
161
        for path in paths:
 
162
            self.assertNotEqual(tree.path2id(path), None)
 
163
 
 
164
    def test_add_above_tree_preserves_tree(self):
 
165
        """Test nested trees are not affect by an add above them."""
 
166
        paths = ("original/", "original/file1", "original/file2")
 
167
        child_paths = ("path")
 
168
        full_child_paths = ("original/child", "original/child/path")
 
169
        build_paths = ("original/", "original/file1", "original/file2", 
 
170
                       "original/child/", "original/child/path")
 
171
        self.build_tree(build_paths)
 
172
        tree = self.make_branch_and_tree('.')
 
173
        child_tree = self.make_branch_and_tree("original/child")
 
174
        smart_add_tree(tree, (u".",))
 
175
        for path in paths:
 
176
            self.assertNotEqual((path, tree.path2id(path)),
 
177
                                (path, None))
 
178
        for path in full_child_paths:
 
179
            self.assertEqual((path, tree.path2id(path)),
 
180
                             (path, None))
 
181
        for path in child_paths:
 
182
            self.assertEqual(child_tree.path2id(path), None)
 
183
 
 
184
    def test_add_paths(self):
 
185
        """Test smart-adding a list of paths."""
 
186
        paths = ("file1", "file2")
 
187
        self.build_tree(paths)
 
188
        wt = self.make_branch_and_tree('.')
 
189
        smart_add_tree(wt, paths)
 
190
        for path in paths:
 
191
            self.assertNotEqual(wt.path2id(path), None)
 
192
 
 
193
    def test_add_multiple_dirs(self):
 
194
        """Test smart adding multiple directories at once."""
 
195
        added_paths = ['file1', 'file2',
 
196
                       'dir1/', 'dir1/file3',
 
197
                       'dir1/subdir2/', 'dir1/subdir2/file4',
 
198
                       'dir2/', 'dir2/file5',
 
199
                      ]
 
200
        not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
 
201
        self.build_tree(added_paths)
 
202
        self.build_tree(not_added)
 
203
 
 
204
        wt = self.make_branch_and_tree('.')
 
205
        smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
 
206
 
 
207
        for path in added_paths:
 
208
            self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
 
209
                    'Failed to add path: %s' % (path,))
 
210
        for path in not_added:
 
211
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
 
212
                    'Accidentally added path: %s' % (path,))
 
213
 
 
214
 
 
215
class TestAddNonNormalized(TestCaseWithTransport):
 
216
 
 
217
    def make(self):
 
218
        try:
 
219
            self.build_tree([u'a\u030a'])
 
220
        except UnicodeError:
 
221
            raise TestSkipped('Filesystem cannot create unicode filenames')
 
222
 
 
223
        self.wt = self.make_branch_and_tree('.')
 
224
 
 
225
    def test_accessible_explicit(self):
 
226
        self.make()
 
227
        orig = osutils.normalized_filename
 
228
        osutils.normalized_filename = osutils._accessible_normalized_filename
 
229
        try:
 
230
            smart_add_tree(self.wt, [u'a\u030a'])
 
231
            self.assertEqual([('', 'root_directory'), (u'\xe5', 'file')],
 
232
                    [(path, ie.kind) for path,ie in 
 
233
                        self.wt.inventory.iter_entries()])
 
234
        finally:
 
235
            osutils.normalized_filename = orig
 
236
 
 
237
    def test_accessible_implicit(self):
 
238
        self.make()
 
239
        orig = osutils.normalized_filename
 
240
        osutils.normalized_filename = osutils._accessible_normalized_filename
 
241
        try:
 
242
            smart_add_tree(self.wt, [])
 
243
            self.assertEqual([('', 'root_directory'), (u'\xe5', 'file')],
 
244
                    [(path, ie.kind) for path,ie in 
 
245
                        self.wt.inventory.iter_entries()])
 
246
        finally:
 
247
            osutils.normalized_filename = orig
 
248
 
 
249
    def test_inaccessible_explicit(self):
 
250
        self.make()
 
251
        orig = osutils.normalized_filename
 
252
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
 
253
        try:
 
254
            self.assertRaises(errors.InvalidNormalization,
 
255
                    smart_add_tree, self.wt, [u'a\u030a'])
 
256
        finally:
 
257
            osutils.normalized_filename = orig
 
258
 
 
259
    def test_inaccessible_implicit(self):
 
260
        self.make()
 
261
        orig = osutils.normalized_filename
 
262
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
 
263
        try:
 
264
            # TODO: jam 20060701 In the future, this should probably
 
265
            #       just ignore files that don't fit the normalization
 
266
            #       rules, rather than exploding
 
267
            self.assertRaises(errors.InvalidNormalization,
 
268
                    smart_add_tree, self.wt, [])
 
269
        finally:
 
270
            osutils.normalized_filename = orig
 
271
 
 
272
 
 
273
class TestAddActions(TestCase):
 
274
 
 
275
    def test_quiet(self):
 
276
        self.run_action("")
 
277
 
 
278
    def test__print(self):
 
279
        self.run_action("added path\n")
 
280
 
 
281
    def run_action(self, output):
 
282
        from bzrlib.add import AddAction, FastPath
 
283
        from cStringIO import StringIO
 
284
        inv = Inventory()
 
285
        stdout = StringIO()
 
286
        action = AddAction(to_file=stdout, should_print=bool(output))
 
287
 
 
288
        self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
 
289
        self.assertEqual(stdout.getvalue(), output)