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
- browse files at revision 0.200.214
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.214
- Committer: Jelmer Vernooij
- Date: 2009-02-01 16:28:29 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20090201162829-bt3jndmpe3p7rzi4
mention the requirement to install Dulwich.
- files added:
- foreign
- files removed:
- HACKING
- notes
- files renamed:
- tests/test_mapping.py => tests/test_ids.py
- files modified:
- .bzrignore
added
removed
tests/test_fetch.py
1
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
# -*- coding: utf-8 -*-
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
16
18
from dulwich.objects import (
19
Blob,
20
Tree,
21
)
22
from dulwich.repo import (
23
Repo as GitRepo,
24
)
25
import os
26
import stat
27
28
from bzrlib import (
29
knit,
30
osutils,
31
versionedfile,
32
)
33
from bzrlib.bzrdir import (
34
BzrDir,
35
)
36
from bzrlib.inventory import (
37
Inventory,
38
)
39
from bzrlib.repository import (
40
Repository,
41
)
42
from bzrlib.tests import (
43
TestCaseWithTransport,
44
)
45
46
from bzrlib.plugins.git import (
47
get_rich_root_format,
48
)
49
from bzrlib.plugins.git.fetch import (
50
import_git_blob,
51
import_git_tree,
52
)
53
from bzrlib.plugins.git.mapping import (
54
BzrGitMappingv1,
55
DEFAULT_FILE_MODE,
56
)
57
from bzrlib.plugins.git.tests import (
58
GitBranchBuilder,
59
)
60
61
62
class RepositoryFetchTests:
63
64
def make_git_repo(self, path):
65
os.mkdir(path)
66
GitRepo.init(path)
67
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)
73
return newrepos
17
from bzrlib.plugins.git.fetch import BzrFetchGraphWalker
18
from bzrlib.plugins.git.mapping import default_mapping
19
20
from bzrlib.tests import TestCaseWithTransport
21
22
class FetchGraphWalkerTests(TestCaseWithTransport):
23
24
def setUp(self):
25
TestCaseWithTransport.setUp(self)
26
self.mapping = default_mapping
74
27
75
28
def test_empty(self):
76
self.make_git_repo("d")
77
newrepos = self.clone_git_repo("d", "f")
78
self.assertEquals([], newrepos.all_revision_ids())
79
80
def make_onerev_branch(self):
81
self.make_git_repo("d")
82
os.chdir("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]
87
os.chdir("..")
88
return "d", gitsha
89
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())
95
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())
102
103
def test_incremental(self):
104
self.make_git_repo("d")
105
os.chdir("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")
111
marks = bb.finish()
112
gitsha1 = marks[mark1]
113
gitsha2 = marks[mark2]
114
os.chdir("..")
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()))
122
123
def test_dir_becomes_symlink(self):
124
self.make_git_repo("d")
125
os.chdir("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")
131
marks = bb.finish()
132
gitsha1 = marks[mark1]
133
gitsha2 = marks[mark2]
134
os.chdir("..")
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)
150
151
def test_symlink_becomes_dir(self):
152
self.make_git_repo("d")
153
os.chdir("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")
159
marks = bb.finish()
160
gitsha1 = marks[mark1]
161
gitsha2 = marks[mark2]
162
os.chdir("..")
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)
178
179
def test_changing_symlink(self):
180
self.make_git_repo("d")
181
os.chdir("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")
187
marks = bb.finish()
188
gitsha1 = marks[mark1]
189
gitsha2 = marks[mark2]
190
os.chdir("..")
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)
204
205
def test_executable(self):
206
self.make_git_repo("d")
207
os.chdir("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]
213
os.chdir("..")
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)
222
223
def test_becomes_executable(self):
224
self.make_git_repo("d")
225
os.chdir("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]
232
os.chdir("..")
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)
241
242
def test_non_ascii_characters(self):
243
self.make_git_repo("d")
244
os.chdir("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]
249
os.chdir("..")
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"))
255
256
257
class LocalRepositoryFetchTests(RepositoryFetchTests, TestCaseWithTransport):
258
259
def open_git_repo(self, path):
260
return Repository.open(path)
261
262
263
class DummyStoreUpdater(object):
264
265
def add_object(self, obj, ie):
266
pass
267
268
def finish(self):
269
pass
270
271
272
class ImportObjects(TestCaseWithTransport):
273
274
def setUp(self):
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'))
279
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",
285
(None, "blobname"),
286
base_inv, None, "somerevid", [], objs.__getitem__,
287
(None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
288
self._mapping.generate_file_id)
289
self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
290
self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
291
"unordered", True).next().get_bytes_as("fulltext"), "bar")
292
self.assertEquals(1, len(ret))
293
self.assertEquals(None, ret[0][0])
294
self.assertEquals("bla", ret[0][1])
295
ie = ret[0][3]
296
self.assertEquals(False, ie.executable)
297
self.assertEquals("file", ie.kind)
298
self.assertEquals("somerevid", ie.revision)
299
self.assertEquals(osutils.sha_strings(["bar"]), ie.text_sha1)
300
301
def test_import_tree_empty_root(self):
302
base_inv = Inventory(root_id=None)
303
tree = Tree()
304
ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
305
(None, tree.id), base_inv,
306
None, "somerevid", [], {tree.id: tree}.__getitem__,
307
(None, stat.S_IFDIR), DummyStoreUpdater(),
308
self._mapping.generate_file_id)
309
self.assertEquals(child_modes, {})
310
self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
311
self.assertEquals(1, len(ret))
312
self.assertEquals(None, ret[0][0])
313
self.assertEquals("", ret[0][1])
314
ie = ret[0][3]
315
self.assertEquals(False, ie.executable)
316
self.assertEquals("directory", ie.kind)
317
self.assertEquals({}, ie.children)
318
self.assertEquals("somerevid", ie.revision)
319
self.assertEquals(None, ie.text_sha1)
320
321
def test_import_tree_empty(self):
322
base_inv = Inventory()
323
tree = Tree()
324
ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
325
(None, tree.id), base_inv, None, "somerevid", [],
326
{ tree.id: tree }.__getitem__,
327
(None, stat.S_IFDIR), DummyStoreUpdater(),
328
self._mapping.generate_file_id)
329
self.assertEquals(child_modes, {})
330
self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
331
self.assertEquals(1, len(ret))
332
self.assertEquals(None, ret[0][0])
333
self.assertEquals("bla", ret[0][1])
334
ie = ret[0][3]
335
self.assertEquals("directory", ie.kind)
336
self.assertEquals(False, ie.executable)
337
self.assertEquals({}, ie.children)
338
self.assertEquals("somerevid", ie.revision)
339
self.assertEquals(None, ie.text_sha1)
340
341
def test_import_tree_with_file(self):
342
base_inv = Inventory()
343
blob = Blob.from_string("bar1")
344
tree = Tree()
345
tree.add(stat.S_IFREG | 0644, "foo", blob.id)
346
objects = { blob.id: blob, tree.id: tree }
347
ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
348
(None, tree.id), base_inv, None, "somerevid", [],
349
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
350
self._mapping.generate_file_id)
351
self.assertEquals(child_modes, {})
352
self.assertEquals(2, len(ret))
353
self.assertEquals(None, ret[0][0])
354
self.assertEquals("bla", ret[0][1])
355
self.assertEquals(None, ret[1][0])
356
self.assertEquals("bla/foo", ret[1][1])
357
ie = ret[0][3]
358
self.assertEquals("directory", ie.kind)
359
ie = ret[1][3]
360
self.assertEquals("file", ie.kind)
361
self.assertEquals("bla/foo", ie.file_id)
362
self.assertEquals("somerevid", ie.revision)
363
self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
364
self.assertEquals(False, ie.executable)
365
366
def test_import_tree_with_unusual_mode_file(self):
367
base_inv = Inventory()
368
blob = Blob.from_string("bar1")
369
tree = Tree()
370
tree.add(stat.S_IFREG | 0664, "foo", blob.id)
371
objects = { blob.id: blob, tree.id: tree }
372
ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
373
(None, tree.id), base_inv, None, "somerevid", [],
374
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
375
self._mapping.generate_file_id)
376
self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
377
378
def test_import_tree_with_file_exe(self):
379
base_inv = Inventory(root_id=None)
380
blob = Blob.from_string("bar")
381
tree = Tree()
382
tree.add(0100755, "foo", blob.id)
383
objects = { blob.id: blob, tree.id: tree }
384
ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
385
(None, tree.id), base_inv, None, "somerevid", [],
386
objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
387
self._mapping.generate_file_id)
388
self.assertEquals(child_modes, {})
389
self.assertEquals(2, len(ret))
390
self.assertEquals(None, ret[0][0])
391
self.assertEquals("", ret[0][1])
392
self.assertEquals(None, ret[1][0])
393
self.assertEquals("foo", ret[1][1])
394
ie = ret[0][3]
395
self.assertEquals("directory", ie.kind)
396
ie = ret[1][3]
397
self.assertEquals("file", ie.kind)
398
self.assertEquals(True, ie.executable)
29
tree = self.make_branch_and_tree("wt")
30
graphwalker = BzrFetchGraphWalker(tree.branch.repository, self.mapping)
31
self.assertEquals(None, graphwalker.next())
32
33
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0