/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

Store abbreviation in foreign branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
2
# -*- coding: utf-8 -*-
 
3
#
 
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.
 
8
#
 
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.
 
13
#
 
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
 
17
 
 
18
from dulwich.objects import (
 
19
    Blob,
 
20
    Tree,
 
21
    )
 
22
from dulwich.repo import (
 
23
    Repo as GitRepo,
 
24
    )
 
25
import os
 
26
 
 
27
from bzrlib import (
 
28
    knit,
 
29
    osutils,
 
30
    versionedfile,
 
31
    )
 
32
from bzrlib.bzrdir import (
 
33
    BzrDir,
 
34
    )
 
35
from bzrlib.inventory import (
 
36
    Inventory,
 
37
    )
 
38
from bzrlib.repository import (
 
39
    Repository,
 
40
    )
 
41
from bzrlib.tests import (
 
42
    TestCaseWithTransport,
 
43
    )
 
44
from bzrlib.transport import (
 
45
    get_transport,
 
46
    )
 
47
 
 
48
from bzrlib.plugins.git import (
 
49
    get_rich_root_format,
 
50
    )
 
51
from bzrlib.plugins.git.fetch import (
 
52
    import_git_blob,
 
53
    import_git_tree,
 
54
    )
 
55
from bzrlib.plugins.git.mapping import (
 
56
    BzrGitMappingv1,
 
57
    default_mapping,
 
58
    )
 
59
from bzrlib.plugins.git.shamap import (
 
60
    DictGitShaMap,
 
61
    )
 
62
from bzrlib.plugins.git.tests import (
 
63
    GitBranchBuilder,
 
64
    )
 
65
 
 
66
 
 
67
class RepositoryFetchTests:
 
68
 
 
69
    def make_git_repo(self, path):
 
70
        os.mkdir(path)
 
71
        GitRepo.init(path)
 
72
 
 
73
    def clone_git_repo(self, from_url, to_url, revision_id=None):
 
74
        oldrepos = self.open_git_repo(from_url)
 
75
        dir = BzrDir.create(to_url, get_rich_root_format())
 
76
        newrepos = dir.create_repository()
 
77
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
 
78
        return newrepos
 
79
 
 
80
    def test_empty(self):
 
81
        self.make_git_repo("d")
 
82
        newrepos = self.clone_git_repo("d", "f")
 
83
        self.assertEquals([], newrepos.all_revision_ids())
 
84
 
 
85
    def make_onerev_branch(self):
 
86
        self.make_git_repo("d")
 
87
        os.chdir("d")
 
88
        bb = GitBranchBuilder()
 
89
        bb.set_file("foobar", "foo\nbar\n", False)
 
90
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
91
        gitsha = bb.finish()[mark]
 
92
        os.chdir("..")
 
93
        return "d", gitsha
 
94
 
 
95
    def test_single_rev(self):
 
96
        path, gitsha = self.make_onerev_branch()
 
97
        oldrepo = self.open_git_repo(path)
 
98
        newrepo = self.clone_git_repo(path, "f")
 
99
        self.assertEquals([oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)], newrepo.all_revision_ids())
 
100
 
 
101
    def test_single_rev_specific(self):
 
102
        path, gitsha = self.make_onerev_branch()
 
103
        oldrepo = self.open_git_repo(path)
 
104
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
105
        newrepo = self.clone_git_repo(path, "f", revision_id=revid)
 
106
        self.assertEquals([revid], newrepo.all_revision_ids())
 
107
 
 
108
    def test_incremental(self):
 
109
        self.make_git_repo("d")
 
110
        os.chdir("d")
 
111
        bb = GitBranchBuilder()
 
112
        bb.set_file("foobar", "foo\nbar\n", False)
 
113
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
114
        bb.set_file("foobar", "fooll\nbar\n", False)
 
115
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "nextmsg")
 
116
        marks = bb.finish()
 
117
        gitsha1 = marks[mark1]
 
118
        gitsha2 = marks[mark2]
 
119
        os.chdir("..")
 
120
        oldrepo = self.open_git_repo("d")
 
121
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
122
        newrepo = self.clone_git_repo("d", "f", revision_id=revid1)
 
123
        self.assertEquals([revid1], newrepo.all_revision_ids())
 
124
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
125
        newrepo.fetch(oldrepo, revision_id=revid2)
 
126
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
 
127
 
 
128
    def test_dir_becomes_symlink(self):
 
129
        self.make_git_repo("d")
 
130
        os.chdir("d")
 
131
        bb = GitBranchBuilder()
 
132
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
 
133
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
134
        bb.set_symlink("mylink", "target/")
 
135
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
136
        marks = bb.finish()
 
137
        gitsha1 = marks[mark1]
 
138
        gitsha2 = marks[mark2]
 
139
        os.chdir("..")
 
140
        oldrepo = self.open_git_repo("d")
 
141
        newrepo = self.clone_git_repo("d", "f")
 
142
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
143
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
144
        tree1 = newrepo.revision_tree(revid1)
 
