← 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

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
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.
7
 
#
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.
12
 
#
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
16
 
 
17
 
from cStringIO import StringIO
18
1
import os
19
2
import unittest
20
3
 
21
 
from bzrlib import errors, ignores, osutils
22
 
from bzrlib.add import (
23
 
    AddAction,
24
 
    AddFromBaseAction,
25
 
    smart_add,
26
 
    smart_add_tree,
27
 
    )
28
 
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
29
 
from bzrlib.errors import NoSuchFile
 
4
from bzrlib.add import smart_add, smart_add_tree
 
5
from bzrlib.tests import TestCaseWithTransport, TestCase
 
6
from bzrlib.branch import Branch
 
7
from bzrlib.errors import NotBranchError, NoSuchFile
30
8
from bzrlib.inventory import InventoryFile, Inventory
31
9
from bzrlib.workingtree import WorkingTree
32
10
 
33
 
 
34
11
class TestSmartAdd(TestCaseWithTransport):
35
12
 
36
13
    def test_add_dot_from_root(self):
39
16
        paths = ("original/", "original/file1", "original/file2")
40
17
        self.build_tree(paths)
41
18
        wt = self.make_branch_and_tree('.')
 
19
        branch = wt.branch
42
20
        smart_add_tree(wt, (u".",))
43
21
        for path in paths:
44
22
            self.assertNotEqual(wt.path2id(path), None)
49
27
        paths = ("original/", "original/file1", "original/file2")
50
28
        self.build_tree(paths)
51
29
        wt = self.make_branch_and_tree('.')
 
30
        branch = wt.branch
52
31
        os.chdir("original")
53
32
        smart_add_tree(wt, (u".",))
54
33
        for path in paths:
62
41
                        "branch/original/file2")
63
42
        self.build_tree(branch_paths)
64
43
        wt = self.make_branch_and_tree('branch')
 
44
        branch = wt.branch
65
45
        smart_add_tree(wt, ("branch",))
66
46
        for path in paths:
67
47
            self.assertNotEqual(wt.path2id(path), None)
77
57
        
78
58
        self.build_tree(build_paths)
79
59
        wt = self.make_branch_and_tree('.')
 
60
        branch = wt.branch
80
61
        child_tree = self.make_branch_and_tree('original/child')
81
 
        smart_add_tree(wt, (".",))
 
62
        smart_add_tree(wt, (u".",))
82
63
        for path in paths:
83
64
            self.assertNotEqual((path, wt.path2id(path)),
84
65
                                (path, None))
94
75
        paths = ("file1", "file2")
95
76
        self.build_tree(paths)
96
77
        wt = self.make_branch_and_tree('.')
 
78
        branch = wt.branch
97
79
        smart_add_tree(wt, paths)
98
80
        for path in paths:
99
81
            self.assertNotEqual(wt.path2id(path), None)
100
 
    
101
 
    def test_add_ignored_nested_paths(self):
102
 
        """Test smart-adding a list of paths which includes ignored ones."""
103
 
        wt = self.make_branch_and_tree('.')
104
 
        tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
105
 
        add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
106
 
        expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
107
 
        self.build_tree(tree_shape)
108
 
        smart_add_tree(wt, add_paths)
109
 
        for path in expected_paths:
110
 
            self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
111
 
 
112
 
    def test_save_false(self):
113
 
        """Test smart-adding a path with save set to false."""
114
 
        wt = self.make_branch_and_tree('.')
115
 
        self.build_tree(['file'])
116
 
        smart_add_tree(wt, ['file'], save=False)
117
 
        self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
118
 
        wt.read_working_inventory()
119
 
        self.assertEqual(wt.path2id('file'), None)
120
82
 
121
83
    def test_add_dry_run(self):
122
84
        """Test a dry run add, make sure nothing is added."""
123
85
        from bzrlib.commands import run_bzr
124
 
        ignores._set_user_ignores(['./.bazaar'])
125
86
        eq = self.assertEqual
126
87
        wt = self.make_branch_and_tree('.')
 
88
        branch = wt.branch
127
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
128
90
        eq(list(wt.unknowns()), ['inertiatic'])
129
91
        self.capture('add --dry-run .')
133
95
        """Test smart-adding a file that does not exist."""
134
96
        from bzrlib.add import smart_add
135
97
        wt = self.make_branch_and_tree('.')
 
98
        branch = wt.branch
136
99
        self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
137
100
 
138
 
    def test_returns_and_ignores(self):
 
101
    def test_returns(self):
139
102
        """Correctly returns added/ignored files"""
140
103
        from bzrlib.commands import run_bzr
141
104
        wt = self.make_branch_and_tree('.')
142
 
        # The default ignore list includes '*.py[co]', but not CVS
143
 
        ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
144
 
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
 
105
        branch = wt.branch
 
