← 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
150
128
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
151
129
 
152
130
 
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
131
class TestSmartAddTree(TestCaseWithTransport):
166
132
    """Test smart adds with a specified branch."""
167
133
 
245
211
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
246
212
                    'Accidentally added path: %s' % (path,))
247
213
 
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
214
 
373
215
class TestAddNonNormalized(TestCaseWithTransport):
374
216
 
438
280
 
439
281
    def run_action(self, output):
440
282
        from bzrlib.add import AddAction, FastPath
 
283
        from cStringIO import StringIO
441
284
        inv = Inventory()
442
285
        stdout = StringIO()
443
286
        action = AddAction(to_file=stdout, should_print=bool(output))