145
        tree2 = newrepo.revision_tree(revid2)
 
146
        fileid = tree1.path2id("mylink")
 
147
        ie1 = tree1.inventory[fileid]
 
148
        ie2 = tree2.inventory[fileid]
 
149
        self.assertEquals(revid1, ie1.revision)
 
150
        self.assertEquals("directory", ie1.kind)
 
151
        self.assertEquals(None, ie1.symlink_target)
 
152
        self.assertEquals(revid2, ie2.revision)
 
153
        self.assertEquals("symlink", ie2.kind)
 
154
        self.assertEquals("target/", ie2.symlink_target)
 
155
 
 
156
    def test_symlink_becomes_dir(self):
 
157
        self.make_git_repo("d")
 
158
        os.chdir("d")
 
159
        bb = GitBranchBuilder()
 
160
        bb.set_symlink("mylink", "target/")
 
161
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
162
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
 
163
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
164
        marks = bb.finish()
 
165
        gitsha1 = marks[mark1]
 
166
        gitsha2 = marks[mark2]
 
167
        os.chdir("..")
 
168
        oldrepo = self.open_git_repo("d")
 
169
        newrepo = self.clone_git_repo("d", "f")
 
170
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
171
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
172
        tree1 = newrepo.revision_tree(revid1)
 
173
        tree2 = newrepo.revision_tree(revid2)
 
174
        fileid = tree1.path2id("mylink")
 
175
        ie1 = tree1.inventory[fileid]
 
176
        ie2 = tree2.inventory[fileid]
 
177
        self.assertEquals(revid1, ie1.revision)
 
178
        self.assertEquals("symlink", ie1.kind)
 
179
        self.assertEquals("target/", ie1.symlink_target)
 
180
        self.assertEquals(revid2, ie2.revision)
 
181
        self.assertEquals("directory", ie2.kind)
 
182
        self.assertEquals(None, ie2.symlink_target)
 
183
 
 
184
    def test_changing_symlink(self):
 
185
        self.make_git_repo("d")
 
186
        os.chdir("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")
 
192
        marks = bb.finish()
 
193
        gitsha1 = marks[mark1]
 
194
        gitsha2 = marks[mark2]
 
195
        os.chdir("..")
 
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
        fileid = tree1.path2id("mylink")
 
203
        ie1 = tree1.inventory[fileid]
 
204
        ie2 = tree2.inventory[fileid]
 
205
        self.assertEquals(revid1, ie1.revision)
 
206
        self.assertEquals("target", ie1.symlink_target)
 
207
        self.assertEquals(revid2, ie2.revision)
 
208
        self.assertEquals("target/", ie2.symlink_target)
 
209
 
 
210
    def test_executable(self):
 
211
        self.make_git_repo("d")
 
212
        os.chdir("d")
 
213
        bb = GitBranchBuilder()
 
214
        bb.set_file("foobar", "foo\nbar\n", True)
 
215
        bb.set_file("notexec", "foo\nbar\n", False)
 
216
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
217
        gitsha = bb.finish()[mark]
 
218
        os.chdir("..")
 
219
        oldrepo = self.open_git_repo("d")
 
220
        newrepo = self.clone_git_repo("d", "f")
 
221
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
222
        tree = newrepo.revision_tree(revid)
 
223
        self.assertTrue(tree.has_filename("foobar"))
 
224
        self.assertEquals(True, tree.inventory[tree.path2id("foobar")].executable)
 
225
        self.assertTrue(tree.has_filename("notexec"))
 
226
        self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
 
227
 
 
228
    def test_becomes_executable(self):
 
229
        self.make_git_repo("d")
 
230
        os.chdir("d")
 
231
        bb = GitBranchBuilder()
 
232
        bb.set_file("foobar", "foo\nbar\n", False)
 
233
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
234
        bb.set_file("foobar", "foo\nbar\n", True)
 
235
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
236
        gitsha2 = bb.finish()[mark2]
 
237
        os.chdir("..")
 
238
        oldrepo = self.open_git_repo("d")
 
239
        newrepo = self.clone_git_repo("d", "f")
 
240
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
241
        tree = newrepo.revision_tree(revid)
 
242
        self.assertTrue(tree.has_filename("foobar"))
 
243
        ie = tree.inventory[tree.path2id("foobar")]
 
244
        self.assertEquals(True, ie.executable)
 
245
        self.assertEquals(revid, ie.revision)
 
246
 
 
247
    def test_non_ascii_characters(self):
 
248
        self.make_git_repo("d")
 
249
        os.chdir("d")
 
250
        bb = GitBranchBuilder()
 
251
        bb.set_file(u"foőbar", "foo\nbar\n", False)
 
252
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
253
        gitsha = bb.finish()[mark]
 
254
        os.chdir("..")
 
255
        oldrepo = self.open_git_repo("d")
 
256
        newrepo = self.clone_git_repo("d", "f")
 
257
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
258
        tree = newrepo.revision_tree(revid)
 
259
        self.assertTrue(tree.has_filename(u"foőbar"))
 
