/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

More work on supporting roundtripping push.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
19
19
    Blob,
20
20
    Tree,
21
21
    )
 
22
from dulwich.repo import (
 
23
    Repo as GitRepo,
 
24
    )
22
25
import os
 
26
import stat
23
27
 
24
28
from bzrlib import (
25
29
    knit,
38
42
from bzrlib.tests import (
39
43
    TestCaseWithTransport,
40
44
    )
41
 
from bzrlib.transport import (
42
 
    get_transport,
43
 
    )
44
45
 
45
 
from bzrlib.plugins.git import (
46
 
    get_rich_root_format,
47
 
    )
48
46
from bzrlib.plugins.git.fetch import (
49
 
    BzrFetchGraphWalker,
50
47
    import_git_blob,
51
48
    import_git_tree,
52
49
    )
53
50
from bzrlib.plugins.git.mapping import (
54
51
    BzrGitMappingv1,
55
 
    default_mapping,
56
 
    )
57
 
from bzrlib.plugins.git.shamap import (
58
 
    DictGitShaMap,
 
52
    DEFAULT_FILE_MODE,
59
53
    )
60
54
from bzrlib.plugins.git.tests import (
61
55
    GitBranchBuilder,
62
 
    run_git,
63
56
    )
64
57
 
65
58
 
66
 
class FetchGraphWalkerTests(TestCaseWithTransport):
67
 
 
68
 
    def setUp(self):
69
 
        TestCaseWithTransport.setUp(self)
70
 
        self.mapping = default_mapping
71
 
 
72
 
    def test_empty(self):
73
 
        tree = self.make_branch_and_tree("wt")
74
 
        graphwalker = BzrFetchGraphWalker(tree.branch.repository, self.mapping)
75
 
        self.assertEquals(None, graphwalker.next())
76
 
 
77
 
 
78
59
class RepositoryFetchTests:
79
60
 
80
61
    def make_git_repo(self, path):
81
62
        os.mkdir(path)
82
 
        os.chdir(path)
83
 
        run_git("init")
84
 
        os.chdir("..")
 
63
        GitRepo.init(path)
85
64
 
86
65
    def clone_git_repo(self, from_url, to_url, revision_id=None):
87
66
        oldrepos = self.open_git_repo(from_url)
88
 
        dir = BzrDir.create(to_url, get_rich_root_format())
 
67
        dir = BzrDir.create(to_url)
89
68
        newrepos = dir.create_repository()
90
69
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
91
70
        return newrepos
138
117
        newrepo.fetch(oldrepo, revision_id=revid2)
139
118
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
140
119
 
 
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
 
141
202
    def test_executable(self):
142
203
        self.make_git_repo("d")
143
204
        os.chdir("d")
156
217
        self.assertTrue(tree.has_filename("notexec"))
157
218
        self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
158
219
 
 
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
 
159
239
    def test_non_ascii_characters(self):
160
240
        self.make_git_repo("d")
161
241
        os.chdir("d")
177
257
        return Repository.open(path)
178
258
 
179
259
 
 
260
class DummyStoreUpdater(object):
 
261
 
 
262
    def add_object(self, obj, ie, path):
 
263
        pass
 
264
 
 
265
    def finish(self):
 
266
        pass
 
267
 
 
268
 
180
269
class ImportObjects(TestCaseWithTransport):
181
270
 
182
271
    def setUp(self):
183
272
        super(ImportObjects, self).setUp()
184
 
        self._map = DictGitShaMap()
185
273
        self._mapping = BzrGitMappingv1()
186
274
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
187
275
        self._texts = factory(self.get_transport('texts'))
190
278
        blob = Blob.from_string("bar")
191
279
        base_inv = Inventory()
192
280
        objs = { "blobname": blob}
193
 
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
194
 
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
195
 
            False)
 
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)
196
286
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
197
287
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
198
288
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
208
298
    def test_import_tree_empty_root(self):
209
299
        base_inv = Inventory(root_id=None)
210
300
        tree = Tree()
211
 
        tree.serialize()
212
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
213
 
               tree.id, base_inv, 
214
 
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
 
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, {})
215
307
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
216
308
        self.assertEquals(1, len(ret))
217
309
        self.assertEquals(None, ret[0][0])
226
318
    def test_import_tree_empty(self):
227
319
        base_inv = Inventory()
228
320
        tree = Tree()
229
 
        tree.serialize()
230
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
231
 
           tree.id, base_inv, None, "somerevid", [], 
232
 
           self._map, { tree.id: tree }.__getitem__)
 
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, {})
233
327
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
234
328
        self.assertEquals(1, len(ret))
235
329
        self.assertEquals(None, ret[0][0])
245
339
        base_inv = Inventory()
246
340
        blob = Blob.from_string("bar1")
247
341
        tree = Tree()
248
 
        tree.add(0100600, "foo", blob.id)
249
 
        tree.serialize()
 
342
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
250
343
        objects = { blob.id: blob, tree.id: tree }
251
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
252
 
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
 
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, {})
253
349
        self.assertEquals(2, len(ret))
254
350
        self.assertEquals(None, ret[0][0])
255
351
        self.assertEquals("bla", ret[0][1])
264
360
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
265
361
        self.assertEquals(False, ie.executable)
266
362
 
 
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
 
267
375
    def test_import_tree_with_file_exe(self):
268
376
        base_inv = Inventory(root_id=None)
269
377
        blob = Blob.from_string("bar")
270
378
        tree = Tree()
271
379
        tree.add(0100755, "foo", blob.id)
272
 
        tree.serialize()
273
380
        objects = { blob.id: blob, tree.id: tree }
274
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
275
 
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
 
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, {})
276
386
        self.assertEquals(2, len(ret))
277
387
        self.assertEquals(None, ret[0][0])
278
388
        self.assertEquals("", ret[0][1])