/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-02 19:26:28 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100502192628-dy0lavjbjexavvmb
More work on roundtripping support.

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
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
 
 
18
from bzrlib.inventory import (
 
19
    InventoryDirectory,
 
20
    InventoryFile,
 
21
    )
 
22
from bzrlib.revision import (
 
23
    Revision,
 
24
    )
 
25
 
17
26
from dulwich.objects import (
 
27
    Blob,
18
28
    Commit,
 
29
    Tree,
19
30
    )
20
31
 
21
32
from bzrlib.plugins.git import tests
22
33
from bzrlib.plugins.git.mapping import (
23
34
    BzrGitMappingv1,
 
35
    directory_to_tree,
24
36
    escape_file_id,
25
 
    revision_to_commit,
26
37
    unescape_file_id,
27
38
    )
28
39
 
73
84
        c.commit_timezone = 60 * 5
74
85
        c.author_timezone = 60 * 3
75
86
        c.author = "Author"
76
 
        c.serialize()
77
87
        rev = BzrGitMappingv1().import_commit(c)
78
88
        self.assertEquals("Some message", rev.message)
79
89
        self.assertEquals("Committer", rev.committer)
84
94
        self.assertEquals("180", rev.properties['author-timezone'])
85
95
        self.assertEquals("git-v1:" + c.id, rev.revision_id)
86
96
 
 
97
    def test_explicit_encoding(self):
 
98
        c = Commit()
 
99
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
100
        c.message = "Some message"
 
101
        c.committer = "Committer"
 
102
        c.commit_time = 4
 
103
        c.author_time = 5
 
104
        c.commit_timezone = 60 * 5
 
105
        c.author_timezone = 60 * 3
 
106
        c.author = u"Authér".encode("iso8859-1")
 
107
        c.encoding = "iso8859-1"
 
108
        rev = BzrGitMappingv1().import_commit(c)
 
109
        self.assertEquals(u"Authér", rev.properties['author'])
 
110
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
 
111
        self.assertTrue("git-implicit-encoding" not in rev.properties)
 
112
 
 
113
    def test_implicit_encoding_fallback(self):
 
114
        c = Commit()
 
115
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
116
        c.message = "Some message"
 
117
        c.committer = "Committer"
 
118
        c.commit_time = 4
 
119
        c.author_time = 5
 
120
        c.commit_timezone = 60 * 5
 
121
        c.author_timezone = 60 * 3
 
122
        c.author = u"Authér".encode("latin1")
 
123
        rev = BzrGitMappingv1().import_commit(c)
 
124
        self.assertEquals(u"Authér", rev.properties['author'])
 
125
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
 
126
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
127
 
 
128
    def test_implicit_encoding_utf8(self):
 
129
        c = Commit()
 
130
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
131
        c.message = "Some message"
 
132
        c.committer = "Committer"
 
133
        c.commit_time = 4
 
134
        c.author_time = 5
 
135
        c.commit_timezone = 60 * 5
 
136
        c.author_timezone = 60 * 3
 
137
        c.author = u"Authér".encode("utf-8")
 
138
        rev = BzrGitMappingv1().import_commit(c)
 
139
        self.assertEquals(u"Authér", rev.properties['author'])
 
140
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
141
        self.assertTrue("git-implicit-encoding" not in rev.properties)
 
142
 
 
143
 
 
144
class RoundtripRevisionsFromBazaar(tests.TestCase):
 
145
 
 
146
    def setUp(self):
 
147
        super(RoundtripRevisionsFromBazaar, self).setUp()
 
148
        self.mapping = BzrGitMappingv1()
 
149
        self._parent_map = {}
 
150
        self._lookup_parent = self._parent_map.__getitem__
 
151
 
 
152
    def assertRoundtripRevision(self, orig_rev):
 
153
        commit = self.mapping.export_commit(orig_rev, "mysha",
 
154
            self._lookup_parent, True)
 
155
        rev = self.mapping.import_commit(commit)
 
156
        self.assertEquals(orig_rev.revision_id, rev.revision_id)
 
157
        self.assertEquals(orig_rev.properties, rev.properties)
 
158
        self.assertEquals(orig_rev.committer, rev.committer)
 
159
        self.assertEquals(orig_rev.timestamp, rev.timestamp)
 
160
        self.assertEquals(orig_rev.timezone, rev.timezone)
 
161
        self.assertEquals(orig_rev.message, rev.message)
 
162
        self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
 
163
 
 
164
    def test_simple_commit(self):
 
165
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
 
166
        r.message = "MyCommitMessage"
 
167
        r.parent_ids = []
 
168
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
169
        r.timestamp = 453543543
 
