/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

Print proper error about not supporting push.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
1
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
 
# -*- coding: utf-8 -*-
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
19
18
    Blob,
20
19
    Tree,
21
20
    )
22
 
from dulwich.repo import (
23
 
    Repo as GitRepo,
24
 
    )
25
21
import os
26
 
import stat
27
22
 
28
23
from bzrlib import (
29
24
    knit,
42
37
from bzrlib.tests import (
43
38
    TestCaseWithTransport,
44
39
    )
 
40
from bzrlib.transport import (
 
41
    get_transport,
 
42
    )
45
43
 
 
44
from bzrlib.plugins.git import (
 
45
    get_rich_root_format,
 
46
    )
46
47
from bzrlib.plugins.git.fetch import (
 
48
    BzrFetchGraphWalker,
47
49
    import_git_blob,
48
50
    import_git_tree,
49
51
    )
50
52
from bzrlib.plugins.git.mapping import (
51
53
    BzrGitMappingv1,
52
 
    DEFAULT_FILE_MODE,
 
54
    default_mapping,
 
55
    )
 
56
from bzrlib.plugins.git.shamap import (
 
57
    DictGitShaMap,
53
58
    )
54
59
from bzrlib.plugins.git.tests import (
55
60
    GitBranchBuilder,
 
61
    run_git,
56
62
    )
57
63
 
58
64
 
 
65
class FetchGraphWalkerTests(TestCaseWithTransport):
 
66
 
 
67
    def setUp(self):
 
68
        TestCaseWithTransport.setUp(self)
 
69
        self.mapping = default_mapping
 
70
 
 
71
    def test_empty(self):
 
72
        tree = self.make_branch_and_tree("wt")
 
73
        graphwalker = BzrFetchGraphWalker(tree.branch.repository, self.mapping)
 
74
        self.assertEquals(None, graphwalker.next())
 
75
 
 
76
 
59
77
class RepositoryFetchTests:
60
78
 
61
79
    def make_git_repo(self, path):
62
80
        os.mkdir(path)
63
 
        GitRepo.init(path)
 
81
        os.chdir(path)
 
82
        run_git("init")
 
83
        os.chdir("..")
64
84
 
65
85
    def clone_git_repo(self, from_url, to_url, revision_id=None):
66
86
        oldrepos = self.open_git_repo(from_url)
67
 
        dir = BzrDir.create(to_url)
 
87
        dir = BzrDir.create(to_url, get_rich_root_format())
68
88
        newrepos = dir.create_repository()
69
89
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
70
90
        return newrepos
117
137
        newrepo.fetch(oldrepo, revision_id=revid2)
118
138
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
119
139
 
120
 
    def test_dir_becomes_symlink(self):
121
 
        self.make_git_repo("d")
122
 
        os.chdir("d")
123
 
        bb = GitBranchBuilder()
124
 
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
125
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
126
 
        bb.set_symlink("mylink", "target/")
127
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
128
 
        marks = bb.finish()
129
 
        gitsha1 = marks[mark1]
130
 
        gitsha2 = marks[mark2]
131
 
        os.chdir("..")
132
 
        oldrepo = self.open_git_repo("d")
133
 
        newrepo = self.clone_git_repo("d", "f")
134
 
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
135
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
136
 
        tree1 = newrepo.revision_tree(revid1)
137
 
        tree2 = newrepo.revision_tree(revid2)
138
 
        fileid = tree1.path2id("mylink")
139
 
        ie1 = tree1.inventory[fileid]
140
 
        ie2 = tree2.inventory[fileid]
141
 
        self.assertEquals(revid1, ie1.revision)
142
 
        self.assertEquals("directory", ie1.kind)
143
 
        self.assertEquals(None, ie1.symlink_target)
144
 
        self.assertEquals(revid2, ie2.revision)
145
 
        self.assertEquals("symlink", ie2.kind)
146
 
        self.assertEquals("target/", ie2.symlink_target)
147
 
 
148
 
    def test_symlink_becomes_dir(self):
149
 
        self.make_git_repo("d")
150
 
        os.chdir("d")
151
 
        bb = GitBranchBuilder()
152
 
        bb.set_symlink("mylink", "target/")
153
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
154
 
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
155
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
156
 
        marks = bb.finish()
157
 
        gitsha1 = marks[mark1]
158
 
        gitsha2 = marks[mark2]
159
 
        os.chdir("..")
160
 
        oldrepo = self.open_git_repo("d")
161
 
        newrepo = self.clone_git_repo("d", "f")
162
 
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
163
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
164
 
        tree1 = newrepo.revision_tree(revid1)
165
 
        tree2 = newrepo.revision_tree(revid2)
166
 
        fileid = tree1.path2id("mylink")
167
 
        ie1 = tree1.inventory[fileid]
168
 
        ie2 = tree2.inventory[fileid]
169
 
        self.assertEquals(revid1, ie1.revision)
170
 
        self.assertEquals("symlink", ie1.kind)
171
 
        self.assertEquals("target/", ie1.symlink_target)
172
 
        self.assertEquals(revid2, ie2.revision)
173
 
        self.assertEquals("directory", ie2.kind)
174
 
        self.assertEquals(None, ie2.symlink_target)
175
 
 
176
 
    def test_changing_symlink(self):
177
 
        self.make_git_repo("d")
178
 
        os.chdir("d")
179
 
        bb = GitBranchBuilder()
180
 
        bb.set_symlink("mylink", "target")
181
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
182
 
        bb.set_symlink("mylink", "target/")
183
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
184
 
        marks = bb.finish()
185
 
        gitsha1 = marks[mark1]
186
 
        gitsha2 = marks[mark2]
187
 
        os.chdir("..")
188
 
        oldrepo = self.open_git_repo("d")
189
 
        newrepo = self.clone_git_repo("d", "f")
190
 
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
191
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
192
 
        tree1 = newrepo.revision_tree(revid1)
193
 
        tree2 = newrepo.revision_tree(revid2)
194
 
        fileid = tree1.path2id("mylink")
195
 
        ie1 = tree1.inventory[fileid]
196
 
        ie2 = tree2.inventory[fileid]
197
 
        self.assertEquals(revid1, ie1.revision)
198
 
        self.assertEquals("target", ie1.symlink_target)
199
 
        self.assertEquals(revid2, ie2.revision)
200
 
        self.assertEquals("target/", ie2.symlink_target)
201
 
 
202
140
    def test_executable(self):
203
141
        self.make_git_repo("d")
204
142
        os.chdir("d")
217
155
        self.assertTrue(tree.has_filename("notexec"))
218
156
        self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
219
157
 
220
 
    def test_becomes_executable(self):
221
 
        self.make_git_repo("d")
222
 
        os.chdir("d")
223
 
        bb = GitBranchBuilder()
224
 
        bb.set_file("foobar", "foo\nbar\n", False)
225
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
226
 
        bb.set_file("foobar", "foo\nbar\n", True)
227
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
228
 
        gitsha2 = bb.finish()[mark2]
229
 
        os.chdir("..")
230
 
        oldrepo = self.open_git_repo("d")
231
 
        newrepo = self.clone_git_repo("d", "f")
232
 
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
233
 
        tree = newrepo.revision_tree(revid)
234
 
        self.assertTrue(tree.has_filename("foobar"))
235
 
        ie = tree.inventory[tree.path2id("foobar")]
236
 
        self.assertEquals(True, ie.executable)
237
 
        self.assertEquals(revid, ie.revision)
238
 
 
239
 
    def test_non_ascii_characters(self):
240
 
        self.make_git_repo("d")
241
 
        os.chdir("d")
242
 
        bb = GitBranchBuilder()
243
 
        bb.set_file(u"foőbar", "foo\nbar\n", False)
244
 
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
245
 
        gitsha = bb.finish()[mark]
246
 
        os.chdir("..")
247
 
        oldrepo = self.open_git_repo("d")
248
 
        newrepo = self.clone_git_repo("d", "f")
249
 
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
250
 
        tree = newrepo.revision_tree(revid)
251
 
        self.assertTrue(tree.has_filename(u"foőbar"))
252
 
 
253
158
 
254
159
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
255
160
 
257
162
        return Repository.open(path)
258
163
 
259
164
 
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
165
class ImportObjects(TestCaseWithTransport):
270
166
 
271
167
    def setUp(self):
272
168
        super(ImportObjects, self).setUp()
 
169
        self._map = DictGitShaMap()
273
170
        self._mapping = BzrGitMappingv1()
274
171
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
275
172
        self._texts = factory(self.get_transport('texts'))
276
173
 
277
174
    def test_import_blob_simple(self):
278
175
        blob = Blob.from_string("bar")
279
 
        base_inv = Inventory()
280
 
        objs = { "blobname": blob}
281
 
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
282
 
            (None, "blobname"), 
283
 
            base_inv, None, "somerevid", [], objs.__getitem__, 
284
 
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
285
 
            self._mapping.generate_file_id)
 
