/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

Fix indication of number of revisions pushed in dpush.

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
    )
46
49
from bzrlib.plugins.git.fetch import (
47
50
    import_git_blob,
48
51
    import_git_tree,
64
67
 
65
68
    def clone_git_repo(self, from_url, to_url, revision_id=None):
66
69
        oldrepos = self.open_git_repo(from_url)
67
 
        dir = BzrDir.create(to_url)
 
70
        dir = BzrDir.create(to_url, get_rich_root_format())
68
71
        newrepos = dir.create_repository()
69
72
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
70
73
        return newrepos
257
260
        return Repository.open(path)
258
261
 
259
262
 
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
263
class ImportObjects(TestCaseWithTransport):
270
264
 
271
265
    def setUp(self):
278
272
        blob = Blob.from_string("bar")
279
273
        base_inv = Inventory()
280
274
        objs = { "blobname": blob}
281
 
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
 
275
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "bla",
282
276
            (None, "blobname"), 
283
 
            base_inv, None, "somerevid", [], objs.__getitem__, 
284
 
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
285
 
            self._mapping.generate_file_id)
 
277
            base_inv, None, None, "somerevid", [], objs.__getitem__, 
 
278
            (None, DEFAULT_FILE_MODE))
286
279
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
287
280
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
288
281
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
298
291
    def test_import_tree_empty_root(self):
299
292
        base_inv = Inventory(root_id=None)
300
293
        tree = Tree()
301
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
302
 
               (None, tree.id), base_inv, 
 
294
        tree.serialize()
 
295
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", "",
 
296
               (None, tree.id), base_inv, None,
303
297
               None, "somerevid", [], {tree.id: tree}.__getitem__,
304
 
               (None, stat.S_IFDIR), DummyStoreUpdater(),
305
 
               self._mapping.generate_file_id)
306
 
        self.assertEquals(child_modes, {})
 
298
               (None, stat.S_IFDIR))
307
299
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
300
        self.assertEquals(1, len(ret))
309
301
        self.assertEquals(None, ret[0][0])
318
310
    def test_import_tree_empty(self):
319
311
        base_inv = Inventory()
320
312
        tree = Tree()
321
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
322
 
           (None, tree.id), base_inv, None, "somerevid", [], 
 
313
        tree.serialize()
 
314
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
315
           (None, tree.id), base_inv, None, None, "somerevid", [], 
323
316
           { tree.id: tree }.__getitem__,
324
 
           (None, stat.S_IFDIR), DummyStoreUpdater(),
325
 
           self._mapping.generate_file_id)
326
 
        self.assertEquals(child_modes, {})
 
317
           (None, stat.S_IFDIR))
327
318
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
328
319
        self.assertEquals(1, len(ret))
329
320
        self.assertEquals(None, ret[0][0])
339
330
        base_inv = Inventory()
340
331
        blob = Blob.from_string("bar1")
341
332
        tree = Tree()
342
 
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
 
333
        tree.add(0100600, "foo", blob.id)
 
334
        tree.serialize()
343
335
        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, {})
 
336
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
337
                (None, tree.id), base_inv, None, None, "somerevid", [],
 
338
            objects.__getitem__, (None, stat.S_IFDIR))
349
339
        self.assertEquals(2, len(ret))
350
340
        self.assertEquals(None, ret[0][0])
351
341
        self.assertEquals("bla", ret[0][1])
360
350
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
361
351
        self.assertEquals(False, ie.executable)
362
352
 
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
353
    def test_import_tree_with_file_exe(self):
376
354
        base_inv = Inventory(root_id=None)
377
355
        blob = Blob.from_string("bar")
378
356
        tree = Tree()
379
357
        tree.add(0100755, "foo", blob.id)
 
358
        tree.serialize()
380
359
        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, {})
 
360
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", "",
 
361
                (None, tree.id), base_inv, None, None, "somerevid", [],
 
362
            objects.__getitem__, (None, stat.S_IFDIR))
386
363
        self.assertEquals(2, len(ret))
387
364
        self.assertEquals(None, ret[0][0])
388
365
        self.assertEquals("", ret[0][1])