106
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS', 
145
107
                        'inertiatic/foo.pyc'])
146
108
        added, ignored = smart_add_tree(wt, u'.')
147
 
        self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
148
 
                          added)
149
 
        self.assertSubset(('*.py[co]',), ignored)
150
 
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
151
 
 
152
 
 
153
 
class AddCustomIDAction(AddAction):
154
 
 
155
 
    def __call__(self, inv, parent_ie, path, kind):
156
 
        # The first part just logs if appropriate
157
 
        # Now generate a custom id
158
 
        file_id = kind + '-' + path.raw_path.replace('/', '%')
159
 
        if self.should_print:
160
 
            self._to_file.write('added %s with id %s\n' 
161
 
                                % (path.raw_path, file_id))
162
 
        return file_id
163
 
 
164
 
 
165
 
class TestSmartAddTree(TestCaseWithTransport):
 
109
        self.AssertSubset(('inertiatic', 'inertiatic/esp'), added)
 
110
        self.AssertSubset(('CVS', '*.py[oc]'), ignored)
 
111
        self.AssertSubset(('inertiatic/CVS',), ignored['CVS'])
 
112
        self.AssertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
 
113
 
 
114
 
 
115
class TestSmartAddBranch(TestCaseWithTransport):
166
116
    """Test smart adds with a specified branch."""
167
117
 
168
118
    def test_add_dot_from_root(self):
170
120
        paths = ("original/", "original/file1", "original/file2")
171
121
        self.build_tree(paths)
172
122
        wt = self.make_branch_and_tree('.')
 
123
        branch = wt.branch
173
124
        smart_add_tree(wt, (u".",))
174
125
        for path in paths:
175
126
            self.assertNotEqual(wt.path2id(path), None)
176
127
 
177
128
    def test_add_dot_from_subdir(self):
178
129
        """Test adding . from a subdir of the tree.""" 
 
130
        from bzrlib.add import smart_add_tree
179
131
        paths = ("original/", "original/file1", "original/file2")
180
132
        self.build_tree(paths)
181
133
        wt = self.make_branch_and_tree('.')
 
134
        branch = wt.branch
182
135
        os.chdir("original")
183
136
        smart_add_tree(wt, (u".",))
184
137
        for path in paths:
186
139
 
187
140
    def test_add_tree_from_above_tree(self):
188
141
        """Test adding a tree from above the tree.""" 
 
142
        from bzrlib.add import smart_add_tree
189
143
        paths = ("original/", "original/file1", "original/file2")
190
144
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
191
145
                        "branch/original/file2")
192
146
        self.build_tree(branch_paths)
193
147
        tree = self.make_branch_and_tree('branch')
 
148
        branch = tree.branch
194
149
        smart_add_tree(tree, ("branch",))
195
150
        for path in paths:
196
151
            self.assertNotEqual(tree.path2id(path), None)
197
152
 
198
153
    def test_add_above_tree_preserves_tree(self):
199
154
        """Test nested trees are not affect by an add above them."""
 
155
        from bzrlib.add import smart_add_tree
200
156
        paths = ("original/", "original/file1", "original/file2")
201
157
        child_paths = ("path")
202
158
        full_child_paths = ("original/child", "original/child/path")
204
160
                       "original/child/", "original/child/path")
205
161
        self.build_tree(build_paths)
206
162
        tree = self.make_branch_and_tree('.')
 
163
        branch = tree.branch
207
164
        child_tree = self.make_branch_and_tree("original/child")
208
165
        smart_add_tree(tree, (u".",))
209
166
        for path in paths:
217
174
 
218
175
    def test_add_paths(self):
219
176
        """Test smart-adding a list of paths."""
 
177
        from bzrlib.add import smart_add_tree
220
178
        paths = ("file1", "file2")
221
179
        self.build_tree(paths)
222
180
        wt = self.make_branch_and_tree('.')
 
181
        branch = wt.branch
223
182
        smart_add_tree(wt, paths)
224
183
        for path in paths:
225
184
            self.assertNotEqual(wt.path2id(path), None)
226
185
 
227
 
    def test_add_multiple_dirs(self):
228
 
        """Test smart adding multiple directories at once."""
229
 
        added_paths = ['file1', 'file2',
230
 
                       'dir1/', 'dir1/file3',
231
 
                       'dir1/subdir2/', 'dir1/subdir2/file4',
232
 
                       'dir2/', 'dir2/file5',
233
 
                      ]
234
 
        not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
235
 
        self.build_tree(added_paths)
236
 
        self.build_tree(not_added)
237
 
 
238
 
        wt = self.make_branch_and_tree('.')
239
 
        smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
240
 
 
241
 
        for path in added_paths:
242
 
            self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
243
 
                    'Failed to add path: %s' % (path,))
244
 
        for path in not_added:
245
 
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
246
 
                    'Accidentally added path: %s' % (path,))
