← 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: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

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
4
from bzrlib import errors, ignores, osutils
22
 
from bzrlib.add import (
23
 
    AddAction,
24
 
    AddFromBaseAction,
25
 
    smart_add,
26
 
    smart_add_tree,
27
 
    )
 
5
from bzrlib.add import smart_add, smart_add_tree
28
6
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
29
7
from bzrlib.errors import NoSuchFile
30
8
from bzrlib.inventory import InventoryFile, Inventory
121
99
    def test_add_dry_run(self):
122
100
        """Test a dry run add, make sure nothing is added."""
123
101
        from bzrlib.commands import run_bzr
 
102
        ignores._set_user_ignores(['./.bazaar'])
124
103
        eq = self.assertEqual
125
104
        wt = self.make_branch_and_tree('.')
126
105
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
139
118
        from bzrlib.commands import run_bzr
140
119
        wt = self.make_branch_and_tree('.')
141
120
        # The default ignore list includes '*.py[co]', but not CVS
142
 
        ignores._set_user_ignores(['*.py[co]'])
 
121
        ignores._set_user_ignores(['./.bazaar', '*.py[co]'])
143
122
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
144
123
                        'inertiatic/foo.pyc'])
145
124
        added, ignored = smart_add_tree(wt, u'.')
149
128
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
150
129
 
151
130
 
152
 
class AddCustomIDAction(AddAction):
153
 
 
154
 
    def __call__(self, inv, parent_ie, path, kind):
155
 
        # The first part just logs if appropriate
156
 
        # Now generate a custom id
157
 
        file_id = kind + '-' + path.raw_path.replace('/', '%')
158
 
        if self.should_print:
159
 
            self._to_file.write('added %s with id %s\n' 
160
 
                                % (path.raw_path, file_id))
161
 
        return file_id
162
 
 
163
 
 
164
131
class TestSmartAddTree(TestCaseWithTransport):
165
132
    """Test smart adds with a specified branch."""
166
133
 
244
211
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
245
212
                    'Accidentally added path: %s' % (path,))
246
213
 
247
 
    def test_custom_ids(self):
248
 
        sio = StringIO()
249
 
        action = AddCustomIDAction(to_file=sio, should_print=True)
250
 
        self.build_tree(['file1', 'dir1/', 'dir1/file2'])
251
 
 
252
 
        wt = self.make_branch_and_tree('.')
253
 
        smart_add_tree(wt, ['.'], action=action)
254
 
        # The order of adds is not strictly fixed:
255
 
        sio.seek(0)
256
 
        lines = sorted(sio.readlines())
257
 
        self.assertEqualDiff(['added dir1 with id directory-dir1\n',
258
 
                              'added dir1/file2 with id file-dir1%file2\n',
259
 
                              'added file1 with id file-file1\n',
260
 
                             ], lines)
261
 
        self.assertEqual([('', wt.inventory.root.file_id),
262
 
                          ('dir1', 'directory-dir1'),
263
 
                          ('dir1/file2', 'file-dir1%file2'),
264
 
                          ('file1', 'file-file1'),
265
 
                         ], [(path, ie.file_id) for path, ie
266
 
                                in wt.inventory.iter_entries()])
267
 
 
268
 
 
269
 
class TestAddFrom(TestCaseWithTransport):
270
 
    """Tests for AddFromBaseAction"""
271
 
 
272
 
    def make_base_tree(self):
273
 
        self.base_tree = self.make_branch_and_tree('base')
274
 
        self.build_tree(['base/a', 'base/b',
275
 
                         'base/dir/', 'base/dir/a',
276
 
                         'base/dir/subdir/',
277
 
                         'base/dir/subdir/b',
278
 
                        ])
279
 
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
280
 
                            'dir/subdir', 'dir/subdir/b'])
281
 
        self.base_tree.commit('creating initial tree.')
282
 
 
283
 
    def add_helper(self, base_tree, base_path, new_tree, file_list,
284
 
                   should_print=False):
