← 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-10-06 06:27:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061006062706-e84640cea080b6e9
shave off another 10ms by avoiding importing merge from working tree

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
1
18
import os
2
19
import unittest
3
20
 
4
 
from bzrlib import errors, osutils
5
 
from bzrlib.add import smart_add, smart_add_tree
 
21
from bzrlib import errors, ignores, osutils
 
22
from bzrlib.add import (
 
23
    AddAction,
 
24
    AddFromBaseAction,
 
25
    smart_add,
 
26
    smart_add_tree,
 
27
    )
6
28
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
7
29
from bzrlib.errors import NoSuchFile
8
30
from bzrlib.inventory import InventoryFile, Inventory
116
138
        """Correctly returns added/ignored files"""
117
139
        from bzrlib.commands import run_bzr
118
140
        wt = self.make_branch_and_tree('.')
119
 
        # no files should be ignored by default, so we need to create
120
 
        # an ignore rule - we create one for the pyc files, which means
121
 
        # CVS should not be ignored.
122
 
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS', 
 
141
        # The default ignore list includes '*.py[co]', but not CVS
 
142
        ignores._set_user_ignores(['*.py[co]'])
 
143
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
123
144
                        'inertiatic/foo.pyc'])
124
 
        self.build_tree_contents([('.bzrignore', '*.py[oc]\n')])
125
145
        added, ignored = smart_add_tree(wt, u'.')
126
146
        self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
127
147
                          added)
128
 
        self.assertSubset(('*.py[oc]',), ignored)
129
 
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
 
148
        self.assertSubset(('*.py[co]',), ignored)
 
149
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
 
150
 
 
151
 
 
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
130
162
 
131
163
 
132
164
class TestSmartAddTree(TestCaseWithTransport):
212
244
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
213
245
                    'Accidentally added path: %s' % (path,))
214
246
 
 
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
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
 
323
 
 
324
        # We 'a' and 'b' exist in the root, and they are being added
 
325
        # in a new 'root'. Since ROOT ids are not unique, we will
 
326
        # use those ids
 
327
        # TODO: This will probably change once trees have a unique root id
 
328
        # It is definitely arguable that 'a' should get the id of
 
329
        # 'dir/a' not of 'a'.
 
330
        self.assertEqual(self.base_tree.path2id('a'),
 
331
                         new_tree.path2id('a'))
 
332
        self.assertEqual(self.base_tree.path2id('b'),
 
333
                         new_tree.path2id('b'))
 
334
 
 
335
        # Because we specified 'dir/' as the base path, and we have
 
336
        # nothing named 'subdir' in the base tree, we should grab the
 
337
        # ids from there
 
338
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
 
339
                         new_tree.path2id('subdir'))
 
340
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
 
341
                         new_tree.path2id('subdir/b'))
 
342
 
 
343
        # These should get newly generated ids
 
344
        c_id = new_tree.path2id('c')
 
345
        self.assertNotEqual(None, c_id)
 
346
        self.failIf(c_id in self.base_tree)
 
347
 
 
348
        d_id = new_tree.path2id('subdir/d')
 
349
        self.assertNotEqual(None, d_id)
 
350
        self.failIf(d_id in self.base_tree)
 
351
 
 
352
    def test_copy_existing_dir(self):
 
353
        self.make_base_tree()
 
354
        new_tree = self.make_branch_and_tree('new')
 
355
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
 
356
 
 
357
        subdir_file_id = self.base_tree.path2id('dir/subdir')
 
358
        new_tree.add(['subby'], [subdir_file_id])
 
359
        self.add_helper(self.base_tree, '', new_tree, ['new'])
 
360
        # Because 'subby' already points to subdir, we should add
 
361
        # 'b' with the same id
 
362
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
 
363
                         new_tree.path2id('subby/b'))
 
364
 
 
365
        # 'subby/a' should be added with a new id because there is no
 
366
        # matching path or child of 'subby'.
 
367
        a_id = new_tree.path2id('subby/a')
 
368
        self.assertNotEqual(None, a_id)
 
369
        self.failIf(a_id in self.base_tree)
 
370
 
215
371
 
216
372
class TestAddNonNormalized(TestCaseWithTransport):
217
373
 
229
385
        osutils.normalized_filename = osutils._accessible_normalized_filename
230
386
        try:
231
387
            smart_add_tree(self.wt, [u'a\u030a'])
232
 
            self.assertEqual([(u'\xe5', 'file')],
 
388
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
233
389
                    [(path, ie.kind) for path,ie in 
234
390
                        self.wt.inventory.iter_entries()])
235
391
        finally:
241
397
        osutils.normalized_filename = osutils._accessible_normalized_filename
242
398
        try:
243
399
            smart_add_tree(self.wt, [])
244
 
            self.assertEqual([(u'\xe5', 'file')],
 
400
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
245
401
                    [(path, ie.kind) for path,ie in 
246
402
                        self.wt.inventory.iter_entries()])
247
403
        finally:
281
437
 
282
438
    def run_action(self, output):
283
439
        from bzrlib.add import AddAction, FastPath
284
 
        from cStringIO import StringIO
285
440
        inv = Inventory()
286
441
        stdout = StringIO()
287
442
        action = AddAction(to_file=stdout, should_print=bool(output))