247
 
 
248
 
    def test_custom_ids(self):
249
 
        sio = StringIO()
250
 
        action = AddCustomIDAction(to_file=sio, should_print=True)
251
 
        self.build_tree(['file1', 'dir1/', 'dir1/file2'])
252
 
 
253
 
        wt = self.make_branch_and_tree('.')
254
 
        smart_add_tree(wt, ['.'], action=action)
255
 
        # The order of adds is not strictly fixed:
256
 
        sio.seek(0)
257
 
        lines = sorted(sio.readlines())
258
 
        self.assertEqualDiff(['added dir1 with id directory-dir1\n',
259
 
                              'added dir1/file2 with id file-dir1%file2\n',
260
 
                              'added file1 with id file-file1\n',
261
 
                             ], lines)
262
 
        self.assertEqual([('', wt.inventory.root.file_id),
263
 
                          ('dir1', 'directory-dir1'),
264
 
                          ('dir1/file2', 'file-dir1%file2'),
265
 
                          ('file1', 'file-file1'),
266
 
                         ], [(path, ie.file_id) for path, ie
267
 
                                in wt.inventory.iter_entries()])
268
 
 
269
 
 
270
 
class TestAddFrom(TestCaseWithTransport):
271
 
    """Tests for AddFromBaseAction"""
272
 
 
273
 
    def make_base_tree(self):
274
 
        self.base_tree = self.make_branch_and_tree('base')
275
 
        self.build_tree(['base/a', 'base/b',
276
 
                         'base/dir/', 'base/dir/a',
277
 
                         'base/dir/subdir/',
278
 
                         'base/dir/subdir/b',
279
 
                        ])
280
 
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
281
 
                            'dir/subdir', 'dir/subdir/b'])
282
 
        self.base_tree.commit('creating initial tree.')
283
 
 
284
 
    def add_helper(self, base_tree, base_path, new_tree, file_list,
285
 
                   should_print=False):
286
 
        to_file = StringIO()
287
 
        base_tree.lock_read()
288
 
        try:
289
 
            new_tree.lock_write()
290
 
            try:
291
 
                action = AddFromBaseAction(base_tree, base_path,
292
 
                                           to_file=to_file,
293
 
                                           should_print=should_print)
294
 
                smart_add_tree(new_tree, file_list, action=action)
295
 
            finally:
296
 
                new_tree.unlock()
297
 
        finally:
298
 
            base_tree.unlock()
299
 
        return to_file.getvalue()
300
 
 
301
 
    def test_copy_all(self):
302
 
        self.make_base_tree()
303
 
        new_tree = self.make_branch_and_tree('new')
304
 
        files = ['a', 'b',
305
 
                 'dir/', 'dir/a',
306
 
                 'dir/subdir/',
307
 
                 'dir/subdir/b',
308
 
                ]
309
 
        self.build_tree(['new/' + fn for fn in files])
310
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
311
 
 
312
 
        for fn in files:
313
 
            base_file_id = self.base_tree.path2id(fn)
314
 
            new_file_id = new_tree.path2id(fn)
315
 
            self.assertEqual(base_file_id, new_file_id)
316
 
 
317
 
    def test_copy_from_dir(self):
318
 
        self.make_base_tree()
319
 
        new_tree = self.make_branch_and_tree('new')
320
 
 
321
 
        self.build_tree(['new/a', 'new/b', 'new/c',
322
 
                         'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
323
 
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
324
 
 
325
 
        # We 'a' and 'b' exist in the root, and they are being added
326
 
        # in a new 'root'. Since ROOT ids are not unique, we will
327
 
        # use those ids
328
 
        # TODO: This will probably change once trees have a unique root id
329
 
        # It is definitely arguable that 'a' should get the id of
330
 
        # 'dir/a' not of 'a'.
331
 
        self.assertEqual(self.base_tree.path2id('a'),
332
 
                         new_tree.path2id('a'))
333
 
        self.assertEqual(self.base_tree.path2id('b'),
334
 
                         new_tree.path2id('b'))
335
 
 
336
 
        # Because we specified 'dir/' as the base path, and we have
337
 
        # nothing named 'subdir' in the base tree, we should grab the
338
 
        # ids from there
339
 
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
340
 
                         new_tree.path2id('subdir'))
341
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
342
 
                         new_tree.path2id('subdir/b'))
343
 
 
344
 
        # These should get newly generated ids
345
 
        c_id = new_tree.path2id('c')
346
 
        self.assertNotEqual(None, c_id)
347
 
        self.failIf(c_id in self.base_tree)
348
 
 
349
 
        d_id = new_tree.path2id('subdir/d')
350
 
        self.assertNotEqual(None, d_id)
351
 
        self.failIf(d_id in self.base_tree)
352
 
 
353
 
    def test_copy_existing_dir(self):
