/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

Update docs.

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
27
26
 
28
27
from bzrlib import (
29
28
    knit,
42
41
from bzrlib.tests import (
43
42
    TestCaseWithTransport,
44
43
    )
 
44
from bzrlib.transport import (
 
45
    get_transport,
 
46
    )
45
47
 
46
48
from bzrlib.plugins.git import (
47
49
    get_rich_root_format,
48
50
    )
49
51
from bzrlib.plugins.git.fetch import (
 
52
    BzrFetchGraphWalker,
50
53
    import_git_blob,
51
54
    import_git_tree,
52
55
    )
53
56
from bzrlib.plugins.git.mapping import (
54
57
    BzrGitMappingv1,
55
 
    DEFAULT_FILE_MODE,
 
58
    default_mapping,
 
59
    )
 
60
from bzrlib.plugins.git.shamap import (
 
61
    DictGitShaMap,
56
62
    )
57
63
from bzrlib.plugins.git.tests import (
58
64
    GitBranchBuilder,
59
65
    )
60
66
 
61
67
 
 
68
class FetchGraphWalkerTests(TestCaseWithTransport):
 
69
 
 
70
    def setUp(self):
 
71
        TestCaseWithTransport.setUp(self)
 
72
        self.mapping = default_mapping
 
73
 
 
74
    def test_empty(self):
 
75
        tree = self.make_branch_and_tree("wt")
 
76
        graphwalker = BzrFetchGraphWalker(tree.branch.repository, self.mapping)
 
77
        self.assertEquals(None, graphwalker.next())
 
78
 
 
79
 
62
80
class RepositoryFetchTests:
63
81
 
64
82
    def make_git_repo(self, path):
120
138
        newrepo.fetch(oldrepo, revision_id=revid2)
121
139
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
122
140
 
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
141
    def test_executable(self):
206
142
        self.make_git_repo("d")
207
143
        os.chdir("d")
220
156
        self.assertTrue(tree.has_filename("notexec"))
221
157
        self.assertEquals(False, tree.inventory[tree.path2id("notexec")].executable)
222
158
 
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
159
    def test_non_ascii_characters(self):
243
160
        self.make_git_repo("d")
244
161
        os.chdir("d")
260
177
        return Repository.open(path)
261
178
 
262
179
 
263
 
class DummyStoreUpdater(object):
264
 
 
265
 
    def add_object(self, obj, ie):
266
 
        pass
267
 
 
268
 
    def finish(self):
269
 
        pass
270
 
 
271
 
 
272
180
class ImportObjects(TestCaseWithTransport):
273
181
 
274
182
    def setUp(self):
275
183
        super(ImportObjects, self).setUp()
 
184
        self._map = DictGitShaMap()
276
185
        self._mapping = BzrGitMappingv1()
277
186
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
278
187
        self._texts = factory(self.get_transport('texts'))
281
190
        blob = Blob.from_string("bar")
282
191
        base_inv = Inventory()
283
192
        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())
 
193
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
194
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
 
195
            False)
288
196
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
289
197
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
290
198
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
300
208
    def test_import_tree_empty_root(self):
301
209
        base_inv = Inventory(root_id=None)
302
210
        tree = Tree()
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())
 
211
        tree.serialize()
 
212
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
 
213
               tree.id, base_inv, 
 
214
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
307
215
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
308
216
        self.assertEquals(1, len(ret))
309
217
        self.assertEquals(None, ret[0][0])
318
226
    def test_import_tree_empty(self):
319
227
        base_inv = Inventory()
320
228
        tree = Tree()
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())
 
229
        tree.serialize()
 
230
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
 
231
           tree.id, base_inv, None, "somerevid", [], 
 
232
           self._map, { tree.id: tree }.__getitem__)
325
233
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
326
234
        self.assertEquals(1, len(ret))
327
235
        self.assertEquals(None, ret[0][0])
338
246
        blob = Blob.from_string("bar1")
339
247
        tree = Tree()
340
248
        tree.add(0100600, "foo", blob.id)
 
249
        tree.serialize()
341
250
        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())
 
251
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
 
252
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
345
253
        self.assertEquals(2, len(ret))
346
254
        self.assertEquals(None, ret[0][0])
347
255
        self.assertEquals("bla", ret[0][1])
361
269
        blob = Blob.from_string("bar")
362
270
        tree = Tree()
363
271
        tree.add(0100755, "foo", blob.id)
 
272
        tree.serialize()
364
273
        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())
 
274
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
 
275
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
368
276
        self.assertEquals(2, len(ret))
369
277
        self.assertEquals(None, ret[0][0])
370
278
        self.assertEquals("", ret[0][1])