260
 
 
261
 
 
262
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
 
263
 
 
264
    def open_git_repo(self, path):
 
265
        return Repository.open(path)
 
266
 
 
267
 
 
268
class ImportObjects(TestCaseWithTransport):
 
269
 
 
270
    def setUp(self):
 
271
        super(ImportObjects, self).setUp()
 
272
        self._map = DictGitShaMap()
 
273
        self._mapping = BzrGitMappingv1()
 
274
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
 
275
        self._texts = factory(self.get_transport('texts'))
 
276
 
 
277
    def test_import_blob_simple(self):
 
278
        blob = Blob.from_string("bar")
 
279
        base_inv = Inventory()
 
280
        objs = { "blobname": blob}
 
281
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
282
            base_inv, None, None, "somerevid", [], self._map, objs.__getitem__, False,
 
283
            False)
 
284
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
 
285
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
 
286
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
 
287
        self.assertEquals(1, len(ret)) 
 
288
        self.assertEquals(None, ret[0][0])
 
289
        self.assertEquals("bla", ret[0][1])
 
290
        ie = ret[0][3]
 
291
        self.assertEquals(False, ie.executable)
 
292
        self.assertEquals("file", ie.kind)
 
293
        self.assertEquals("somerevid", ie.revision)
 
294
        self.assertEquals(osutils.sha_strings(["bar"]), ie.text_sha1)
 
295
 
 
296
    def test_import_tree_empty_root(self):
 
297
        base_inv = Inventory(root_id=None)
 
298
        tree = Tree()
 
299
        tree.serialize()
 
300
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
 
301
               tree.id, base_inv, None,
 
302
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
 
303
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
 
304
        self.assertEquals(1, len(ret))
 
305
        self.assertEquals(None, ret[0][0])
 
306
        self.assertEquals("", ret[0][1])
 
307
        ie = ret[0][3]
 
308
        self.assertEquals(False, ie.executable)
 
309
        self.assertEquals("directory", ie.kind)
 
310
        self.assertEquals({}, ie.children)
 
311
        self.assertEquals("somerevid", ie.revision)
 
312
        self.assertEquals(None, ie.text_sha1)
 
313
 
 
314
    def test_import_tree_empty(self):
 
315
        base_inv = Inventory()
 
316
        tree = Tree()
 
317
        tree.serialize()
 
318
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
 
319
           tree.id, base_inv, None, None, "somerevid", [], 
 
320
           self._map, { tree.id: tree }.__getitem__)
 
321
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
 
322
        self.assertEquals(1, len(ret))
 
323
        self.assertEquals(None, ret[0][0])
 
324
        self.assertEquals("bla", ret[0][1])
 
325
        ie = ret[0][3]
 
326
        self.assertEquals("directory", ie.kind)
 
327
        self.assertEquals(False, ie.executable)
 
328
        self.assertEquals({}, ie.children)
 
329
        self.assertEquals("somerevid", ie.revision)
 
330
        self.assertEquals(None, ie.text_sha1)
 
331
 
 
332
    def test_import_tree_with_file(self):
 
333
        base_inv = Inventory()
 
334
        blob = Blob.from_string("bar1")
 
335
        tree = Tree()
 
336
        tree.add(0100600, "foo", blob.id)
 
337
        tree.serialize()
 
338
        objects = { blob.id: blob, tree.id: tree }
 
339
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
 
340
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
 
341
        self.assertEquals(2, len(ret))
 
342
        self.assertEquals(None, ret[0][0])
 
343
        self.assertEquals("bla", ret[0][1])
 
344
        self.assertEquals(None, ret[1][0])
 
345
        self.assertEquals("bla/foo", ret[1][1])
 
346
        ie = ret[0][3]
 
347
        self.assertEquals("directory", ie.kind)
 
348
        ie = ret[1][3]
 
349
        self.assertEquals("file", ie.kind)
 
350
        self.assertEquals("bla/foo", ie.file_id)
 
351
        self.assertEquals("somerevid", ie.revision)
 
352
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
 
353
        self.assertEquals(False, ie.executable)
 
354
 
 
355
    def test_import_tree_with_file_exe(self):
 
356
        base_inv = Inventory(root_id=None)
 
357
        blob = Blob.from_string("bar")
 
358
        tree = Tree()
 
359
        tree.add(0100755, "foo", blob.id)
 
360
        tree.serialize()
 
361
        objects = { blob.id: blob, tree.id: tree }
 
362
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
 
363
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
 
364
        self.assertEquals(2, len(ret))
 
365
        self.assertEquals(None, ret[0][0])
 
366
        self.assertEquals("", ret[0][1])
 
367
        self.assertEquals(None, ret[1][0])
 
368
        self.assertEquals("foo", ret[1][1])
 
369
        ie = ret[0][3]
 
370
        self.assertEquals("directory", ie.kind)
 
371
        ie = ret[1][3]
 
372
        self.assertEquals("file", ie.kind)
 
373
        self.assertEquals(True, ie.executable)