/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 tests/test_fetch.py

Avoid the use of InventoryDirectory.children. This speeds up 
imports significantly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
23
23
    Repo as GitRepo,
24
24
    )
25
25
import os
26
 
import stat
27
26
 
28
27
from bzrlib import (
29
28
    knit,
43
42
    TestCaseWithTransport,
44
43
    )
45
44
 
 
45
from bzrlib.plugins.git import (
 
46
    get_rich_root_format,
 
47
    )
46
48
from bzrlib.plugins.git.fetch import (
47
49
    import_git_blob,
48
50
    import_git_tree,
49
51
    )
50
52
from bzrlib.plugins.git.mapping import (
51
53
    BzrGitMappingv1,
52
 
    DEFAULT_FILE_MODE,
53
54
    )
54
55
from bzrlib.plugins.git.tests import (
55
56
    GitBranchBuilder,
64
65
 
65
66
    def clone_git_repo(self, from_url, to_url, revision_id=None):
66
67
        oldrepos = self.open_git_repo(from_url)
67
 
        dir = BzrDir.create(to_url)
 
68
        dir = BzrDir.create(to_url, get_rich_root_format())
68
69
        newrepos = dir.create_repository()
69
70
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
70
71
        return newrepos
257
258
        return Repository.open(path)
258
259
 
259
260
 
260
 
class DummyStoreUpdater(object):
261
 
 
262
 
    def add_object(self, obj, ie, path):
263
 
        pass
264
 
 
265
 
    def finish(self):
266
 
        pass
267
 
 
268
 
 
269
261
class ImportObjects(TestCaseWithTransport):
270
262
 
271
263
    def setUp(self):
278
270
        blob = Blob.from_string("bar")
279
271
        base_inv = Inventory()
280
272
        objs = { "blobname": blob}
281
 
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
282
 
            (None, "blobname"), 
283
 
            base_inv, None, "somerevid", [], objs.__getitem__, 
284
 
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
285
 
            self._mapping.generate_file_id)
 
273
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
274
            None, base_inv, None, None, None, "somerevid", [], objs.__getitem__, False,
 
275
            False)
286
276
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
287
277
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
288
278
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
298
288
    def test_import_tree_empty_root(self):
299
289
        base_inv = Inventory(root_id=None)
300
290
        tree = Tree()
301
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
302
 
               (None, tree.id), base_inv, 
303
 
               None, "somerevid", [], {tree.id: tree}.__getitem__,
304
 
               (None, stat.S_IFDIR), DummyStoreUpdater(),
305
 
               self._mapping.generate_file_id)
306
 
        self.assertEquals(child_modes, {})
 
291
        tree.serialize()
 
292
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
 
293
               tree.id, None, base_inv, None, None,
 
294
               None, "somerevid", [], {tree.id: tree}.__getitem__)
307
295
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
296
        self.assertEquals(1, len(ret))
309
297
        self.assertEquals(None, ret[0][0])
318
306
    def test_import_tree_empty(self):
319
307
        base_inv = Inventory()
320
308
        tree = Tree()
321
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
322
 
           (None, tree.id), base_inv, None, "somerevid", [], 
323
 
           { tree.id: tree }.__getitem__,
324
 
           (None, stat.S_IFDIR), DummyStoreUpdater(),
325
 
           self._mapping.generate_file_id)
326
 
        self.assertEquals(child_modes, {})
 
309
        tree.serialize()
 
310
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
 
311
           tree.id, None, base_inv, None, None, None, "somerevid", [], 
 
312
           { tree.id: tree }.__getitem__)
327
313
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
328
314
        self.assertEquals(1, len(ret))
329
315
        self.assertEquals(None, ret[0][0])
339
325
        base_inv = Inventory()
340
326
        blob = Blob.from_string("bar1")
341
327
        tree = Tree()
342
 
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
 
328
        tree.add(0100600, "foo", blob.id)
 
329
        tree.serialize()
343
330
        objects = { blob.id: blob, tree.id: tree }
344
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
345
 
                (None, tree.id), base_inv, None, "somerevid", [],
346
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
347
 
            self._mapping.generate_file_id)
348
 
        self.assertEquals(child_modes, {})
 
331
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
 
332
            None, base_inv, None, None, None, "somerevid", [],
 
333
            objects.__getitem__)
349
334
        self.assertEquals(2, len(ret))
350
335
        self.assertEquals(None, ret[0][0])
351
336
        self.assertEquals("bla", ret[0][1])
360
345
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
361
346
        self.assertEquals(False, ie.executable)
362
347
 
363
 
    def test_import_tree_with_unusual_mode_file(self):
364
 
        base_inv = Inventory()
365
 
        blob = Blob.from_string("bar1")
366
 
        tree = Tree()
367
 
        tree.add(stat.S_IFREG | 0664, "foo", blob.id)
368
 
        objects = { blob.id: blob, tree.id: tree }
369
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
370
 
                (None, tree.id), base_inv, None, "somerevid", [],
371
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
372
 
            self._mapping.generate_file_id)
373
 
        self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
374
 
 
375
348
    def test_import_tree_with_file_exe(self):
376
349
        base_inv = Inventory(root_id=None)
377
350
        blob = Blob.from_string("bar")
378
351
        tree = Tree()
379
352
        tree.add(0100755, "foo", blob.id)
 
353
        tree.serialize()
380
354
        objects = { blob.id: blob, tree.id: tree }
381
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
382
 
                (None, tree.id), base_inv, None, "somerevid", [],
383
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
384
 
            self._mapping.generate_file_id)
385
 
        self.assertEquals(child_modes, {})
 
355
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
 
356
            None, base_inv, None, None, None, "somerevid", [],
 
357
            objects.__getitem__)
386
358
        self.assertEquals(2, len(ret))
387
359
        self.assertEquals(None, ret[0][0])
388
360
        self.assertEquals("", ret[0][1])