/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

  • Committer: Robert Collins
  • Date: 2007-07-02 22:36:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2581.
  • Revision ID: robertc@robertcollins.net-20070702223611-50tnzmbeoryqid75
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
  for dealing with unexpanded glob lists - e.g. on the win32 platform. This
  was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)

* ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on
  win32. Callers of the function should do this. (Robert Collins)

* ``bzrlib.add.glob_expand_for_win32`` is now
  ``bzrlib.win32utils.glob_expand``.  (Robert Collins)

* ``bzrlib.smart_add`` is deprecated. (Robert Collins)

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