/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

Implement to_files() for git merge directives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
19
19
    InventoryDirectory,
20
20
    InventoryFile,
21
21
    )
22
 
from bzrlib.revision import (
23
 
    Revision,
24
 
    )
25
22
 
26
23
from dulwich.objects import (
27
24
    Blob,
53
50
                            "git-v1:"
54
51
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
55
52
 
56
 
    def test_is_control_file(self):
57
 
        mapping = BzrGitMappingv1()
58
 
        self.assertTrue(mapping.is_control_file(".bzrdummy"))
59
 
        self.assertTrue(mapping.is_control_file(".bzrfileids"))
60
 
        self.assertFalse(mapping.is_control_file(".bzrfoo"))
61
 
 
62
53
 
63
54
class FileidTests(tests.TestCase):
64
55
 
90
81
        c.commit_timezone = 60 * 5
91
82
        c.author_timezone = 60 * 3
92
83
        c.author = "Author"
 
84
        c.serialize()
93
85
        rev = BzrGitMappingv1().import_commit(c)
94
86
        self.assertEquals("Some message", rev.message)
95
87
        self.assertEquals("Committer", rev.committer)
111
103
        c.author_timezone = 60 * 3
112
104
        c.author = u"Authér".encode("iso8859-1")
113
105
        c.encoding = "iso8859-1"
 
106
        c.serialize()
114
107
        rev = BzrGitMappingv1().import_commit(c)
115
108
        self.assertEquals(u"Authér", rev.properties['author'])
116
109
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
126
119
        c.commit_timezone = 60 * 5
127
120
        c.author_timezone = 60 * 3
128
121
        c.author = u"Authér".encode("latin1")
 
122
        c.serialize()
129
123
        rev = BzrGitMappingv1().import_commit(c)
130
124
        self.assertEquals(u"Authér", rev.properties['author'])
131
125
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
141
135
        c.commit_timezone = 60 * 5
142
136
        c.author_timezone = 60 * 3
143
137
        c.author = u"Authér".encode("utf-8")
 
138
        c.serialize()
144
139
        rev = BzrGitMappingv1().import_commit(c)
145
140
        self.assertEquals(u"Authér", rev.properties['author'])
146
141
        self.assertTrue("git-explicit-encoding" not in rev.properties)
147
142
        self.assertTrue("git-implicit-encoding" not in rev.properties)
148
143
 
149
144
 
150
 
class RoundtripRevisionsFromBazaar(tests.TestCase):
151
 
 
152
 
    def setUp(self):
153
 
        super(RoundtripRevisionsFromBazaar, self).setUp()
154
 
        self.mapping = BzrGitMappingv1()
155
 
        self._parent_map = {}
156
 
        self._lookup_parent = self._parent_map.__getitem__
157
 
 
158
 
    def assertRoundtripRevision(self, orig_rev):
159
 
        commit = self.mapping.export_commit(orig_rev, "mysha",
160
 
            self._lookup_parent, True)
161
 
        rev = self.mapping.import_commit(commit)
162
 
        self.assertEquals(orig_rev.revision_id, rev.revision_id)
163
 
        self.assertEquals(orig_rev.properties, rev.properties)
164
 
        self.assertEquals(orig_rev.committer, rev.committer)
165
 
        self.assertEquals(orig_rev.timestamp, rev.timestamp)
166
 
        self.assertEquals(orig_rev.timezone, rev.timezone)
167
 
        self.assertEquals(orig_rev.message, rev.message)
168
 
        self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
169
 
 
170
 
    def test_simple_commit(self):
171
 
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
172
 
        r.message = "MyCommitMessage"
173
 
        r.parent_ids = []
174
 
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
175
 
        r.timestamp = 453543543
176
 
        r.timezone = 0
177
 
        r.properties = {}
178
 
        self.assertRoundtripRevision(r)
179
 
 
180
 
    def test_revision_id(self):
181
 
        r = Revision("myrevid")
182
 
        r.message = "MyCommitMessage"
183
 
        r.parent_ids = []
184
 
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
185
 
        r.timestamp = 453543543
186
 
        r.timezone = 0
187
 
        r.properties = {}
188
 
        self.assertRoundtripRevision(r)
189
 
 
190
 
    def test_ghost_parent(self):
191
 
        r = Revision("myrevid")
192
 
        r.message = "MyCommitMessage"
193
 
        r.parent_ids = ["iamaghost"]
194
 
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
195
 
        r.timestamp = 453543543
196
 
        r.timezone = 0
197
 
        r.properties = {}
198
 
        self.assertRoundtripRevision(r)
199
 
 
200
 
    def test_custom_property(self):
201
 
        r = Revision("myrevid")
202
 
        r.message = "MyCommitMessage"
203
 
        r.parent_ids = []
204
 
        r.properties = {"fool": "bar"}
205
 
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
206
 
        r.timestamp = 453543543
207
 
        r.timezone = 0
208
 
        self.assertRoundtripRevision(r)
209
 
 
210
 
 
211
145
class RoundtripRevisionsFromGit(tests.TestCase):
212
146
 
213
147
    def setUp(self):
221
155
        raise NotImplementedError(self.assertRoundtripBlob)
222
156
 
223
157
    def assertRoundtripCommit(self, commit1):
 
158
        commit1.serialize()
224
159
        rev = self.mapping.import_commit(commit1)
225
 
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
226
 
            True)
 