176
        inv = Inventory()
 
177
        inv.revision_id = "somerevid"
 
178
        import_git_blob(self._texts, self._mapping, "bla", blob, 
 
179
            inv, [], self._map, False)
286
180
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
287
181
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
288
182
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
289
 
        self.assertEquals(1, len(ret)) 
290
 
        self.assertEquals(None, ret[0][0])
291
 
        self.assertEquals("bla", ret[0][1])
292
 
        ie = ret[0][3]
293
 
        self.assertEquals(False, ie.executable)
294
 
        self.assertEquals("file", ie.kind)
295
 
        self.assertEquals("somerevid", ie.revision)
296
 
        self.assertEquals(osutils.sha_strings(["bar"]), ie.text_sha1)
 
183
        self.assertEquals(False, inv["bla"].executable)
 
184
        self.assertEquals("file", inv["bla"].kind)
 
185
        self.assertEquals("somerevid", inv["bla"].revision)
 
186
        self.assertEquals(osutils.sha_strings(["bar"]), inv["bla"].text_sha1)
297
187
 
298
188
    def test_import_tree_empty_root(self):
299
 
        base_inv = Inventory(root_id=None)
 
189
        inv = Inventory()
 
190
        inv.revision_id = "somerevid"
300
191
        tree = Tree()
