/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

Fix compatibility with newer versions of Dulwich.

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
 
17
23
from dulwich.objects import (
 
24
    Blob,
18
25
    Commit,
 
26
    Tree,
19
27
    )
20
28
 
21
29
from bzrlib.plugins.git import tests
22
30
from bzrlib.plugins.git.mapping import (
23
31
    BzrGitMappingv1,
 
32
    directory_to_tree,
24
33
    escape_file_id,
25
 
    revision_to_commit,
26
34
    unescape_file_id,
27
35
    )
28
36
 
73
81
        c.commit_timezone = 60 * 5
74
82
        c.author_timezone = 60 * 3
75
83
        c.author = "Author"
76
 
        c.serialize()
77
84
        rev = BzrGitMappingv1().import_commit(c)
78
85
        self.assertEquals("Some message", rev.message)
79
86
        self.assertEquals("Committer", rev.committer)
84
91
        self.assertEquals("180", rev.properties['author-timezone'])
85
92
        self.assertEquals("git-v1:" + c.id, rev.revision_id)
86
93
 
 
94
    def test_explicit_encoding(self):
 
95
        c = Commit()
 
96
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
97
        c.message = "Some message"
 
98
        c.committer = "Committer"
 
99
        c.commit_time = 4
 
100
        c.author_time = 5
 
101
        c.commit_timezone = 60 * 5
 
102
        c.author_timezone = 60 * 3
 
103
        c.author = u"Authér".encode("iso8859-1")
 
104
        c.encoding = "iso8859-1"
 
105
        rev = BzrGitMappingv1().import_commit(c)
 
106
        self.assertEquals(u"Authér", rev.properties['author'])
 
107
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
 
108
        self.assertTrue("git-implicit-encoding" not in rev.properties)
 
109
 
 
110
    def test_implicit_encoding_fallback(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("latin1")
 
120
        rev = BzrGitMappingv1().import_commit(c)
 
121
        self.assertEquals(u"Authér", rev.properties['author'])
 
122
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
 
123
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
124
 
 
125
    def test_implicit_encoding_utf8(self):
 
126
        c = Commit()
 
127
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
128
        c.message = "Some message"
 
129
        c.committer = "Committer"
 
130
        c.commit_time = 4
 
131
        c.author_time = 5
 
132
        c.commit_timezone = 60 * 5
 
133
        c.author_timezone = 60 * 3
 
134
        c.author = u"Authér".encode("utf-8")
 
135
        rev = BzrGitMappingv1().import_commit(c)
 
136
        self.assertEquals(u"Authér", rev.properties['author'])
 
137
        self.assertTrue("git-explicit-encoding" not in rev.properties)
 
138
        self.assertTrue("git-implicit-encoding" not in rev.properties)
87
139
 
88
140
 
89
141
class RoundtripRevisionsFromGit(tests.TestCase):
99
151
        raise NotImplementedError(self.assertRoundtripBlob)
100
152
 
101
153
    def assertRoundtripCommit(self, commit1):
102
 
        commit1.serialize()
103
154
        rev = self.mapping.import_commit(commit1)
104
 
        commit2 = revision_to_commit(rev, "12341212121212", None)
 
155
        commit2 = self.mapping.export_commit(rev, "12341212121212", None)
105
156
        self.assertEquals(commit1.committer, commit2.committer)
106
157
        self.assertEquals(commit1.commit_time, commit2.commit_time)
107
158
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
109
160
        self.assertEquals(commit1.author_time, commit2.author_time)
110
161
        self.assertEquals(commit1.author_timezone, commit2.author_timezone)
111
162
        self.assertEquals(commit1.message, commit2.message)
 
163
        self.assertEquals(commit1.encoding, commit2.encoding)
112
164
 
113
165
    def test_commit(self):
114
166
        c = Commit()
122
174
        c.author = "Author <author>"
123
175
        self.assertRoundtripCommit(c)
124
176
 
 
177
    def test_commit_zero_utc_timezone(self):
 
178
        c = Commit()
 
179
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
180
        c.message = "Some message"
 
181
        c.committer = "Committer <Committer>"
 
182
        c.commit_time = 4
 
183
        c.commit_timezone = 0
 
184
        c._commit_timezone_neg_utc = True
 
185
        c.author_time = 5
 
186
        c.author_timezone = 60 * 2
 
187
        c.author = "Author <author>"
 
188
        self.assertRoundtripCommit(c)
 
189
 
 
190
    def test_commit_encoding(self):
 
191
        c = Commit()
 
192
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
193
        c.message = "Some message"
 
194
        c.committer = "Committer <Committer>"
 
195
        c.encoding = 'iso8859-1'
 
196
        c.commit_time = 4
 
197
        c.commit_timezone = -60 * 3
 
198
        c.author_time = 5
 
199
        c.author_timezone = 60 * 2
 
200
        c.author = "Author <author>"
 
201
        self.assertRoundtripCommit(c)
 
202
 
 
203
 
 
204
class DirectoryToTreeTests(tests.TestCase):
 
205
 
 
206
    def test_empty(self):
 
207
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
208
        t = directory_to_tree(ie, None, {})
 
209
        self.assertEquals(None, t)
 
210
 
 
211
    def test_empty_dir(self):
 
212
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
213
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
214
        ie.children['bar'] = child_ie
 
215
        t = directory_to_tree(ie, lambda x: None, {})
 
216
        self.assertEquals(None, t)
 
217
 
 
218
    def test_empty_root(self):
 
219
        ie = InventoryDirectory('foo', 'foo', None)
 
220
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
221
        ie.children['bar'] = child_ie
 
222
        t = directory_to_tree(ie, lambda x: None, {})
 
223
        self.assertEquals(Tree(), t)
 
224
 
 
225
    def test_with_file(self):
 
226
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
227
        child_ie = InventoryFile('bar', 'bar', 'bar')
 
228
        ie.children['bar'] = child_ie
 
229
        b = Blob.from_string("bla")
 
230
        t1 = directory_to_tree(ie, lambda x: b.id, {})
 
231
        t2 = Tree()
 
232
        t2.add(0100644, "bar", b.id)
 
233
        self.assertEquals(t1, t2)