1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from dulwich.objects import (
22
from dulwich.repo import (
33
from bzrlib.bzrdir import (
36
from bzrlib.inventory import (
39
from bzrlib.repository import (
42
from bzrlib.tests import (
43
TestCaseWithTransport,
46
from bzrlib.plugins.git import (
49
from bzrlib.plugins.git.fetch import (
53
from bzrlib.plugins.git.mapping import (
57
from bzrlib.plugins.git.tests import (
62
class RepositoryFetchTests:
64
def make_git_repo(self, path):
68
def clone_git_repo(self, from_url, to_url, revision_id=None):
69
oldrepos = self.open_git_repo(from_url)
70
dir = BzrDir.create(to_url, get_rich_root_format())
71
newrepos = dir.create_repository()
72
oldrepos.copy_content_into(newrepos, revision_id=revision_id)
76
self.make_git_repo("d")
77
newrepos = self.clone_git_repo("d", "f")
78
self.assertEquals([], newrepos.all_revision_ids())
80
def make_onerev_branch(self):
81
self.make_git_repo("d")
83
bb = GitBranchBuilder()
84
bb.set_file("foobar", "foo\nbar\n", False)
85
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
86
gitsha = bb.finish()[mark]
90
def test_single_rev(self):
91
path, gitsha = self.make_onerev_branch()
92
oldrepo = self.open_git_repo(path)
93
newrepo = self.clone_git_repo(path, "f")
94
self.assertEquals([oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)], newrepo.all_revision_ids())
96
def test_single_rev_specific(self):
97
path, gitsha = self.make_onerev_branch()
98
oldrepo = self.open_git_repo(path)
99
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
100
newrepo = self.clone_git_repo(path, "f", revision_id=revid)
101
self.assertEquals([revid], newrepo.all_revision_ids())
103
def test_incremental(self):
104
self.make_git_repo("d")
106
bb = GitBranchBuilder()
107
bb.set_file("foobar", "foo\nbar\n", False)
108
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
109
bb.set_file("foobar", "fooll\nbar\n", False)
110
mark2 = bb.commit("Somebody <somebody@someorg.org>", "nextmsg")
112
gitsha1 = marks[mark1]
113
gitsha2 = marks[mark2]
115
oldrepo = self.open_git_repo("d")
116
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
117
newrepo = self.clone_git_repo("d", "f", revision_id=revid1)
118
self.assertEquals([revid1], newrepo.all_revision_ids())
119
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
120
newrepo.fetch(oldrepo, revision_id=revid2)
121
self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
123
def test_dir_becomes_symlink(self):
124
self.make_git_repo("d")
126
bb = GitBranchBuilder()
127
bb.set_file("mylink/somefile", "foo\nbar\n", False)
128
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
129
bb.set_symlink("mylink", "target/")
130
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
132
gitsha1 = marks[mark1]
133
gitsha2 = marks[mark2]
135
oldrepo = self.open_git_repo("d")
136
newrepo = self.clone_git_repo("d", "f")
137
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
138
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
139
tree1 = newrepo.revision_tree(revid1)
140
tree2 = newrepo.revision_tree(revid2)
141
fileid = tree1.path2id("mylink")
142
ie1 = tree1.inventory[fileid]
143
ie2 = tree2.inventory[fileid]
144
self.assertEquals(revid1, ie1.revision)
145
self.assertEquals("directory", ie1.kind)
146
self.assertEquals(None, ie1.symlink_target)
147
self.assertEquals(revid2, ie2.revision)
148
self.assertEquals("symlink", ie2.kind)
149
self.assertEquals("target/", ie2.symlink_target)
151
def test_symlink_becomes_dir(self):
152
self.make_git_repo("d")
154
bb = GitBranchBuilder()
155
bb.set_symlink("mylink", "target/")
156
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
157
bb.set_file("mylink/somefile", "foo\nbar\n", False)
158
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
160
gitsha1 = marks[mark1]
161
gitsha2 = marks[mark2]
163
oldrepo = self.open_git_repo("d")
164
newrepo = self.clone_git_repo("d", "f")
165
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
166
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
167
tree1 = newrepo.revision_tree(revid1)
168
tree2 = newrepo.revision_tree(revid2)
169
fileid = tree1.path2id("mylink")
170
ie1 = tree1.inventory[fileid]
171
ie2 = tree2.inventory[fileid]
172
self.assertEquals(revid1, ie1.revision)
173
self.assertEquals("symlink", ie1.kind)
174
self.assertEquals("target/", ie1.symlink_target)
175
self.assertEquals(revid2, ie2.revision)
176
self.assertEquals("directory", ie2.kind)
177
self.assertEquals(None, ie2.symlink_target)
179
def test_changing_symlink(self):
180
self.make_git_repo("d")
182
bb = GitBranchBuilder()
183
bb.set_symlink("mylink", "target")
184
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
185
bb.set_symlink("mylink", "target/")
186
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
188
gitsha1 = marks[mark1]
189
gitsha2 = marks[mark2]
191
oldrepo = self.open_git_repo("d")
192
newrepo = self.clone_git_repo("d", "f")
193
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
194
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
195
tree1 = newrepo.revision_tree(revid1)
196
tree2 = newrepo.revision_tree(revid2)
197
fileid = tree1.path2id("mylink")
198
ie1 = tree1.inventory[fileid]
199
ie2 = tree2.inventory[fileid]
200
self.assertEquals(revid1, ie1.revision)
201
self.assertEquals("target", ie1.symlink_target)
202
self.assertEquals(revid2, ie2.revision)
203
self.assertEquals("target/", ie2.symlink_target)
205
def test_executable(self):
206
self.make_git_repo("d")
208
bb = GitBranchBuilder()
209
bb.set_file("foobar", "foo\nbar\n", True)
210
bb.set_file("notexec", "foo\nbar\n", False)
211
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
212
gitsha = bb.finish()[mark]
214
oldrepo = self.open_git_repo("d")
215
newrepo = self.clone_git_repo("d", "f")
216
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
217
tree = newrepo.revision_tree(revid)
218
self.assertTrue(tree.has_filename("foobar"))
219
self.assertEquals(True, tree.inventory[tree.path2id("foobar")].executable)
220
self.assertTrue(tree.has_filename("notexec"))
221
self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
223
def test_becomes_executable(self):
224
self.make_git_repo("d")
226
bb = GitBranchBuilder()
227
bb.set_file("foobar", "foo\nbar\n", False)
228
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
229
bb.set_file("foobar", "foo\nbar\n", True)
230
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
231
gitsha2 = bb.finish()[mark2]
233
oldrepo = self.open_git_repo("d")
234
newrepo = self.clone_git_repo("d", "f")
235
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
236
tree = newrepo.revision_tree(revid)
237
self.assertTrue(tree.has_filename("foobar"))
238
ie = tree.inventory[tree.path2id("foobar")]
239
self.assertEquals(True, ie.executable)
240
self.assertEquals(revid, ie.revision)
242
def test_non_ascii_characters(self):
243
self.make_git_repo("d")
245
bb = GitBranchBuilder()
246
bb.set_file(u"foőbar", "foo\nbar\n", False)
247
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
248
gitsha = bb.finish()[mark]
250
oldrepo = self.open_git_repo("d")
251
newrepo = self.clone_git_repo("d", "f")
252
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
253
tree = newrepo.revision_tree(revid)
254
self.assertTrue(tree.has_filename(u"foőbar"))
257
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
259
def open_git_repo(self, path):
260
return Repository.open(path)
263
class DummyStoreUpdater(object):
265
def add_object(self, obj, ie):
272
class ImportObjects(TestCaseWithTransport):
275
super(ImportObjects, self).setUp()
276
self._mapping = BzrGitMappingv1()
277
factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
278
self._texts = factory(self.get_transport('texts'))
280
def test_import_blob_simple(self):
281
blob = Blob.from_string("bar")
282
base_inv = Inventory()
283
objs = { "blobname": blob}
284
ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
286
base_inv, None, "somerevid", [], objs.__getitem__,
287
(None, DEFAULT_FILE_MODE), DummyStoreUpdater())
288
self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
289
self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
290
"unordered", True).next().get_bytes_as("fulltext"), "bar")
291
self.assertEquals(1, len(ret))
292
self.assertEquals(None, ret[0][0])
293
self.assertEquals("bla", ret[0][1])
295
self.assertEquals(False, ie.executable)
296
self.assertEquals("file", ie.kind)
297
self.assertEquals("somerevid", ie.revision)
298
self.assertEquals(osutils.sha_strings(["bar"]), ie.text_sha1)
300
def test_import_tree_empty_root(self):
301
base_inv = Inventory(root_id=None)
303
ret, _ = import_git_tree(self._texts, self._mapping, "", "",
304
(None, tree.id), base_inv,
305
None, "somerevid", [], {tree.id: tree}.__getitem__,
306
(None, stat.S_IFDIR), DummyStoreUpdater())
307
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])
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)
318
def test_import_tree_empty(self):
319
base_inv = Inventory()
321
ret, _ = 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.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
326
self.assertEquals(1, len(ret))
327
self.assertEquals(None, ret[0][0])
328
self.assertEquals("bla", ret[0][1])
330
self.assertEquals("directory", ie.kind)
331
self.assertEquals(False, ie.executable)
332
self.assertEquals({}, ie.children)
333
self.assertEquals("somerevid", ie.revision)
334
self.assertEquals(None, ie.text_sha1)
336
def test_import_tree_with_file(self):
337
base_inv = Inventory()
338
blob = Blob.from_string("bar1")
340
tree.add(0100600, "foo", blob.id)
341
objects = { blob.id: blob, tree.id: tree }
342
ret, _ = import_git_tree(self._texts, self._mapping, "bla", "bla",
343
(None, tree.id), base_inv, None, "somerevid", [],
344
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
345
self.assertEquals(2, len(ret))
346
self.assertEquals(None, ret[0][0])
347
self.assertEquals("bla", ret[0][1])
348
self.assertEquals(None, ret[1][0])
349
self.assertEquals("bla/foo", ret[1][1])
351
self.assertEquals("directory", ie.kind)
353
self.assertEquals("file", ie.kind)
354
self.assertEquals("bla/foo", ie.file_id)
355
self.assertEquals("somerevid", ie.revision)
356
self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
357
self.assertEquals(False, ie.executable)
359
def test_import_tree_with_file_exe(self):
360
base_inv = Inventory(root_id=None)
361
blob = Blob.from_string("bar")
363
tree.add(0100755, "foo", blob.id)
364
objects = { blob.id: blob, tree.id: tree }
365
ret, _ = import_git_tree(self._texts, self._mapping, "", "",
366
(None, tree.id), base_inv, None, "somerevid", [],
367
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater())
368
self.assertEquals(2, len(ret))
369
self.assertEquals(None, ret[0][0])
370
self.assertEquals("", ret[0][1])
371
self.assertEquals(None, ret[1][0])
372
self.assertEquals("foo", ret[1][1])
374
self.assertEquals("directory", ie.kind)
376
self.assertEquals("file", ie.kind)
377
self.assertEquals(True, ie.executable)
added
removed
tests/test_fetch.py