285
 
        to_file = StringIO()
286
 
        base_tree.lock_read()
287
 
        try:
288
 
            new_tree.lock_write()
289
 
            try:
290
 
                action = AddFromBaseAction(base_tree, base_path,
291
 
                                           to_file=to_file,
292
 
                                           should_print=should_print)
293
 
                smart_add_tree(new_tree, file_list, action=action)
294
 
            finally:
295
 
                new_tree.unlock()
296
 
        finally:
297
 
            base_tree.unlock()
298
 
        return to_file.getvalue()
299
 
 
300
 
    def test_copy_all(self):
301
 
        self.make_base_tree()
302
 
        new_tree = self.make_branch_and_tree('new')
303
 
        files = ['a', 'b',
304
 
                 'dir/', 'dir/a',
305
 
                 'dir/subdir/',
306
 
                 'dir/subdir/b',
307
 
                ]
308
 
        self.build_tree(['new/' + fn for fn in files])
309
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
310
 
 
311
 
        for fn in files:
312
 
            base_file_id = self.base_tree.path2id(fn)
313
 
            new_file_id = new_tree.path2id(fn)
314
 
            self.assertEqual(base_file_id, new_file_id)
315
 
 
316
 
    def test_copy_from_dir(self):
317
 
        self.make_base_tree()
318
 
        new_tree = self.make_branch_and_tree('new')
319
 
 
320
 
        self.build_tree(['new/a', 'new/b', 'new/c',
321
 
                         'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
322
 
        new_tree.set_root_id(self.base_tree.get_root_id())
323
 
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
324
 
 
325
 
        # We know 'a' and 'b' exist in the root, and they are being added
326
 
        # in a new 'root'. Since ROOT ids have been set as the same, we will
327
 
        # use those ids
328
 
        self.assertEqual(self.base_tree.path2id('a'),
329
 
                         new_tree.path2id('a'))
330
 
        self.assertEqual(self.base_tree.path2id('b'),
331
 
                         new_tree.path2id('b'))
332
 
 
333
 
        # Because we specified 'dir/' as the base path, and we have
334
 
        # nothing named 'subdir' in the base tree, we should grab the
335
 
        # ids from there
336
 
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
337
 
                         new_tree.path2id('subdir'))
338
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
339
 
                         new_tree.path2id('subdir/b'))
340
 
 
341
 
        # These should get newly generated ids
342
 
        c_id = new_tree.path2id('c')
343
 
        self.assertNotEqual(None, c_id)
344
 
        self.failIf(c_id in self.base_tree)
345
 
 
346
 
        d_id = new_tree.path2id('subdir/d')
347
 
        self.assertNotEqual(None, d_id)
348
 
        self.failIf(d_id in self.base_tree)
349
 
 
350
 
    def test_copy_existing_dir(self):
351
 
        self.make_base_tree()
352
 
        new_tree = self.make_branch_and_tree('new')
353
 
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
354
 
 
355
 
        subdir_file_id = self.base_tree.path2id('dir/subdir')
356
 
        new_tree.add(['subby'], [subdir_file_id])
357
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
358
 
        # Because 'subby' already points to subdir, we should add
359
 
        # 'b' with the same id
360
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
361
 
                         new_tree.path2id('subby/b'))
362
 
 
363
 
        # 'subby/a' should be added with a new id because there is no
364
 
        # matching path or child of 'subby'.
365
 
        a_id = new_tree.path2id('subby/a')
366
 
        self.assertNotEqual(None, a_id)
367
 
        self.failIf(a_id in self.base_tree)
368
 
 
369
214
 
370
215
class TestAddNonNormalized(TestCaseWithTransport):
371
216
 
435
280
 
436
281
    def run_action(self, output):
437
282
        from bzrlib.add import AddAction, FastPath
 
283
        from cStringIO import StringIO
438
284
        inv = Inventory()
439
285
        stdout = StringIO()
440
286
        action = AddAction(to_file=stdout, should_print=bool(output))