354
 
        self.make_base_tree()
355
 
        new_tree = self.make_branch_and_tree('new')
356
 
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
357
 
 
358
 
        subdir_file_id = self.base_tree.path2id('dir/subdir')
359
 
        new_tree.add(['subby'], [subdir_file_id])
360
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
361
 
        # Because 'subby' already points to subdir, we should add
362
 
        # 'b' with the same id
363
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
364
 
                         new_tree.path2id('subby/b'))
365
 
 
366
 
        # 'subby/a' should be added with a new id because there is no
367
 
        # matching path or child of 'subby'.
368
 
        a_id = new_tree.path2id('subby/a')
369
 
        self.assertNotEqual(None, a_id)
370
 
        self.failIf(a_id in self.base_tree)
371
 
 
372
 
 
373
 
class TestAddNonNormalized(TestCaseWithTransport):
374
 
 
375
 
    def make(self):
376
 
        try:
377
 
            self.build_tree([u'a\u030a'])
378
 
        except UnicodeError:
379
 
            raise TestSkipped('Filesystem cannot create unicode filenames')
380
 
 
381
 
        self.wt = self.make_branch_and_tree('.')
382
 
 
383
 
    def test_accessible_explicit(self):
384
 
        self.make()
385
 
        orig = osutils.normalized_filename
386
 
        osutils.normalized_filename = osutils._accessible_normalized_filename
387
 
        try:
388
 
            smart_add_tree(self.wt, [u'a\u030a'])
389
 
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
390
 
                    [(path, ie.kind) for path,ie in 
391
 
                        self.wt.inventory.iter_entries()])
392
 
        finally:
393
 
            osutils.normalized_filename = orig
394
 
 
395
 
    def test_accessible_implicit(self):
396
 
        self.make()
397
 
        orig = osutils.normalized_filename
398
 
        osutils.normalized_filename = osutils._accessible_normalized_filename
399
 
        try:
400
 
            smart_add_tree(self.wt, [])
401
 
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
402
 
                    [(path, ie.kind) for path,ie in 
403
 
                        self.wt.inventory.iter_entries()])
404
 
        finally:
405
 
            osutils.normalized_filename = orig
406
 
 
407
 
    def test_inaccessible_explicit(self):
408
 
        self.make()
409
 
        orig = osutils.normalized_filename
410
 
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
411
 
        try:
412
 
            self.assertRaises(errors.InvalidNormalization,
413
 
                    smart_add_tree, self.wt, [u'a\u030a'])
414
 
        finally:
415
 
            osutils.normalized_filename = orig
416
 
 
417
 
    def test_inaccessible_implicit(self):
418
 
        self.make()
419
 
        orig = osutils.normalized_filename
420
 
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
421
 
        try:
422
 
            # TODO: jam 20060701 In the future, this should probably
423
 
            #       just ignore files that don't fit the normalization
424
 
            #       rules, rather than exploding
425
 
            self.assertRaises(errors.InvalidNormalization,
426
 
                    smart_add_tree, self.wt, [])
427
 
        finally:
428
 
            osutils.normalized_filename = orig
429
 
 
430
186
 
431
187
class TestAddActions(TestCase):
432
188
 
433
 
    def test_quiet(self):
434
 
        self.run_action("")
435
 
 
436
 
    def test__print(self):
437
 
        self.run_action("added path\n")
438
 
 
439
 
    def run_action(self, output):
440
 
        from bzrlib.add import AddAction, FastPath
 
189
    def test_null(self):
 
190
        from bzrlib.add import add_action_null
 
191
        self.run_action(add_action_null, "", False)
 
192
 
 
193
    def test_add(self):
 
194
        self.entry = InventoryFile("id", "name", None)
 
195
        from bzrlib.add import add_action_add
 
196
        self.run_action(add_action_add, "", True)
 
197
 
 
198
    def test_add_and_print(self):
 
199
        from bzrlib.add import add_action_add_and_print
 
200
        self.run_action(add_action_add_and_print, "added path\n", True)
 
201
 
 
202
    def test_print(self):
 
203
        from bzrlib.add import add_action_print
 
204
        self.run_action(add_action_print, "added path\n", False)
 
205
 
 
206
    def run_action(self, action, output, should_add):
 
207
        from StringIO import StringIO
441
208
        inv = Inventory()
442
209
        stdout = StringIO()
443
 
        action = AddAction(to_file=stdout, should_print=bool(output))
444
210
 
445
 
        self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
 
211
        self.apply_redirected(None, stdout, None, action, inv, 'path', 'file')
446
212
        self.assertEqual(stdout.getvalue(), output)
 
213
 
 
214
        if should_add:
 
215
            self.assertNotEqual(inv.path2id('path'), None)
 
216
        else:
 
217
            self.assertEqual(inv.path2id('path'), None)