301
 
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
302
 
               (None, tree.id), base_inv, 
303
 
               None, "somerevid", [], {tree.id: tree}.__getitem__,
304
 
               (None, stat.S_IFDIR), DummyStoreUpdater(),
305
 
               self._mapping.generate_file_id)
306
 
        self.assertEquals(child_modes, {})
 
192
        tree.serialize()
 
193
        import_git_tree(self._texts, self._mapping, "", tree, inv, [], 
 
194
            self._map, {}.__getitem__)
307
195
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
 
        self.assertEquals(1, len(ret))
309
 
        self.assertEquals(None, ret[0][0])
310
 
        self.assertEquals("", ret[0][1])
311
 
        ie = ret[0][3]
312
 
        self.assertEquals(False, ie.executable)
313
 
        self.assertEquals("directory", ie.kind)
314
 
        self.assertEquals({}, ie.children)
315
 
        self.assertEquals("somerevid", ie.revision)
316
 
        self.assertEquals(None, ie.text_sha1)
 
196
        self.assertEquals(False, inv["TREE_ROOT"].executable)
 
197
        self.assertEquals("directory", inv["TREE_ROOT"].kind)
 
198
        self.assertEquals({}, inv["TREE_ROOT"].children)
 
199
        self.assertEquals("somerevid", inv["TREE_ROOT"].revision)
 
200
        self.assertEquals(None, inv["TREE_ROOT"].text_sha1)
317
201
 
318
202
    def test_import_tree_empty(self):
319
 
        base_inv = Inventory()
 
203
        inv = Inventory()
 