170
        r.timezone = 0
 
171
        r.properties = {}
 
172
        self.assertRoundtripRevision(r)
 
173
 
 
174
    def test_revision_id(self):
 
175
        r = Revision("myrevid")
 
176
        r.message = "MyCommitMessage"
 
177
        r.parent_ids = []
 
178
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
179
        r.timestamp = 453543543
 
180
        r.timezone = 0
 
181
        r.properties = {}
 
182
        self.assertRoundtripRevision(r)
 
183
 
 
184
    def test_ghost_parent(self):
 
185
        r = Revision("myrevid")
 
186
        r.message = "MyCommitMessage"
 
187
        r.parent_ids = ["iamaghost"]
 
188
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
189
        r.timestamp = 453543543
 
190
        r.timezone = 0
 
191
        r.properties = {}
 
192
        self.assertRoundtripRevision(r)
 
193
 
 
194
    def test_custom_property(self):
 
195
        r = Revision("myrevid")
 
196
        r.message = "MyCommitMessage"
 
197
        r.parent_ids = []
 
198
        r.properties = {"fool": "bar"}
 
199
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
200
        r.timestamp = 453543543
 
201
        r.timezone = 0
 
202
        self.assertRoundtripRevision(r)
87
203
 
88
204
 
89
205
class RoundtripRevisionsFromGit(tests.TestCase):
99
215
        raise NotImplementedError(self.assertRoundtripBlob)
100
216
 
101
217
    def assertRoundtripCommit(self, commit1):
102
 
        commit1.serialize()
103
218
        rev = self.mapping.import_commit(commit1)
104
 
        commit2 = revision_to_commit(rev, "12341212121212", None)
 
219
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
 
220
            True)
105
221
        self.assertEquals(commit1.committer, commit2.committer)
106
222
        self.assertEquals(commit1.commit_time, commit2.commit_time)
107
223
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
109
225
        self.assertEquals(commit1.author_time, commit2.author_time)
110
226
        self.assertEquals(commit1.author_timezone, commit2.author_timezone)
111
227
        self.assertEquals(commit1.message, commit2.message)
 
228
        self.assertEquals(commit1.encoding, commit2.encoding)
112
229
 
113
230
    def test_commit(self):
114
231
        c = Commit()
122
239
        c.author = "Author <author>"
123
240
        self.assertRoundtripCommit(c)
124
241
 
 
242
    def test_commit_zero_utc_timezone(self):
 
243
        c = Commit()
 
244
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
245
        c.message = "Some message"
 
246
        c.committer = "Committer <Committer>"
 
247
        c.commit_time = 4
 
248
        c.commit_timezone = 0
 
249
        c._commit_timezone_neg_utc = True
 
250
        c.author_time = 5
 
251
        c.author_timezone = 60 * 2
 
252
        c.author = "Author <author>"
 
253
        self.assertRoundtripCommit(c)
 
254
 
 
255
    def test_commit_encoding(self):
 
256
        c = Commit()
 
257
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
258
        c.message = "Some message"
 
259
        c.committer = "Committer <Committer>"
 
260
        c.encoding = 'iso8859-1'
 
261
        c.commit_time = 4
 
262
        c.commit_timezone = -60 * 3
 
263
        c.author_time = 5
 
264
        c.author_timezone = 60 * 2
 
265
        c.author = "Author <author>"
 
266
        self.assertRoundtripCommit(c)
 
267
 
 
268
 
 
269
class DirectoryToTreeTests(tests.TestCase):
 
270
 
 
271
    def test_empty(self):
 
272
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
273
        t = directory_to_tree(ie, None, {})
 
274
        self.assertEquals(None, t)
 
275
 
 
276
    def test_empty_dir(self):
 
277
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
278
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
279
        ie.children['bar'] = child_ie
 
280
        t = directory_to_tree(ie, lambda x: None, {})
 
281
        self.assertEquals(None, t)
 
282
 
 
283
    def test_empty_root(self):
 
284
        ie = InventoryDirectory('foo', 'foo', None)
 
285
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
286
        ie.children['bar'] = child_ie
 
287
        t = directory_to_tree(ie, lambda x: None, {})
 
288
        self.assertEquals(Tree(), t)
 
289
 
 
290
    def test_with_file(self):
 
291
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
292
        child_ie = InventoryFile('bar', 'bar', 'bar')
 
293
        ie.children['bar'] = child_ie
 
294
        b = Blob.from_string("bla")
 
295
        t1 = directory_to_tree(ie, lambda x: b.id, {})
 
296
        t2 = Tree()
 
297
        t2.add(0100644, "bar", b.id)
 
298
        self.assertEquals(t1, t2)