/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

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
26
27
 
27
28
from bzrlib import (
28
29
    knit,
51
52
    )
52
53
from bzrlib.plugins.git.mapping import (
53
54
    BzrGitMappingv1,
54
 
    default_mapping,
55
 
    )
56
 
from bzrlib.plugins.git.shamap import (
57
 
    DictGitShaMap,
 
55
    DEFAULT_FILE_MODE,
58
56
    )
59
57
from bzrlib.plugins.git.tests import (
60
58
    GitBranchBuilder,
262
260
        return Repository.open(path)
263
261
 
264
262
 
 
263
class DummyStoreUpdater(object):
 
264
 
 
265
    def add_object(self, obj, ie):
 
266
        pass
 
267
 
 
268
    def finish(self):
 
269
        pass
 
270
 
 
271
 
265
272
class ImportObjects(TestCaseWithTransport):
266
273
 
267
274
    def setUp(self):
274
281
        blob = Blob.from_string("bar")
275
282
        base_inv = Inventory()
276
283
        objs = { "blobname": blob}
277
 
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
278
 
            base_inv, None, None, None, "somerevid", [], objs.__getitem__, False,
279
 
            False)
 
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(),
 
288
            self._mapping.generate_file_id)
280
289
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
281
290
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
282
291
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
292
301
    def test_import_tree_empty_root(self):
293
302
        base_inv = Inventory(root_id=None)
294
303
        tree = Tree()
295
 
        tree.serialize()
296
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
297
 
               tree.id, base_inv, None, None,
298
 
               None, "somerevid", [], {tree.id: tree}.__getitem__)
 
304
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
305
               (None, tree.id), base_inv, 
 
306
               None, "somerevid", [], {tree.id: tree}.__getitem__,
 
307
               (None, stat.S_IFDIR), DummyStoreUpdater(),
 
308
               self._mapping.generate_file_id)
 
309
        self.assertEquals(child_modes, {})
299
310
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
300
311
        self.assertEquals(1, len(ret))
301
312
        self.assertEquals(None, ret[0][0])
310
321
    def test_import_tree_empty(self):
311
322
        base_inv = Inventory()
312
323
        tree = Tree()
313
 
        tree.serialize()
314
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
315
 
           tree.id, base_inv, None, None, None, "somerevid", [], 
316
 
           { tree.id: tree }.__getitem__)
 
324
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
325
           (None, tree.id), base_inv, None, "somerevid", [], 
 
326
           { tree.id: tree }.__getitem__,
 
327
           (None, stat.S_IFDIR), DummyStoreUpdater(),
 
328
           self._mapping.generate_file_id)
 
329
        self.assertEquals(child_modes, {})
317
330
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
318
331
        self.assertEquals(1, len(ret))
319
332
        self.assertEquals(None, ret[0][0])
329
342
        base_inv = Inventory()
330
343
        blob = Blob.from_string("bar1")
331
344
        tree = Tree()
332
 
        tree.add(0100600, "foo", blob.id)
333
 
        tree.serialize()
 
345
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
334
346
        objects = { blob.id: blob, tree.id: tree }
335
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
336
 
            base_inv, None, None, None, "somerevid", [], objects.__getitem__)
 
347
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
348
                (None, tree.id), base_inv, None, "somerevid", [],
 
349
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
350
            self._mapping.generate_file_id)
 
351
        self.assertEquals(child_modes, {})
337
352
        self.assertEquals(2, len(ret))
338
353
        self.assertEquals(None, ret[0][0])
339
354
        self.assertEquals("bla", ret[0][1])
348
363
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
349
364
        self.assertEquals(False, ie.executable)
350
365
 
 
366
    def test_import_tree_with_unusual_mode_file(self):
 
367
        base_inv = Inventory()
 
368
        blob = Blob.from_string("bar1")
 
369
        tree = Tree()
 
370
        tree.add(stat.S_IFREG | 0664, "foo", blob.id)
 
371
        objects = { blob.id: blob, tree.id: tree }
 
372
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
373
                (None, tree.id), base_inv, None, "somerevid", [],
 
374
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
375
            self._mapping.generate_file_id)
 
376
        self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
 
377
 
351
378
    def test_import_tree_with_file_exe(self):
352
379
        base_inv = Inventory(root_id=None)
353
380
        blob = Blob.from_string("bar")
354
381
        tree = Tree()
355
382
        tree.add(0100755, "foo", blob.id)
356
 
        tree.serialize()
357
383
        objects = { blob.id: blob, tree.id: tree }
358
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
359
 
            base_inv, None, None, None, "somerevid", [], objects.__getitem__)
 
384
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
385
                (None, tree.id), base_inv, None, "somerevid", [],
 
386
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
387
            self._mapping.generate_file_id)
 
388
        self.assertEquals(child_modes, {})
360
389
        self.assertEquals(2, len(ret))
361
390
        self.assertEquals(None, ret[0][0])
362
391
        self.assertEquals("", ret[0][1])