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 dulwich.objects import (
26
from dulwich.repo import (
40
from ...branch import (
43
from ...controldir import (
46
from ...bzr.inventory import (
49
from ...repository import (
52
from ...tests import (
53
TestCaseWithTransport,
61
from ..mapping import (
70
class RepositoryFetchTests(object):
72
def make_git_repo(self, path):
74
return GitRepo.init(os.path.abspath(path))
76
def clone_git_repo(self, from_url, to_url, revision_id=None):
77
oldrepos = self.open_git_repo(from_url)
78
dir = ControlDir.create(to_url)
79
newrepos = dir.create_repository()
80
oldrepos.copy_content_into(newrepos, revision_id=revision_id)
84
self.make_git_repo("d")
85
newrepos = self.clone_git_repo("d", "f")
86
self.assertEqual([], newrepos.all_revision_ids())
88
def make_onerev_branch(self):
89
self.make_git_repo("d")
91
bb = GitBranchBuilder()
92
bb.set_file("foobar", b"foo\nbar\n", False)
93
mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
94
gitsha = bb.finish()[mark]
98
def test_single_rev(self):
99
path, gitsha = self.make_onerev_branch()
100
oldrepo = self.open_git_repo(path)
101
newrepo = self.clone_git_repo(path, "f")
102
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
103
self.assertEqual([revid], newrepo.all_revision_ids())
105
def test_single_rev_specific(self):
106
path, gitsha = self.make_onerev_branch()
107
oldrepo = self.open_git_repo(path)
108
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
109
newrepo = self.clone_git_repo(path, "f", revision_id=revid)
110
self.assertEqual([revid], newrepo.all_revision_ids())
112
def test_incremental(self):
113
self.make_git_repo("d")
115
bb = GitBranchBuilder()
116
bb.set_file("foobar", b"foo\nbar\n", False)
117
mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
118
bb.set_file("foobar", b"fooll\nbar\n", False)
119
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"nextmsg")
121
gitsha1 = marks[mark1]
122
gitsha2 = marks[mark2]
124
oldrepo = self.open_git_repo("d")
125
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
126
newrepo = self.clone_git_repo("d", "f", revision_id=revid1)
127
self.assertEqual([revid1], newrepo.all_revision_ids())
128
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
129
newrepo.fetch(oldrepo, revision_id=revid2)
130
self.assertEqual(set([revid1, revid2]),
131
set(newrepo.all_revision_ids()))
133
def test_dir_becomes_symlink(self):
134
self.make_git_repo("d")
136
bb = GitBranchBuilder()
137
bb.set_file("mylink/somefile", b"foo\nbar\n", False)
138
mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
139
bb.delete_entry("mylink/somefile")
140
bb.set_symlink("mylink", "target/")
141
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"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.assertEqual(revid1, tree1.get_file_revision("mylink"))
153
self.assertEqual("directory", tree1.kind("mylink"))
154
self.assertEqual(None, tree1.get_symlink_target("mylink"))
155
self.assertEqual(revid2, tree2.get_file_revision("mylink"))
156
self.assertEqual("symlink", tree2.kind("mylink"))
157
self.assertEqual("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(b"Somebody <somebody@someorg.org>", b"mymsg1")
165
bb.delete_entry("mylink")
166
bb.set_file("mylink/somefile", b"foo\nbar\n", False)
167
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
169
gitsha1 = marks[mark1]
170
gitsha2 = marks[mark2]
172
oldrepo = self.open_git_repo("d")
173
newrepo = self.clone_git_repo("d", "f")
174
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
175
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
176
tree1 = newrepo.revision_tree(revid1)
177
tree2 = newrepo.revision_tree(revid2)
178
self.assertEqual(revid1, tree1.get_file_revision("mylink"))
179
self.assertEqual("symlink", tree1.kind("mylink"))
180
self.assertEqual("target/", tree1.get_symlink_target("mylink"))
181
self.assertEqual(revid2, tree2.get_file_revision("mylink"))
182
self.assertEqual("directory", tree2.kind("mylink"))
183
self.assertEqual(None, tree2.get_symlink_target("mylink"))
185
def test_changing_symlink(self):
186
self.make_git_repo("d")
188
bb = GitBranchBuilder()
189
bb.set_symlink("mylink", "target")
190
mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
191
bb.set_symlink("mylink", "target/")
192
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
194
gitsha1 = marks[mark1]
195
gitsha2 = marks[mark2]
197
oldrepo = self.open_git_repo("d")
198
newrepo = self.clone_git_repo("d", "f")
199
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
200
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
201
tree1 = newrepo.revision_tree(revid1)
202
tree2 = newrepo.revision_tree(revid2)
203
self.assertEqual(revid1, tree1.get_file_revision("mylink"))
204
self.assertEqual("target", tree1.get_symlink_target("mylink"))
205
self.assertEqual(revid2, tree2.get_file_revision("mylink"))
206
self.assertEqual("target/", tree2.get_symlink_target("mylink"))
208
def test_executable(self):
209
self.make_git_repo("d")
211
bb = GitBranchBuilder()
212
bb.set_file("foobar", b"foo\nbar\n", True)
213
bb.set_file("notexec", b"foo\nbar\n", False)
214
mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
215
gitsha = bb.finish()[mark]
217
oldrepo = self.open_git_repo("d")
218
newrepo = self.clone_git_repo("d", "f")
219
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
220
tree = newrepo.revision_tree(revid)
221
self.assertTrue(tree.has_filename("foobar"))
222
self.assertEqual(True, tree.is_executable("foobar"))
223
self.assertTrue(tree.has_filename("notexec"))
224
self.assertEqual(False, tree.is_executable("notexec"))
226
def test_becomes_executable(self):
227
self.make_git_repo("d")
229
bb = GitBranchBuilder()
230
bb.set_file("foobar", b"foo\nbar\n", False)
231
mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
232
bb.set_file("foobar", b"foo\nbar\n", True)
233
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
234
gitsha2 = bb.finish()[mark2]
236
oldrepo = self.open_git_repo("d")
237
newrepo = self.clone_git_repo("d", "f")
238
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
239
tree = newrepo.revision_tree(revid)
240
self.assertTrue(tree.has_filename("foobar"))
241
self.assertEqual(True, tree.is_executable("foobar"))
242
self.assertEqual(revid, tree.get_file_revision("foobar"))
244
def test_into_stacked_on(self):
245
r = self.make_git_repo("d")
247
bb = GitBranchBuilder()
248
bb.set_file(u"foobar", b"foo\n", False)
249
mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
250
gitsha1 = bb.finish()[mark1]
252
stacked_on = self.clone_git_repo("d", "stacked-on")
253
oldrepo = Repository.open("d")
254
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
255
self.assertEqual([revid1], stacked_on.all_revision_ids())
256
b = stacked_on.controldir.create_branch()
257
b.generate_revision_history(revid1)
258
self.assertEqual(b.last_revision(), revid1)
259
tree = self.make_branch_and_tree("stacked")
260
tree.branch.set_stacked_on_url(b.user_url)
262
bb = GitBranchBuilder()
263
bb.set_file(u"barbar", b"bar\n", False)
264
bb.set_file(u"foo/blie/bla", b"bla\n", False)
265
mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
266
gitsha2 = bb.finish()[mark2]
267
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
269
tree.branch.fetch(Branch.open("d"))
270
tree.branch.repository.check()
271
self.addCleanup(tree.lock_read().unlock)
274
tree.branch.repository.revisions.without_fallbacks().keys())
276
set([revid1, revid2]),
277
set(tree.branch.repository.all_revision_ids()))
279
def test_non_ascii_characters(self):
280
self.make_git_repo("d")
282
bb = GitBranchBuilder()
283
bb.set_file(u"foőbar", b"foo\nbar\n", False)
284
mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
285
gitsha = bb.finish()[mark]
287
oldrepo = self.open_git_repo("d")
288
newrepo = self.clone_git_repo("d", "f")
289
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
290
tree = newrepo.revision_tree(revid)
291
self.assertTrue(tree.has_filename(u"foőbar"))
293
def test_tagged_tree(self):
294
r = self.make_git_repo("d")
296
bb = GitBranchBuilder()
297
bb.set_file("foobar", b"fooll\nbar\n", False)
298
mark = bb.commit(b"Somebody <somebody@someorg.org>", b"nextmsg")
302
tag.name = b"sometag"
303
tag.tag_time = int(time.time())
305
tag.tagger = b"Somebody <somebody@example.com>"
306
tag.message = b"Created tag pointed at tree"
307
tag.object = (Tree, r[gitsha].tree)
308
r.object_store.add_object(tag)
309
r[b"refs/tags/sometag"] = tag
311
oldrepo = self.open_git_repo("d")
312
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
313
newrepo = self.clone_git_repo("d", "f")
314
self.assertEqual(set([revid]), set(newrepo.all_revision_ids()))
317
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
319
def open_git_repo(self, path):
320
return Repository.open(path)
323
class DummyStoreUpdater(object):
325
def add_object(self, obj, ie, path):
332
class ImportObjects(TestCaseWithTransport):
335
super(ImportObjects, self).setUp()
336
self._mapping = BzrGitMappingv1()
337
factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
338
self._texts = factory(self.get_transport('texts'))
340
def test_import_blob_missing_in_one_parent(self):
341
builder = self.make_branch_builder('br')
342
builder.start_series()
343
rev_root = builder.build_snapshot(None, [
344
('add', ('', b'rootid', 'directory', ''))])
345
rev1 = builder.build_snapshot([rev_root], [
346
('add', ('bla', self._mapping.generate_file_id('bla'), 'file', b'content'))])
347
rev2 = builder.build_snapshot([rev_root], [])
348
builder.finish_series()
349
branch = builder.get_branch()
351
blob = Blob.from_string(b"bar")
352
objs = {"blobname": blob}
353
ret = import_git_blob(self._texts, self._mapping, b"bla", b"bla",
355
branch.repository.revision_tree(
356
rev1), b'rootid', b"somerevid",
357
[branch.repository.revision_tree(r) for r in [
360
(None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
361
self._mapping.generate_file_id)
362
self.assertEqual(set([(b'git:bla', b'somerevid')]), self._texts.keys())
364
def test_import_blob_simple(self):
365
blob = Blob.from_string(b"bar")
366
objs = {"blobname": blob}
367
ret = import_git_blob(self._texts, self._mapping, b"bla", b"bla",
369
None, None, b"somerevid", [], objs.__getitem__,
370
(None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
371
self._mapping.generate_file_id)
372
self.assertEqual(set([(b'git:bla', b'somerevid')]), self._texts.keys())
373
self.assertEqual(next(self._texts.get_record_stream([(b'git:bla', b'somerevid')],
374
"unordered", True)).get_bytes_as("fulltext"), b"bar")
375
self.assertEqual(1, len(ret))
376
self.assertEqual(None, ret[0][0])
377
self.assertEqual("bla", ret[0][1])
379
self.assertEqual(False, ie.executable)
380
self.assertEqual("file", ie.kind)
381
self.assertEqual(b"somerevid", ie.revision)
382
self.assertEqual(osutils.sha_strings([b"bar"]), ie.text_sha1)
384
def test_import_tree_empty_root(self):
386
ret, child_modes = import_git_tree(self._texts, self._mapping, b"", b"",
387
(None, tree.id), None,
388
None, b"somerevid", [], {
389
tree.id: tree}.__getitem__,
390
(None, stat.S_IFDIR), DummyStoreUpdater(),
391
self._mapping.generate_file_id)
392
self.assertEqual(child_modes, {})
394
set([(b"TREE_ROOT", b'somerevid')]), self._texts.keys())
395
self.assertEqual(1, len(ret))
396
self.assertEqual(None, ret[0][0])
397
self.assertEqual("", ret[0][1])
399
self.assertEqual(False, ie.executable)
400
self.assertEqual("directory", ie.kind)
401
self.assertEqual({}, ie.children)
402
self.assertEqual(b"somerevid", ie.revision)
403
self.assertEqual(None, ie.text_sha1)
405
def test_import_tree_empty(self):
407
ret, child_modes = import_git_tree(self._texts, self._mapping, b"bla", b"bla",
408
(None, tree.id), None, None, b"somerevid", [],
409
{tree.id: tree}.__getitem__,
410
(None, stat.S_IFDIR), DummyStoreUpdater(),
411
self._mapping.generate_file_id)
412
self.assertEqual(child_modes, {})
413
self.assertEqual(set([(b"git:bla", b'somerevid')]), self._texts.keys())
414
self.assertEqual(1, len(ret))
415
self.assertEqual(None, ret[0][0])
416
self.assertEqual("bla", ret[0][1])
418
self.assertEqual("directory", ie.kind)
419
self.assertEqual(False, ie.executable)
420
self.assertEqual({}, ie.children)
421
self.assertEqual(b"somerevid", ie.revision)
422
self.assertEqual(None, ie.text_sha1)
424
def test_import_tree_with_file(self):
425
blob = Blob.from_string(b"bar1")
427
tree.add(b"foo", stat.S_IFREG | 0o644, blob.id)
428
objects = {blob.id: blob, tree.id: tree}
429
ret, child_modes = import_git_tree(self._texts, self._mapping, b"bla", b"bla",
430
(None, tree.id), None, None, b"somerevid", [],
431
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(
433
self._mapping.generate_file_id)
434
self.assertEqual(child_modes, {})
435
self.assertEqual(2, len(ret))
436
self.assertEqual(None, ret[0][0])
437
self.assertEqual("bla", ret[0][1])
438
self.assertEqual(None, ret[1][0])
439
self.assertEqual("bla/foo", ret[1][1])
441
self.assertEqual("directory", ie.kind)
443
self.assertEqual("file", ie.kind)
444
self.assertEqual(b"git:bla/foo", ie.file_id)
445
self.assertEqual(b"somerevid", ie.revision)
446
self.assertEqual(osutils.sha_strings([b"bar1"]), ie.text_sha1)
447
self.assertEqual(False, ie.executable)
449
def test_import_tree_with_unusual_mode_file(self):
450
blob = Blob.from_string(b"bar1")
452
tree.add(b"foo", stat.S_IFREG | 0o664, blob.id)
453
objects = {blob.id: blob, tree.id: tree}
454
ret, child_modes = import_git_tree(self._texts, self._mapping,
455
b"bla", b"bla", (None, tree.id), None, None, b"somerevid", [
457
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(
459
self._mapping.generate_file_id)
460
self.assertEqual(child_modes, {b"bla/foo": stat.S_IFREG | 0o664})
462
def test_import_tree_with_file_exe(self):
463
blob = Blob.from_string(b"bar")
465
tree.add(b"foo", 0o100755, blob.id)
466
objects = {blob.id: blob, tree.id: tree}
467
ret, child_modes = import_git_tree(self._texts, self._mapping, b"", b"",
468
(None, tree.id), None, None, b"somerevid", [],
469
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(
471
self._mapping.generate_file_id)
472
self.assertEqual(child_modes, {})
473
self.assertEqual(2, len(ret))
474
self.assertEqual(None, ret[0][0])
475
self.assertEqual("", ret[0][1])
476
self.assertEqual(None, ret[1][0])
477
self.assertEqual("foo", ret[1][1])
479
self.assertEqual("directory", ie.kind)
481
self.assertEqual("file", ie.kind)
482
self.assertEqual(True, ie.executable)
484
def test_directory_converted_to_submodule(self):
485
base_inv = Inventory()
486
base_inv.add_path("foo", "directory")
487
base_inv.add_path("foo/bar", "file")
488
othertree = Blob.from_string(b"someotherthing")
489
blob = Blob.from_string(b"bar")
491
tree.add(b"bar", 0o160000, blob.id)
492
objects = {tree.id: tree}
493
ret, child_modes = import_git_submodule(self._texts, self._mapping, b"foo", b"foo",
494
(tree.id, othertree.id), base_inv, base_inv.root.file_id, b"somerevid", [
496
objects.__getitem__, (stat.S_IFDIR | 0o755, S_IFGITLINK), DummyStoreUpdater(
498
self._mapping.generate_file_id)
499
self.assertEqual(child_modes, {})
500
self.assertEqual(2, len(ret))
502
ret[0], ("foo/bar", None, base_inv.path2id("foo/bar"), None))
503
self.assertEqual(ret[1][:3], ("foo", "foo",
504
self._mapping.generate_file_id("foo")))
506
self.assertEqual(ie.kind, "tree-reference")
added
removed
breezy/git/tests/test_fetch.py
