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.252.40
- compare with another revision
- download diff
- download tarball
- view history from revision 0.252.40
- Committer: Jelmer Vernooij
- Date: 2010-05-13 08:40:18 UTC
- mto: (0.200.912 trunk)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20100513084018-xp9tbrasde6gih3o
Checks for roundtripping.
added
removed
tests/test_fetch.py
23
23
Repo as GitRepo,
24
24
)
25
25
import os
26
import stat
26
27
27
28
from bzrlib import (
28
29
knit,
41
42
from bzrlib.tests import (
42
43
TestCaseWithTransport,
43
44
)
44
from bzrlib.transport import (
45
get_transport,
46
)
47
45
48
46
from bzrlib.plugins.git import (
49
47
get_rich_root_format,
54
52
)
55
53
from bzrlib.plugins.git.mapping import (
56
54
BzrGitMappingv1,
57
default_mapping,
58
)
59
from bzrlib.plugins.git.shamap import (
60
DictGitShaMap,
55
DEFAULT_FILE_MODE,
61
56
)
62
57
from bzrlib.plugins.git.tests import (
63
58
GitBranchBuilder,
125
120
newrepo.fetch(oldrepo, revision_id=revid2)
126
121
self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
127
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
128
205
def test_executable(self):
129
206
self.make_git_repo("d")
130
207
os.chdir("d")
143
220
self.assertTrue(tree.has_filename("notexec"))
144
221
self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
145
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
146
242
def test_non_ascii_characters(self):
147
243
self.make_git_repo("d")
148
244
os.chdir("d")
164
260
return Repository.open(path)
165
261
166
262
263
class DummyStoreUpdater(object):
264
265
def add_object(self, obj, ie):
266
pass
267
268
def finish(self):
269
pass
270
271
167
272
class ImportObjects(TestCaseWithTransport):
168
273
169
274
def setUp(self):
170
275
super(ImportObjects, self).setUp()
171
self._map = DictGitShaMap()
172
276
self._mapping = BzrGitMappingv1()
173
277
factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
174
278
self._texts = factory(self.get_transport('texts'))
177
281
blob = Blob.from_string("bar")
178
282
base_inv = Inventory()
179
283
objs = { "blobname": blob}
180
ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname",
181
base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
182
False)
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)
183
289
self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
184
290
self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
185
291
"unordered", True).next().get_bytes_as("fulltext"), "bar")
195
301
def test_import_tree_empty_root(self):
196
302
base_inv = Inventory(root_id=None)
197
303
tree = Tree()
198
tree.serialize()
199
ret, _, _ = import_git_tree(self._texts, self._mapping, "",
200
tree.id, base_inv,
201
None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
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, {})
202
310
self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
203
311
self.assertEquals(1, len(ret))
204
312
self.assertEquals(None, ret[0][0])
213
321
def test_import_tree_empty(self):
214
322
base_inv = Inventory()
215
323
tree = Tree()
216
tree.serialize()
217
ret, _, _ = import_git_tree(self._texts, self._mapping, "bla",
218
tree.id, base_inv, None, "somerevid", [],
219
self._map, { tree.id: tree }.__getitem__)
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, {})
220
330
self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
221
331
self.assertEquals(1, len(ret))
222
332
self.assertEquals(None, ret[0][0])
232
342
base_inv = Inventory()
233
343
blob = Blob.from_string("bar1")
234
344
tree = Tree()
235
tree.add(0100600, "foo", blob.id)
236
tree.serialize()
345
tree.add(stat.S_IFREG | 0644, "foo", blob.id)
237
346
objects = { blob.id: blob, tree.id: tree }
238
ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id,
239
base_inv, None, "somerevid", [], self._map, objects.__getitem__)
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, {})
240
352
self.assertEquals(2, len(ret))
241
353
self.assertEquals(None, ret[0][0])
242
354
self.assertEquals("bla", ret[0][1])
251
363
self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
252
364
self.assertEquals(False, ie.executable)
253
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
254
378
def test_import_tree_with_file_exe(self):
255
379
base_inv = Inventory(root_id=None)
256
380
blob = Blob.from_string("bar")
257
381
tree = Tree()
258
382
tree.add(0100755, "foo", blob.id)
259
tree.serialize()
260
383
objects = { blob.id: blob, tree.id: tree }
261
ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id,
262
base_inv, None, "somerevid", [], self._map, objects.__getitem__)
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, {})
263
389
self.assertEquals(2, len(ret))
264
390
self.assertEquals(None, ret[0][0])
265
391
self.assertEquals("", ret[0][1])
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0