/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_mapping.py

https://launchpad.net/bugs/613502
Fix regression in git-import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
1
1
# Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
 
2
# -*- encoding: utf-8 -*-
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
18
19
    InventoryDirectory,
19
20
    InventoryFile,
20
21
    )
 
22
from bzrlib.revision import (
 
23
    Revision,
 
24
    )
21
25
 
22
26
from dulwich.objects import (
23
27
    Blob,
30
34
    BzrGitMappingv1,
31
35
    directory_to_tree,
32
36
    escape_file_id,
33
 
    revision_to_commit,
34
37
    unescape_file_id,
35
38
    )
36
39
 
50
53
                            "git-v1:"
51
54
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
52
55
 
 
56
    def test_is_control_file(self):
 
57
        mapping = BzrGitMappingv1()
 
58
        if mapping.roundtripping:
 
59
            self.assertTrue(mapping.is_control_file(".bzrdummy"))
 
60
            self.assertTrue(mapping.is_control_file(".bzrfileids"))
 
61
        self.assertFalse(mapping.is_control_file(".bzrfoo"))
 
62
 
 
63
    def test_generate_file_id(self):
 
64
        mapping = BzrGitMappingv1()
 
65
        self.assertIsInstance(mapping.generate_file_id("la"), str)
 
66
        self.assertIsInstance(mapping.generate_file_id(u"é"), str)
 
67
 
53
68
 
54
69
class FileidTests(tests.TestCase):
55
70
 
81
96
        c.commit_timezone = 60 * 5
82
97
        c.author_timezone = 60 * 3
83
98
        c.author = "Author"
84
 
        c.serialize()
85
 
        rev = BzrGitMappingv1().import_commit(c)
 
99
        mapping = BzrGitMappingv1()
 
100
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
86
101
        self.assertEquals("Some message", rev.message)
87
102
        self.assertEquals("Committer", rev.committer)
88
103
        self.assertEquals("Author", rev.properties['author'])
92
107
        self.assertEquals("180", rev.properties['author-timezone'])
93
108
        self.assertEquals("git-v1:" + c.id, rev.revision_id)
94
109
 
 
110
    def test_explicit_encoding(self):
 
111
        c = Commit()
 
112
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
113
        c.message = "Some message"
 
114
        c.committer = "Committer"
 
115
        c.commit_time = 4
 
116
        c.author_time = 5
 
117
        c.commit_timezone = 60 * 5
 
118
        c.author_timezone = 60 * 3
 
119
        c.author = u"Authér".encode("iso8859-1")
 
120
        c.encoding = "iso8859-1"
 
121
        mapping = BzrGitMappingv1()
 
122
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
123
        self.assertEquals(u"Authér", rev.properties['author'])
 
124
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
 
125
        self.assertTrue("git-implicit-encoding" not in rev.properties)
 
126
 
 
127
    def test_implicit_encoding_fallback(self):
 
128
        c = Commit()
 
129
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
130
        c.message = "Some message"
 
131
        c.committer = "Committer"
 
132
        c.commit_time = 4
 
133
        c.author_time = 5
 
134
        c.commit_timezone = 60 * 5
 
135
        c.author_timezone = 60 * 3
 
136
        c.author = u"Authér".encode("latin1")
 
137
        mapping = BzrGitMappingv1()
 
138
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
139
        self.assertEquals(u"Authér", rev.properties['author'])
 
140
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
 
141
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
142
 
 
143
    def test_implicit_encoding_utf8(self):
 
144
        c = Commit()
 
145
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
146
        c.message = "Some message"
 
147
        c.committer = "Committer"
 
148
        c.commit_time = 4
 
149
        c.author_time = 5
 
150
        c.commit_timezone = 60 * 5
 
151
        c.author_timezone = 60 * 3
 
152
        c.author = u"Authér".encode("utf-8")
 
153
        mapping = BzrGitMappingv1()
 
154
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
155
        self.assertEquals(u"Authér", rev.properties['author'])
 
156
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
157
        self.assertTrue("git-implicit-encoding" not in rev.properties)
 
158
 
 
159
 
 
160
class RoundtripRevisionsFromBazaar(tests.TestCase):
 
161
 
 
162
    def setUp(self):
 
163
        super(RoundtripRevisionsFromBazaar, self).setUp()
 
164
        self.mapping = BzrGitMappingv1()
 
165
        self._parent_map = {}
 
166
        self._lookup_parent = self._parent_map.__getitem__
 
167
 
 
168
    def assertRoundtripRevision(self, orig_rev):
 
169
        commit = self.mapping.export_commit(orig_rev, "mysha",
 
170
            self._lookup_parent, True)
 
171
        rev = self.mapping.import_commit(commit,
 
172
            self.mapping.revision_id_foreign_to_bzr)
 
173
        if self.mapping.roundtripping:
 
174
            self.assertEquals(orig_rev.revision_id, rev.revision_id)
 
175
            self.assertEquals(orig_rev.properties, rev.properties)
 
176
            self.assertEquals(orig_rev.committer, rev.committer)
 
177
            self.assertEquals(orig_rev.timestamp, rev.timestamp)
 
178
            self.assertEquals(orig_rev.timezone, rev.timezone)
 
179
            self.assertEquals(orig_rev.message, rev.message)
 
180
            self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
 
181
 
 
182
    def test_simple_commit(self):
 
183
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
 
184
        r.message = "MyCommitMessage"
 
185
        r.parent_ids = []
 
186
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
187
        r.timestamp = 453543543
 
