/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
from bzrlib.plugins.git import (
49
 
    get_rich_root_format,
50
 
    )
51
46
from bzrlib.plugins.git.fetch import (
52
47
    import_git_blob,
53
48
    import_git_tree,
54
49
    )
55
50
from bzrlib.plugins.git.mapping import (
56
51
    BzrGitMappingv1,
57
 
    default_mapping,
58
 
    )
59
 
from bzrlib.plugins.git.shamap import (
60
 
    DictGitShaMap,
 
52
    DEFAULT_FILE_MODE,
61
53
    )
62
54
from bzrlib.plugins.git.tests import (
63
55
    GitBranchBuilder,
72
64
 
73
65
    def clone_git_repo(self, from_url, to_url, revision_id=None):
74
66
        oldrepos = self.open_git_repo(from_url)
75
 
        dir = BzrDir.create(to_url, get_rich_root_format())
 
67
        dir = BzrDir.create(to_url)
76
68
        newrepos = dir.create_repository()
77
69
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
78
70
        return newrepos
125
117
        newrepo.fetch(oldrepo, revision_id=revid2)
126
118
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
127
119
 
 
120
    def test_dir_becomes_symlink(self):
 
121
        self.make_git_repo("d")
 
122
        os.chdir("d")
 
123
        bb = GitBranchBuilder()
 
124
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
 
125
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
126
        bb.set_symlink("mylink", "target/")
 
127
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
128
        marks = bb.finish()
 
129
        gitsha1 = marks[mark1]
 
130
        gitsha2 = marks[mark2]
 
131
        os.chdir("..")
 
132
        oldrepo = self.open_git_repo("d")
 
133
        newrepo = self.clone_git_repo("d", "f")
 
134
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
135
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
136
        tree1 = newrepo.revision_tree(revid1)
 
137
        tree2 = newrepo.revision_tree(revid2)
 
138
        fileid = tree1.path2id("mylink")
 
139
        ie1 = tree1.inventory[fileid]
 
140
        ie2 = tree2.inventory[fileid]
 
141
        self.assertEquals(revid1, ie1.revision)
 
142
        self.assertEquals("directory", ie1.kind)
 
143
        self.assertEquals(None, ie1.symlink_target)
 
144
        self.assertEquals(revid2, ie2.revision)
 
145
        self.assertEquals("symlink", ie2.kind)
 
146
        self.assertEquals("target/", ie2.symlink_target)
 
147
 
 
148
    def test_symlink_becomes_dir(self):
 
149
        self.make_git_repo("d")
 
150
        os.chdir("d")
 
151
        bb = GitBranchBuilder()
 
152
        bb.set_symlink("mylink", "target/")
 
153
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
154
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
 
155
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
156
        marks = bb.finish()
 
157
        gitsha1 = marks[mark1]
 
158
        gitsha2 = marks[mark2]
 
159
        os.chdir("..")
 
160
        oldrepo = self.open_git_repo("d")
 
161
        newrepo = self.clone_git_repo("d", "f")
 
162
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
163
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
164
        tree1 = newrepo.revision_tree(revid1)
 
165
        tree2 = newrepo.revision_tree(revid2)
 
166
        fileid = tree1.path2id("mylink")
 
167
        ie1 = tree1.inventory[fileid]
 
168
        ie2 = tree2.inventory[fileid]
 
169
        self.assertEquals(revid1, ie1.revision)
 
170
        self.assertEquals("symlink", ie1.kind)
 
171
        self.assertEquals("target/", ie1.symlink_target)
 
172
        self.assertEquals(revid2, ie2.revision)
 
173
        self.assertEquals("directory", ie2.kind)
 
174
        self.assertEquals(None, ie2.symlink_target)
 
175
 
 
176
    def test_changing_symlink(self):
 
177
        self.make_git_repo("d")
 
178
        os.chdir("d")
 
179
        bb = GitBranchBuilder()
 
180
        bb.set_symlink("mylink", "target")
 
181
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
182
        bb.set_symlink("mylink", "target/")
 
183
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
184
        marks = bb.finish()
 
185
        gitsha1 = marks[mark1]
 
186
        gitsha2 = marks[mark2]
 
187
        os.chdir("..")
 
188
        oldrepo = self.open_git_repo("d")
 
189
        newrepo = self.clone_git_repo("d", "f")
 
190
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
191
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
192
        tree1 = newrepo.revision_tree(revid1)
 
193
        tree2 = newrepo.revision_tree(revid2)
 
194
        fileid = tree1.path2id("mylink")
 
195
        ie1 = tree1.inventory[fileid]
 
196
        ie2 = tree2.inventory[fileid]
 
197
        self.assertEquals(revid1, ie1.revision)
 
198
        self.assertEquals("target", ie1.symlink_target)
 
199
        self.assertEquals(revid2, ie2.revision)
 
200
        self.assertEquals("target/", ie2.symlink_target)
 
201
 
128
202
    def test_executable(self):
129
203
        self.make_git_repo("d")
130
204
        os.chdir("d")
143
217
        self.assertTrue(tree.has_filename("notexec"))
144
218
        self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
145
219
 
 
220
    def test_becomes_executable(self):
 
221
        self.make_git_repo("d")
 
222
        os.chdir("d")
 
223
        bb = GitBranchBuilder()
 
224
        bb.set_file("foobar", "foo\nbar\n", False)
 
225
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
226
        bb.set_file("foobar", "foo\nbar\n", True)
 
227
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
228
        gitsha2 = bb.finish()[mark2]
 
229
        os.chdir("..")
 
230
        oldrepo = self.open_git_repo("d")
 
231
        newrepo = self.clone_git_repo("d", "f")
 
232
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
233
        tree = newrepo.revision_tree(revid)
 
234
        self.assertTrue(tree.has_filename("foobar"))
 
235
        ie = tree.inventory[tree.path2id("foobar")]
 
236
        self.assertEquals(True, ie.executable)
 
237
        self.assertEquals(revid, ie.revision)
 
238
 
146
239
    def test_non_ascii_characters(self):
147
240
        self.make_git_repo("d")
148
241
        os.chdir("d")
164
257
        return Repository.open(path)
165
258
 
166
259
 
 
260
class DummyStoreUpdater(object):
 
261
 
 
262
    def add_object(self, obj, ie, path):
 
263
        pass
 
264
 
 
265
    def finish(self):
 
266
        pass
 
267
 
 
268
 
167
269
class ImportObjects(TestCaseWithTransport):
168
270
 
169
271
    def setUp(self):
170
272
        super(ImportObjects, self).setUp()
171
 
        self._map = DictGitShaMap()
172
273
        self._mapping = BzrGitMappingv1()
173
274
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
174
275
        self._texts = factory(self.get_transport('texts'))
177
278
        blob = Blob.from_string("bar")
178
279
        base_inv = Inventory()
179
280
        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)
 
