/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
43
43
    TestCaseWithTransport,
44
44
    )
45
45
 
46
 
from bzrlib.plugins.git import (
47
 
    get_rich_root_format,
48
 
    )
49
46
from bzrlib.plugins.git.fetch import (
50
47
    import_git_blob,
51
48
    import_git_tree,
67
64
 
68
65
    def clone_git_repo(self, from_url, to_url, revision_id=None):
69
66
        oldrepos = self.open_git_repo(from_url)
70
 
        dir = BzrDir.create(to_url, get_rich_root_format())
 
67
        dir = BzrDir.create(to_url)
71
68
        newrepos = dir.create_repository()
72
69
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
73
70
        return newrepos
262
259
 
263
260
class DummyStoreUpdater(object):
264
261
 
265
 
    def add_object(self, obj, ie):
 
262
    def add_object(self, obj, ie, path):
266
263
        pass
267
264
 
268
265
    def finish(self):
284
281
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
285
282
            (None, "blobname"), 
286
283
            base_inv, None, "somerevid", [], objs.__getitem__, 
287
 
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater())
 
284
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
 
285
            self._mapping.generate_file_id)
288
286
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
289
287
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
290
288
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
300
298
    def test_import_tree_empty_root(self):
301
299
        base_inv = Inventory(root_id=None)
302
300
        tree = Tree()
303
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", "",
 
301
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
304
302
               (None, tree.id), base_inv, 
305
303
               None, "somerevid", [], {tree.id: tree}.__getitem__,
306
 
               (None, stat.S_IFDIR), DummyStoreUpdater())
 
304
               (None, stat.S_IFDIR), DummyStoreUpdater(),
 
305
               self._mapping.generate_file_id)
 
306
        self.assertEquals(child_modes, {})
307
307
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
308
        self.assertEquals(1, len(ret))
309
309
        self.assertEquals(None, ret[0][0])
318
318
    def test_import_tree_empty(self):
319
319
        base_inv = Inventory()
320
320
        tree = Tree()
321
 
        ret, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
321
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
322
322
           (None, tree.id), base_inv, None, "somerevid", [], 
323
323
           { tree.id: tree }.__getitem__,
324
 
           (None, stat.S_IFDIR), DummyStoreUpdater())
 
324
           (None, stat.S_IFDIR), DummyStoreUpdater(),
 
325
           self._mapping.generate_file_id)
 
326
        self.assertEquals(child_modes, {})
325
327
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
326
328
        self.assertEquals(1, len(ret))
327
329
        self.assertEquals(None, ret[0][0])
337
339
        base_inv = Inventory()
338
340
        blob = Blob.from_string("bar1")
339
341
        tree = Tree()
340
 
        tree.add(0100600, "foo", blob.id)
 
342
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
341
343
        objects = { blob.id: blob, tree.id: tree }
342
 
        ret, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
344
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
343
345
                (None, tree.id), base_inv, None, "somerevid", [],
344
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
 
346
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
347
            self._mapping.generate_file_id)
 
348
        self.assertEquals(child_modes, {})
345
349
        self.assertEquals(2, len(ret))
346
350
        self.assertEquals(None, ret[0][0])
347
351
        self.assertEquals("bla", ret[0][1])
356
360
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
357
361
        self.assertEquals(False, ie.executable)
358
362
 
 
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
 
359
375
    def test_import_tree_with_file_exe(self):
360
376
        base_inv = Inventory(root_id=None)
361
377
        blob = Blob.from_string("bar")
362
378
        tree = Tree()
363
379
        tree.add(0100755, "foo", blob.id)
364
380
        objects = { blob.id: blob, tree.id: tree }
365
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", "",
 
381
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
366
382
                (None, tree.id), base_inv, None, "somerevid", [],
367
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
 
383
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
384
            self._mapping.generate_file_id)
 
385
        self.assertEquals(child_modes, {})
368
386
        self.assertEquals(2, len(ret))
369
387
        self.assertEquals(None, ret[0][0])
370
388
        self.assertEquals("", ret[0][1])