188
        r.timezone = 0
 
189
        r.properties = {}
 
190
        self.assertRoundtripRevision(r)
 
191
 
 
192
    def test_revision_id(self):
 
193
        r = Revision("myrevid")
 
194
        r.message = "MyCommitMessage"
 
195
        r.parent_ids = []
 
196
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
197
        r.timestamp = 453543543
 
198
        r.timezone = 0
 
199
        r.properties = {}
 
200
        self.assertRoundtripRevision(r)
 
201
 
 
202
    def test_ghost_parent(self):
 
203
        r = Revision("myrevid")
 
204
        r.message = "MyCommitMessage"
 
205
        r.parent_ids = ["iamaghost"]
 
206
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
207
        r.timestamp = 453543543
 
208
        r.timezone = 0
 
209
        r.properties = {}
 
210
        self.assertRoundtripRevision(r)
 
211
 
 
212
    def test_custom_property(self):
 
213
        r = Revision("myrevid")
 
214
        r.message = "MyCommitMessage"
 
215
        r.parent_ids = []
 
216
        r.properties = {"fool": "bar"}
 
217
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
218
        r.timestamp = 453543543
 
219
        r.timezone = 0
 
220
        self.assertRoundtripRevision(r)
95
221
 
96
222
 
97
223
class RoundtripRevisionsFromGit(tests.TestCase):
107
233
        raise NotImplementedError(self.assertRoundtripBlob)
108
234
 
109
235
    def assertRoundtripCommit(self, commit1):
110
 
        commit1.serialize()
111
 
        rev = self.mapping.import_commit(commit1)
112
 
        commit2 = revision_to_commit(rev, "12341212121212", None)
 
236
        rev = self.mapping.import_commit(commit1,
 
237
            self.mapping.revision_id_foreign_to_bzr)
 
238
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
 
239
            True)
113
240
        self.assertEquals(commit1.committer, commit2.committer)
114
241
        self.assertEquals(commit1.commit_time, commit2.commit_time)
115
242
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
117
244
        self.assertEquals(commit1.author_time, commit2.author_time)
118
245
        self.assertEquals(commit1.author_timezone, commit2.author_timezone)
119
246
        self.assertEquals(commit1.message, commit2.message)
 
247
        self.assertEquals(commit1.encoding, commit2.encoding)
120
248
 
121
249
    def test_commit(self):
122
250
        c = Commit()
130
258
        c.author = "Author <author>"
131
259
        self.assertRoundtripCommit(c)
132
260
 
 
261
    def test_commit_zero_utc_timezone(self):
 
262
        c = Commit()
 
263
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
264
        c.message = "Some message"
 
265
        c.committer = "Committer <Committer>"
 
266
        c.commit_time = 4
 
267
        c.commit_timezone = 0
 
268
        c._commit_timezone_neg_utc = True
 
269
        c.author_time = 5
 
270
        c.author_timezone = 60 * 2
 
271
        c.author = "Author <author>"
 
272
        self.assertRoundtripCommit(c)
 
273
 
 
274
    def test_commit_encoding(self):
 
275
        c = Commit()
 
276
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
277
        c.message = "Some message"
 
278
        c.committer = "Committer <Committer>"
 
279
        c.encoding = 'iso8859-1'
 
280
        c.commit_time = 4
 
281
        c.commit_timezone = -60 * 3
 
282
        c.author_time = 5
 
283
        c.author_timezone = 60 * 2
 
284
        c.author = "Author <author>"
 
285
        self.assertRoundtripCommit(c)
 
286
 
133
287
 
134
288
class DirectoryToTreeTests(tests.TestCase):
135
289
 
136
290
    def test_empty(self):
137
291
        ie = InventoryDirectory('foo', 'foo', 'foo')
138
 
        t = directory_to_tree(ie, None, {})
 
292
        t = directory_to_tree(ie, None, {}, None)
139
293
        self.assertEquals(None, t)
140
294
 
141
295
    def test_empty_dir(self):
142
296
        ie = InventoryDirectory('foo', 'foo', 'foo')
143
297
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
144
298
        ie.children['bar'] = child_ie
145
 
        t = directory_to_tree(ie, lambda x: None, {})
 
299
        t = directory_to_tree(ie, lambda x: None, {}, None)
146
300
        self.assertEquals(None, t)
147
301
 
 
302
    def test_empty_dir_dummy_files(self):
 
303
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
304
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
305
        ie.children['bar'] = child_ie
 
306
        t = directory_to_tree(ie, lambda x: None, {}, ".mydummy")
 
307
        self.assertTrue(".mydummy" in t)
 
308
 
148
309
    def test_empty_root(self):
149
310
        ie = InventoryDirectory('foo', 'foo', None)
150
311
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
151
312
        ie.children['bar'] = child_ie
152
 
        t = directory_to_tree(ie, lambda x: None, {})
 
313
        t = directory_to_tree(ie, lambda x: None, {}, None)
153
314
        self.assertEquals(Tree(), t)
154
315
 
155
316
    def test_with_file(self):
157
318
        child_ie = InventoryFile('bar', 'bar', 'bar')
158
319
        ie.children['bar'] = child_ie
159
320
        b = Blob.from_string("bla")
160
 
        t1 = directory_to_tree(ie, lambda x: b.id, {})
 
321
        t1 = directory_to_tree(ie, lambda x: b.id, {}, None)
161
322
        t2 = Tree()
162
323
        t2.add(0100644, "bar", b.id)
163
324
        self.assertEquals(t1, t2)