1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
# -*- coding: utf-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Tests from fetching from git into bzr."""
20
from __future__ import absolute_import
22
from dulwich.objects import (
28
from dulwich.repo import (
42
from ....branch import (
45
from ....controldir import (
48
from ....bzr.inventory import (
51
from ....repository import (
54
from ....tests import (
55
TestCaseWithTransport,
63
from ..mapping import (
72
class RepositoryFetchTests(object):
74
def make_git_repo(self, path):
76
return GitRepo.init(os.path.abspath(path))
78
def clone_git_repo(self, from_url, to_url, revision_id=None):
79
oldrepos = self.open_git_repo(from_url)
80
dir = ControlDir.create(to_url)
81
newrepos = dir.create_repository()
82
oldrepos.copy_content_into(newrepos, revision_id=revision_id)
86
self.make_git_repo("d")
87
newrepos = self.clone_git_repo("d", "f")
88
self.assertEquals([], newrepos.all_revision_ids())
90
def make_onerev_branch(self):
91
self.make_git_repo("d")
93
bb = GitBranchBuilder()
94
bb.set_file("foobar", "foo\nbar\n", False)
95
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
96
gitsha = bb.finish()[mark]
100
def test_single_rev(self):
101
path, gitsha = self.make_onerev_branch()
102
oldrepo = self.open_git_repo(path)
103
newrepo = self.clone_git_repo(path, "f")
104
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
105
self.assertEquals([revid], newrepo.all_revision_ids())
107
def test_single_rev_specific(self):
108
path, gitsha = self.make_onerev_branch()
109
oldrepo = self.open_git_repo(path)
110
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
111
newrepo = self.clone_git_repo(path, "f", revision_id=revid)
112
self.assertEquals([revid], newrepo.all_revision_ids())
114
def test_incremental(self):
115
self.make_git_repo("d")
117
bb = GitBranchBuilder()
118
bb.set_file("foobar", "foo\nbar\n", False)
119
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
120
bb.set_file("foobar", "fooll\nbar\n", False)
121
mark2 = bb.commit("Somebody <somebody@someorg.org>", "nextmsg")
123
gitsha1 = marks[mark1]
124
gitsha2 = marks[mark2]
126
oldrepo = self.open_git_repo("d")
127
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
128
newrepo = self.clone_git_repo("d", "f", revision_id=revid1)
129
self.assertEquals([revid1], newrepo.all_revision_ids())
130
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
131
newrepo.fetch(oldrepo, revision_id=revid2)
132
self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
134
def test_dir_becomes_symlink(self):
135
self.make_git_repo("d")
137
bb = GitBranchBuilder()
138
bb.set_file("mylink/somefile", "foo\nbar\n", False)
139
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
140
bb.set_symlink("mylink", "target/")
141
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
143
gitsha1 = marks[mark1]
144
gitsha2 = marks[mark2]
146
oldrepo = self.open_git_repo("d")
147
newrepo = self.clone_git_repo("d", "f")
148
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
149
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
150
tree1 = newrepo.revision_tree(revid1)
151
tree2 = newrepo.revision_tree(revid2)
152
self.assertEquals(revid1, tree1.get_file_revision("mylink"))
153
self.assertEquals("directory", tree1.kind("mylink"))
154
self.assertEquals(None, tree1.get_symlink_target("mylink"))
155
self.assertEquals(revid2, tree2.get_file_revision("mylink"))
156
self.assertEquals("symlink", tree2.kind("mylink"))
157
self.assertEquals("target/", tree2.get_symlink_target("mylink"))
159
def test_symlink_becomes_dir(self):
160
self.make_git_repo("d")
162
bb = GitBranchBuilder()
163
bb.set_symlink("mylink", "target/")
164
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
165
bb.set_file("mylink/somefile", "foo\nbar\n", False)
166
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
168
gitsha1 = marks[mark1]
169
gitsha2 = marks[mark2]
171
oldrepo = self.open_git_repo("d")
172
newrepo = self.clone_git_repo("d", "f")
173
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
174
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
175
tree1 = newrepo.revision_tree(revid1)
176
tree2 = newrepo.revision_tree(revid2)
177
self.assertEquals(revid1, tree1.get_file_revision("mylink"))
178
self.assertEquals("symlink", tree1.kind("mylink"))
179
self.assertEquals("target/", tree1.get_symlink_target("mylink"))
180
self.assertEquals(revid2, tree2.get_file_revision("mylink"))
181
self.assertEquals("directory", tree2.kind("mylink"))
182
self.assertEquals(None, tree2.get_symlink_target("mylink"))
184
def test_changing_symlink(self):
185
self.make_git_repo("d")
187
bb = GitBranchBuilder()
188
bb.set_symlink("mylink", "target")
189
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
190
bb.set_symlink("mylink", "target/")
191
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
193
gitsha1 = marks[mark1]
194
gitsha2 = marks[mark2]
196
oldrepo = self.open_git_repo("d")
197
newrepo = self.clone_git_repo("d", "f")
198
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
199
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
200
tree1 = newrepo.revision_tree(revid1)
201
tree2 = newrepo.revision_tree(revid2)
202
self.assertEquals(revid1, tree1.get_file_revision("mylink"))
203
self.assertEquals("target", tree1.get_symlink_target("mylink"))
204
self.assertEquals(revid2, tree2.get_file_revision("mylink"))
205
self.assertEquals("target/", tree2.get_symlink_target("mylink"))
207
def test_executable(self):
208
self.make_git_repo("d")
210
bb = GitBranchBuilder()
211
bb.set_file("foobar", "foo\nbar\n", True)
212
bb.set_file("notexec", "foo\nbar\n", False)
213
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
214
gitsha = bb.finish()[mark]
216
oldrepo = self.open_git_repo("d")
217
newrepo = self.clone_git_repo("d", "f")
218
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
219
tree = newrepo.revision_tree(revid)
220
self.assertTrue(tree.has_filename("foobar"))
221
self.assertEquals(True, tree.is_executable("foobar"))
222
self.assertTrue(tree.has_filename("notexec"))
223
self.assertEquals(False, tree.is_executable("notexec"))
225
def test_becomes_executable(self):
226
self.make_git_repo("d")
228
bb = GitBranchBuilder()
229
bb.set_file("foobar", "foo\nbar\n", False)
230
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
231
bb.set_file("foobar", "foo\nbar\n", True)
232
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
233
gitsha2 = bb.finish()[mark2]
235
oldrepo = self.open_git_repo("d")
236
newrepo = self.clone_git_repo("d", "f")
237
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
238
tree = newrepo.revision_tree(revid)
239
self.assertTrue(tree.has_filename("foobar"))
240
self.assertEquals(True, tree.is_executable("foobar"))
241
self.assertEquals(revid, tree.get_file_revision("foobar"))
243
def test_into_stacked_on(self):
244
r = self.make_git_repo("d")
246
bb = GitBranchBuilder()
247
bb.set_file(u"foobar", "foo\n", False)
248
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
249
gitsha1 = bb.finish()[mark1]
251
stacked_on = self.clone_git_repo("d", "stacked-on")
252
oldrepo = Repository.open("d")
253
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
254
self.assertEquals([revid1], stacked_on.all_revision_ids())
255
b = stacked_on.controldir.create_branch()
256
b.generate_revision_history(revid1)
257
self.assertEquals(b.last_revision(), revid1)
258
tree = self.make_branch_and_tree("stacked")
259
tree.branch.set_stacked_on_url(b.user_url)
261
bb = GitBranchBuilder()
262
bb.set_file(u"barbar", "bar\n", False)
263
bb.set_file(u"foo/blie/bla", "bla\n", False)
264
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
265
gitsha2 = bb.finish()[mark2]
266
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
268
tree.branch.fetch(Branch.open("d"))
269
tree.branch.repository.check()
270
self.addCleanup(tree.lock_read().unlock)
273
tree.branch.repository.revisions.without_fallbacks().keys())
275
set([revid1, revid2]),
276
set(tree.branch.repository.all_revision_ids()))
278
def test_non_ascii_characters(self):
279
self.make_git_repo("d")
281
bb = GitBranchBuilder()
282
bb.set_file(u"foőbar", "foo\nbar\n", False)
283
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
284
gitsha = bb.finish()[mark]
286
oldrepo = self.open_git_repo("d")
287
newrepo = self.clone_git_repo("d", "f")
288
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
289
tree = newrepo.revision_tree(revid)
290
self.assertTrue(tree.has_filename(u"foőbar"))
292
def test_tagged_tree(self):
293
r = self.make_git_repo("d")
295
bb = GitBranchBuilder()
296
bb.set_file("foobar", "fooll\nbar\n", False)
297
mark = bb.commit("Somebody <somebody@someorg.org>", "nextmsg")
302
tag.tag_time = int(time.time())
304
tag.tagger = "Somebody <somebody@example.com>"
305
tag.message = "Created tag pointed at tree"
306
tag.object = (Tree, r[gitsha].tree)
307
r.object_store.add_object(tag)
308
r["refs/tags/sometag"] = tag
310
oldrepo = self.open_git_repo("d")
311
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
312
newrepo = self.clone_git_repo("d", "f")
313
self.assertEquals(set([revid]), set(newrepo.all_revision_ids()))
316
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
318
def open_git_repo(self, path):
319
return Repository.open(path)
322
class DummyStoreUpdater(object):
324
def add_object(self, obj, ie, path):
331
class ImportObjects(TestCaseWithTransport):
334
super(ImportObjects, self).setUp()
335
self._mapping = BzrGitMappingv1()
336
factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
337
self._texts = factory(self.get_transport('texts'))
339
def test_import_blob_simple(self):
340
blob = Blob.from_string("bar")
341
base_inv = Inventory()
342
objs = { "blobname": blob}
343
ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
345
base_inv, None, "somerevid", [], objs.__getitem__,
346
(None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
347
self._mapping.generate_file_id)
348
self.assertEquals(set([('git:bla', 'somerevid')]), self._texts.keys())
349
self.assertEquals(self._texts.get_record_stream([('git:bla', 'somerevid')],
350
"unordered", True).next().get_bytes_as("fulltext"), "bar")
351
self.assertEquals(1, len(ret))
352
self.assertEquals(None, ret[0][0])
353
self.assertEquals("bla", ret[0][1])
355
self.assertEquals(False, ie.executable)
356
self.assertEquals("file", ie.kind)
357
self.assertEquals("somerevid", ie.revision)
358
self.assertEquals(osutils.sha_strings(["bar"]), ie.text_sha1)
360
def test_import_tree_empty_root(self):
361
base_inv = Inventory(root_id=None)
363
ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
364
(None, tree.id), base_inv,
365
None, "somerevid", [], {tree.id: tree}.__getitem__,
366
(None, stat.S_IFDIR), DummyStoreUpdater(),
367
self._mapping.generate_file_id)
368
self.assertEquals(child_modes, {})
369
self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
370
self.assertEquals(1, len(ret))
371
self.assertEquals(None, ret[0][0])
372
self.assertEquals("", ret[0][1])
374
self.assertEquals(False, ie.executable)
375
self.assertEquals("directory", ie.kind)
376
self.assertEquals({}, ie.children)
377
self.assertEquals("somerevid", ie.revision)
378
self.assertEquals(None, ie.text_sha1)
380
def test_import_tree_empty(self):
381
base_inv = Inventory()
383
ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
384
(None, tree.id), base_inv, None, "somerevid", [],
385
{ tree.id: tree }.__getitem__,
386
(None, stat.S_IFDIR), DummyStoreUpdater(),
387
self._mapping.generate_file_id)
388
self.assertEquals(child_modes, {})
389
self.assertEquals(set([("git:bla", 'somerevid')]), self._texts.keys())
390
self.assertEquals(1, len(ret))
391
self.assertEquals(None, ret[0][0])
392
self.assertEquals("bla", ret[0][1])
394
self.assertEquals("directory", ie.kind)
395
self.assertEquals(False, ie.executable)
396
self.assertEquals({}, ie.children)
397
self.assertEquals("somerevid", ie.revision)
398
self.assertEquals(None, ie.text_sha1)
400
def test_import_tree_with_file(self):
401
base_inv = Inventory()
402
blob = Blob.from_string("bar1")
404
tree.add("foo", stat.S_IFREG | 0644, blob.id)
405
objects = { blob.id: blob, tree.id: tree }
406
ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
407
(None, tree.id), base_inv, None, "somerevid", [],
408
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
409
self._mapping.generate_file_id)
410
self.assertEquals(child_modes, {})
411
self.assertEquals(2, len(ret))
412
self.assertEquals(None, ret[0][0])
413
self.assertEquals("bla", ret[0][1])
414
self.assertEquals(None, ret[1][0])
415
self.assertEquals("bla/foo", ret[1][1])
417
self.assertEquals("directory", ie.kind)
419
self.assertEquals("file", ie.kind)
420
self.assertEquals("git:bla/foo", ie.file_id)
421
self.assertEquals("somerevid", ie.revision)
422
self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
423
self.assertEquals(False, ie.executable)
425
def test_import_tree_with_unusual_mode_file(self):
426
base_inv = Inventory()
427
blob = Blob.from_string("bar1")
429
tree.add("foo", stat.S_IFREG | 0664, blob.id)
430
objects = { blob.id: blob, tree.id: tree }
431
ret, child_modes = import_git_tree(self._texts, self._mapping,
432
"bla", "bla", (None, tree.id), base_inv, None, "somerevid", [],
433
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
434
self._mapping.generate_file_id)
435
self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
437
def test_import_tree_with_file_exe(self):
438
base_inv = Inventory(root_id=None)
439
blob = Blob.from_string("bar")
441
tree.add("foo", 0100755, blob.id)
442
objects = { blob.id: blob, tree.id: tree }
443
ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
444
(None, tree.id), base_inv, None, "somerevid", [],
445
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
446
self._mapping.generate_file_id)
447
self.assertEquals(child_modes, {})
448
self.assertEquals(2, len(ret))
449
self.assertEquals(None, ret[0][0])
450
self.assertEquals("", ret[0][1])
451
self.assertEquals(None, ret[1][0])
452
self.assertEquals("foo", ret[1][1])
454
self.assertEquals("directory", ie.kind)
456
self.assertEquals("file", ie.kind)
457
self.assertEquals(True, ie.executable)
459
def test_directory_converted_to_submodule(self):
460
base_inv = Inventory()
461
base_inv.add_path("foo", "directory")
462
base_inv.add_path("foo/bar", "file")
463
othertree = Blob.from_string("someotherthing")
464
blob = Blob.from_string("bar")
466
tree.add("bar", 0160000, blob.id)
467
objects = { tree.id: tree }
468
ret, child_modes = import_git_submodule(self._texts, self._mapping, "foo", "foo",
469
(tree.id, othertree.id), base_inv, base_inv.root.file_id, "somerevid", [],
470
objects.__getitem__, (stat.S_IFDIR | 0755, S_IFGITLINK), DummyStoreUpdater(),
471
self._mapping.generate_file_id)
472
self.assertEquals(child_modes, {})
473
self.assertEquals(2, len(ret))
474
self.assertEquals(ret[0], ("foo/bar", None, base_inv.path2id("foo/bar"), None))
475
self.assertEquals(ret[1][:3], ("foo", "foo", self._mapping.generate_file_id("foo")))
477
self.assertEquals(ie.kind, "tree-reference")
added
removed
tests/test_fetch.py
