/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

Clean up trailing whitespace.

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,
42
41
from bzrlib.tests import (
43
42
    TestCaseWithTransport,
44
43
    )
 
44
from bzrlib.transport import (
 
45
    get_transport,
 
46
    )
45
47
 
46
48
from bzrlib.plugins.git import (
47
49
    get_rich_root_format,
52
54
    )
53
55
from bzrlib.plugins.git.mapping import (
54
56
    BzrGitMappingv1,
55
 
    DEFAULT_FILE_MODE,
 
57
    default_mapping,
 
58
    )
 
59
from bzrlib.plugins.git.shamap import (
 
60
    DictGitShaMap,
56
61
    )
57
62
from bzrlib.plugins.git.tests import (
58
63
    GitBranchBuilder,
260
265
        return Repository.open(path)
261
266
 
262
267
 
263
 
class DummyStoreUpdater(object):
264
 
 
265
 
    def add_object(self, obj, ie):
266
 
        pass
267
 
 
268
 
    def finish(self):
269
 
        pass
270
 
 
271
 
 
272
268
class ImportObjects(TestCaseWithTransport):
273
269
 
274
270
    def setUp(self):
275
271
        super(ImportObjects, self).setUp()
 
272
        self._map = DictGitShaMap()
276
273
        self._mapping = BzrGitMappingv1()
277
274
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
278
275
        self._texts = factory(self.get_transport('texts'))
281
278
        blob = Blob.from_string("bar")
282
279
        base_inv = Inventory()
283
280
        objs = { "blobname": blob}
284
 
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
285
 
            (None, "blobname"), 
286
 
            base_inv, None, "somerevid", [], objs.__getitem__, 
287
 
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater())
 
281
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
282
            base_inv, None, None, "somerevid", [], self._map, objs.__getitem__, False,
 
283
            False)
288
284
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
289
285
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
290
286
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
300
296
    def test_import_tree_empty_root(self):
301
297
        base_inv = Inventory(root_id=None)
302
298
        tree = Tree()
303
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", "",
304
 
               (None, tree.id), base_inv, 
305
 
               None, "somerevid", [], {tree.id: tree}.__getitem__,
306
 
               (None, stat.S_IFDIR), DummyStoreUpdater())
 
299
        tree.serialize()
 
300
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
 
301
               tree.id, base_inv, None,
 
302
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
307
303
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
304
        self.assertEquals(1, len(ret))
309
305
        self.assertEquals(None, ret[0][0])
318
314
    def test_import_tree_empty(self):
319
315
        base_inv = Inventory()
320
316
        tree = Tree()
321
 
        ret, _ = 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())
 
317
        tree.serialize()
 
318
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
 
319
           tree.id, base_inv, None, None, "somerevid", [], 
 
320
           self._map, { tree.id: tree }.__getitem__)
325
321
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
326
322
        self.assertEquals(1, len(ret))
327
323
        self.assertEquals(None, ret[0][0])
338
334
        blob = Blob.from_string("bar1")
339
335
        tree = Tree()
340
336
        tree.add(0100600, "foo", blob.id)
 
337
        tree.serialize()
341
338
        objects = { blob.id: blob, tree.id: tree }
342
 
        ret, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
343
 
                (None, tree.id), base_inv, None, "somerevid", [],
344
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
 
339
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
 
340
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
345
341
        self.assertEquals(2, len(ret))
346
342
        self.assertEquals(None, ret[0][0])
347
343
        self.assertEquals("bla", ret[0][1])
361
357
        blob = Blob.from_string("bar")
362
358
        tree = Tree()
363
359
        tree.add(0100755, "foo", blob.id)
 
360
        tree.serialize()
364
361
        objects = { blob.id: blob, tree.id: tree }
365
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", "",
366
 
                (None, tree.id), base_inv, None, "somerevid", [],
367
 
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
 
362
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
 
363
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
368
364
        self.assertEquals(2, len(ret))
369
365
        self.assertEquals(None, ret[0][0])
370
366
        self.assertEquals("", ret[0][1])