160
        commit2 = self.mapping.export_commit(rev, "12341212121212", None)
227
161
        self.assertEquals(commit1.committer, commit2.committer)
228
162
        self.assertEquals(commit1.commit_time, commit2.commit_time)
229
163
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
245
179
        c.author = "Author <author>"
246
180
        self.assertRoundtripCommit(c)
247
181
 
248
 
    def test_commit_zero_utc_timezone(self):
249
 
        c = Commit()
250
 
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
251
 
        c.message = "Some message"
252
 
        c.committer = "Committer <Committer>"
253
 
        c.commit_time = 4
254
 
        c.commit_timezone = 0
255
 
        c._commit_timezone_neg_utc = True
256
 
        c.author_time = 5
257
 
        c.author_timezone = 60 * 2
258
 
        c.author = "Author <author>"
259
 
        self.assertRoundtripCommit(c)
260
 
 
261
182
    def test_commit_encoding(self):
262
183
        c = Commit()
263
184
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
276
197
 
277
198
    def test_empty(self):
278
199
        ie = InventoryDirectory('foo', 'foo', 'foo')
279
 
        t = directory_to_tree(ie, None, {}, None)
 
200
        t = directory_to_tree(ie, None, {})
280
201
        self.assertEquals(None, t)
281
202
 
282
203
    def test_empty_dir(self):
283
204
        ie = InventoryDirectory('foo', 'foo', 'foo')
284
205
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
285
206
        ie.children['bar'] = child_ie
286
 
        t = directory_to_tree(ie, lambda x: None, {}, None)
 
207
        t = directory_to_tree(ie, lambda x: None, {})
287
208
        self.assertEquals(None, t)
288
209
 
289
 
    def test_empty_dir_dummy_files(self):
290
 
        ie = InventoryDirectory('foo', 'foo', 'foo')
291
 
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
292
 
        ie.children['bar'] = child_ie
293
 
        t = directory_to_tree(ie, lambda x: None, {}, ".mydummy")
294
 
        self.assertTrue(".mydummy" in t)
295
 
 
296
210
    def test_empty_root(self):
297
211
        ie = InventoryDirectory('foo', 'foo', None)
298
212
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
299
213
        ie.children['bar'] = child_ie
300
 
        t = directory_to_tree(ie, lambda x: None, {}, None)
 
214
        t = directory_to_tree(ie, lambda x: None, {})
301
215
        self.assertEquals(Tree(), t)
302
216
 
303
217
    def test_with_file(self):
305
219
        child_ie = InventoryFile('bar', 'bar', 'bar')
306
220
        ie.children['bar'] = child_ie
307
221
        b = Blob.from_string("bla")
308
 
        t1 = directory_to_tree(ie, lambda x: b.id, {}, None)
 
222
        t1 = directory_to_tree(ie, lambda x: b.id, {})
309
223
        t2 = Tree()
310
224
        t2.add(0100644, "bar", b.id)
311
225
        self.assertEquals(t1, t2)