281
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
 
282
            (None, "blobname"), 
 
283
            base_inv, None, "somerevid", [], objs.__getitem__, 
 
284
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
 
285
            self._mapping.generate_file_id)
183
286
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
184
287
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
185
288
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
195
298
    def test_import_tree_empty_root(self):
196
299
        base_inv = Inventory(root_id=None)
197
300
        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__)
 
301
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
302
               (None, tree.id), base_inv, 
 
303
               None, "somerevid", [], {tree.id: tree}.__getitem__,
 
304
               (None, stat.S_IFDIR), DummyStoreUpdater(),
 
305
               self._mapping.generate_file_id)
 
306
        self.assertEquals(child_modes, {})
202
307
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
203
308
        self.assertEquals(1, len(ret))
204
309
        self.assertEquals(None, ret[0][0])
213
318
    def test_import_tree_empty(self):
214
319
        base_inv = Inventory()
215
320
        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__)
 
321
        ret, child_modes = 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._mapping.generate_file_id)
 
326
        self.assertEquals(child_modes, {})
220
327
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
221
328
        self.assertEquals(1, len(ret))
222
329
        self.assertEquals(None, ret[0][0])
232
339
        base_inv = Inventory()
233
340
        blob = Blob.from_string("bar1")
234
341
        tree = Tree()
235
 
        tree.add(0100600, "foo", blob.id)
236
 
        tree.serialize()
 
342
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
237
343
        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__)
 
344
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
345
                (None, tree.id), base_inv, None, "somerevid", [],
 
346
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
347
            self._mapping.generate_file_id)
 
348
        self.assertEquals(child_modes, {})
240
349
        self.assertEquals(2, len(ret))
241
350
        self.assertEquals(None, ret[0][0])
242
351
        self.assertEquals("bla", ret[0][1])
251
360
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
252
361
        self.assertEquals(False, ie.executable)
253
362
 
 
363
    def test_import_tree_with_unusual_mode_file(self):
 
364
        base_inv = Inventory()
 
365
        blob = Blob.from_string("bar1")
 
366
        tree = Tree()
 
367
        tree.add(stat.S_IFREG | 0664, "foo", blob.id)
 
368
        objects = { blob.id: blob, tree.id: tree }
 
369
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
370
                (None, tree.id), base_inv, None, "somerevid", [],
 
371
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
372
            self._mapping.generate_file_id)
 
373
        self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
 
374
 
254
375
    def test_import_tree_with_file_exe(self):
255
376
        base_inv = Inventory(root_id=None)
256
377
        blob = Blob.from_string("bar")
257
378
        tree = Tree()
258
379
        tree.add(0100755, "foo", blob.id)
259
 
        tree.serialize()
260
380
        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__)
 
381
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
382
                (None, tree.id), base_inv, None, "somerevid", [],
 
383
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
384
            self._mapping.generate_file_id)
 
385
        self.assertEquals(child_modes, {})
263
386
        self.assertEquals(2, len(ret))
264
387
        self.assertEquals(None, ret[0][0])
265
388
        self.assertEquals("", ret[0][1])