/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

Actually use shagitmap again to look up trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
41
41
from bzrlib.tests import (
42
42
    TestCaseWithTransport,
43
43
    )
44
 
from bzrlib.transport import (
45
 
    get_transport,
46
 
    )
47
44
 
48
45
from bzrlib.plugins.git import (
49
46
    get_rich_root_format,
298
295
        tree = Tree()
299
296
        tree.serialize()
300
297
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
301
 
               tree.id, base_inv, {}, None,
 
298
               tree.id, base_inv, None,
302
299
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
303
300
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
304
301
        self.assertEquals(1, len(ret))
316
313
        tree = Tree()
317
314
        tree.serialize()
318
315
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
319
 
           tree.id, base_inv, {}, None, None, "somerevid", [], 
 
316
           tree.id, base_inv, None, None, "somerevid", [], 
320
317
           self._map, { tree.id: tree }.__getitem__)
321
318
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
322
319
        self.assertEquals(1, len(ret))
337
334
        tree.serialize()
338
335
        objects = { blob.id: blob, tree.id: tree }
339
336
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
340
 
            base_inv, {}, None, None, "somerevid", [], self._map, objects.__getitem__)
 
337
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
341
338
        self.assertEquals(2, len(ret))
342
339
        self.assertEquals(None, ret[0][0])
343
340
        self.assertEquals("bla", ret[0][1])
360
357
        tree.serialize()
361
358
        objects = { blob.id: blob, tree.id: tree }
362
359
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
363
 
            base_inv, {}, None, None, "somerevid", [], self._map, objects.__getitem__)
 
360
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
364
361
        self.assertEquals(2, len(ret))
365
362
        self.assertEquals(None, ret[0][0])
366
363
        self.assertEquals("", ret[0][1])