204
        inv.revision_id = "somerevid"
320
205
        tree = Tree()
321
 
        ret, child_modes = 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(),
325
 
           self._mapping.generate_file_id)
326
 
        self.assertEquals(child_modes, {})
 
206
        tree.serialize()
 
207
        import_git_tree(self._texts, self._mapping, "bla", tree, inv, [], 
 
208
            self._map, {}.__getitem__)
327
209
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
328
 
        self.assertEquals(1, len(ret))
329
 
        self.assertEquals(None, ret[0][0])
330
 
        self.assertEquals("bla", ret[0][1])
331
 
        ie = ret[0][3]
332
 
        self.assertEquals("directory", ie.kind)
333
 
        self.assertEquals(False, ie.executable)
334
 
        self.assertEquals({}, ie.children)
335
 
        self.assertEquals("somerevid", ie.revision)
336
 
        self.assertEquals(None, ie.text_sha1)
 
210
        self.assertEquals("directory", inv["bla"].kind)
 
211
        self.assertEquals(False, inv["bla"].executable)
 
212
        self.assertEquals({}, inv["bla"].children)
 
213
        self.assertEquals("somerevid", inv["bla"].revision)
 
214
        self.assertEquals(None, inv["bla"].text_sha1)
337
215
 
338
216
    def test_import_tree_with_file(self):
339
 
        base_inv = Inventory()
 
217
        inv = Inventory()
 
218
        inv.revision_id = "somerevid"
340
219
        blob = Blob.from_string("bar1")
341
220
        tree = Tree()
342
 
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
 
221
        tree.add(0100600, "foo", blob.id)
 
222
        tree.serialize()
343
223
        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, {})
349
 
        self.assertEquals(2, len(ret))
350
 
        self.assertEquals(None, ret[0][0])
351
 
        self.assertEquals("bla", ret[0][1])
352
 
        self.assertEquals(None, ret[1][0])
353
 
        self.assertEquals("bla/foo", ret[1][1])
354
 
        ie = ret[0][3]
355
 
        self.assertEquals("directory", ie.kind)
356
 
        ie = ret[1][3]
 
224
        import_git_tree(self._texts, self._mapping, "bla", tree, inv, [], 
 
225
            self._map, objects.__getitem__)
 
226
        self.assertEquals(["foo"], inv["bla"].children.keys())
 
227
        self.assertEquals(set(["bla", "bla/foo"]), 
 
228
                set([ie.file_id for (path, ie) in inv.entries()]))
 
229
        ie = inv["bla/foo"]
357
230
        self.assertEquals("file", ie.kind)
358
231
        self.assertEquals("bla/foo", ie.file_id)
359
232
        self.assertEquals("somerevid", ie.revision)
360
233
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
361
234
        self.assertEquals(False, ie.executable)
362
235
 
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
236
    def test_import_tree_with_file_exe(self):
376
 
        base_inv = Inventory(root_id=None)
 
237
        inv = Inventory()
 
238
        inv.revision_id = "somerevid"
377
239
        blob = Blob.from_string("bar")
378
240
        tree = Tree()
379
241
        tree.add(0100755, "foo", blob.id)
 
242
        tree.serialize()
380
243
        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, {})
386
 
        self.assertEquals(2, len(ret))
387
 
        self.assertEquals(None, ret[0][0])
388
 
        self.assertEquals("", ret[0][1])
389
 
        self.assertEquals(None, ret[1][0])
390
 
        self.assertEquals("foo", ret[1][1])
391
 
        ie = ret[0][3]
392
 
        self.assertEquals("directory", ie.kind)
393
 
        ie = ret[1][3]
 
244
        import_git_tree(self._texts, self._mapping, "bla", tree, inv, [], 
 
245
            self._map, objects.__getitem__)
 
246
        self.assertEquals(["foo"], inv["bla"].children.keys())
 
247
        ie = inv["bla/foo"]
394
248
        self.assertEquals("file", ie.kind)
395
249
        self.assertEquals(True, ie.executable)