/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

Properly set InventoryEntry revision when changing symlink targets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
125
125
        newrepo.fetch(oldrepo, revision_id=revid2)
126
126
        self.assertEquals(set([revid1, revid2]), set(newrepo.all_revision_ids()))
127
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
128
    def test_changing_symlink(self):
185
129
        self.make_git_repo("d")
186
130
        os.chdir("d")
279
223
        base_inv = Inventory()
280
224
        objs = { "blobname": blob}
281
225
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
282
 
            base_inv, None, None, "somerevid", [], self._map, objs.__getitem__, False,
 
226
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
283
227
            False)
284
228
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
285
229
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
298
242
        tree = Tree()
299
243
        tree.serialize()
300
244
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
301
 
               tree.id, base_inv, None,
 
245
               tree.id, base_inv, 
302
246
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
303
247
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
304
248
        self.assertEquals(1, len(ret))
316
260
        tree = Tree()
317
261
        tree.serialize()
318
262
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
319
 
           tree.id, base_inv, None, None, "somerevid", [], 
 
263
           tree.id, base_inv, None, "somerevid", [], 
320
264
           self._map, { tree.id: tree }.__getitem__)
321
265
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
322
266
        self.assertEquals(1, len(ret))
337
281
        tree.serialize()
338
282
        objects = { blob.id: blob, tree.id: tree }
339
283
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
340
 
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
 
284
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
341
285
        self.assertEquals(2, len(ret))
342
286
        self.assertEquals(None, ret[0][0])
343
287
        self.assertEquals("bla", ret[0][1])
360
304
        tree.serialize()
361
305
        objects = { blob.id: blob, tree.id: tree }
362
306
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
363
 
            base_inv, None, None, "somerevid", [], self._map, objects.__getitem__)
 
307
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
364
308
        self.assertEquals(2, len(ret))
365
309
        self.assertEquals(None, ret[0][0])
366
310
        self.assertEquals("", ret[0][1])