/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
1
# Copyright (C) 2007-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
2
# -*- encoding: utf-8 -*-
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
3
#
0.201.1 by Jelmer Vernooij
Add very small initial testsuite.
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
8
#
0.201.1 by Jelmer Vernooij
Add very small initial testsuite.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
13
#
0.201.1 by Jelmer Vernooij
Add very small initial testsuite.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.201.1 by Jelmer Vernooij
Add very small initial testsuite.
17
0.358.3 by Jelmer Vernooij
Enable absolute import.
18
"""Tests for mapping."""
19
20
from __future__ import absolute_import
21
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
22
from ....bzr.inventory import (
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
23
    InventoryDirectory,
24
    InventoryFile,
25
    )
0.200.1642 by Jelmer Vernooij
Use relative imports in tests.
26
from ....revision import (
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
27
    Revision,
28
    )
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
29
0.200.264 by Jelmer Vernooij
Add more tests.
30
from dulwich.objects import (
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
31
    Blob,
0.200.264 by Jelmer Vernooij
Add more tests.
32
    Commit,
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
33
    Tree,
0.200.1589 by Jelmer Vernooij
Add test to make sure that certain invalid timezones are roundtripped correctly.
34
    parse_timezone,
0.200.264 by Jelmer Vernooij
Add more tests.
35
    )
36
0.200.1642 by Jelmer Vernooij
Use relative imports in tests.
37
from .. import tests
38
from ..errors import UnknownCommitExtra
39
from ..mapping import (
0.200.258 by Jelmer Vernooij
add tests for file id escape/unescape.
40
    BzrGitMappingv1,
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
41
    directory_to_tree,
0.200.258 by Jelmer Vernooij
add tests for file id escape/unescape.
42
    escape_file_id,
43
    unescape_file_id,
44
    )
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
45
46
47
class TestRevidConversionV1(tests.TestCase):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
48
49
    def test_simple_git_to_bzr_revision_id(self):
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
50
        self.assertEqual("git-v1:"
0.204.1 by James Westby
Fix id tests to match new revid prefix.
51
                         "c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
52
                         BzrGitMappingv1().revision_id_foreign_to_bzr(
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
53
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
54
55
    def test_simple_bzr_to_git_revision_id(self):
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
56
        self.assertEqual(("c6a4d8f1fa4ac650748e647c4b1b368f589a7356", 
57
                         BzrGitMappingv1()),
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
58
                         BzrGitMappingv1().revision_id_bzr_to_foreign(
59
                            "git-v1:"
0.204.1 by James Westby
Fix id tests to match new revid prefix.
60
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
0.200.258 by Jelmer Vernooij
add tests for file id escape/unescape.
61
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
62
    def test_is_control_file(self):
63
        mapping = BzrGitMappingv1()
0.200.920 by Jelmer Vernooij
Fix some more tests.
64
        if mapping.roundtripping:
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
65
            self.assertTrue(mapping.is_special_file(".bzrdummy"))
66
            self.assertTrue(mapping.is_special_file(".bzrfileids"))
67
        self.assertFalse(mapping.is_special_file(".bzrfoo"))
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
68
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
69
    def test_generate_file_id(self):
70
        mapping = BzrGitMappingv1()
71
        self.assertIsInstance(mapping.generate_file_id("la"), str)
72
        self.assertIsInstance(mapping.generate_file_id(u"é"), str)
73
0.200.258 by Jelmer Vernooij
add tests for file id escape/unescape.
74
75
class FileidTests(tests.TestCase):
76
77
    def test_escape_space(self):
78
        self.assertEquals("bla_s", escape_file_id("bla "))
79
0.200.1419 by Jelmer Vernooij
Escape/unescape ^L characters.
80
    def test_escape_control_l(self):
81
        self.assertEquals("bla_c", escape_file_id("bla\x0c"))
82
83
    def test_unescape_control_l(self):
84
        self.assertEquals("bla\x0c", unescape_file_id("bla_c"))
85
0.200.258 by Jelmer Vernooij
add tests for file id escape/unescape.
86
    def test_escape_underscore(self):
87
        self.assertEquals("bla__", escape_file_id("bla_"))
88
89
    def test_escape_underscore_space(self):
90
        self.assertEquals("bla___s", escape_file_id("bla_ "))
91
92
    def test_unescape_underscore(self):
93
        self.assertEquals("bla ", unescape_file_id("bla_s"))
94
95
    def test_unescape_underscore_space(self):
96
        self.assertEquals("bla _", unescape_file_id("bla_s__"))
0.200.264 by Jelmer Vernooij
Add more tests.
97
98
99
class TestImportCommit(tests.TestCase):
100
101
    def test_commit(self):
102
        c = Commit()
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
103
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
104
        c.message = "Some message"
105
        c.committer = "Committer"
106
        c.commit_time = 4
107
        c.author_time = 5
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
108
        c.commit_timezone = 60 * 5
109
        c.author_timezone = 60 * 3
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
110
        c.author = "Author"
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
111
        mapping = BzrGitMappingv1()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
112
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
113
            mapping.revision_id_foreign_to_bzr)
114
        self.assertEquals(None, roundtrip_revid)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
115
        self.assertEquals({}, verifiers)
0.200.264 by Jelmer Vernooij
Add more tests.
116
        self.assertEquals("Some message", rev.message)
117
        self.assertEquals("Committer", rev.committer)
118
        self.assertEquals("Author", rev.properties['author'])
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
119
        self.assertEquals(300, rev.timezone)
0.200.264 by Jelmer Vernooij
Add more tests.
120
        self.assertEquals((), rev.parent_ids)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
121
        self.assertEquals("5", rev.properties['author-timestamp'])
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
122
        self.assertEquals("180", rev.properties['author-timezone'])
0.200.264 by Jelmer Vernooij
Add more tests.
123
        self.assertEquals("git-v1:" + c.id, rev.revision_id)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
124
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
125
    def test_explicit_encoding(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("iso8859-1")
135
        c.encoding = "iso8859-1"
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
136
        mapping = BzrGitMappingv1()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
137
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
138
            mapping.revision_id_foreign_to_bzr)
139
        self.assertEquals(None, roundtrip_revid)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
140
        self.assertEquals({}, verifiers)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
141
        self.assertEquals(u"Authér", rev.properties['author'])
142
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
143
        self.assertTrue("git-implicit-encoding" not in rev.properties)
144
145
    def test_implicit_encoding_fallback(self):
146
        c = Commit()
147
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
148
        c.message = "Some message"
149
        c.committer = "Committer"
150
        c.commit_time = 4
151
        c.author_time = 5
152
        c.commit_timezone = 60 * 5
153
        c.author_timezone = 60 * 3
154
        c.author = u"Authér".encode("latin1")
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
155
        mapping = BzrGitMappingv1()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
156
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
157
            mapping.revision_id_foreign_to_bzr)
158
        self.assertEquals(None, roundtrip_revid)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
159
        self.assertEquals({}, verifiers)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
160
        self.assertEquals(u"Authér", rev.properties['author'])
161
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
162
        self.assertTrue("git-explicit-encoding" not in rev.properties)
163
164
    def test_implicit_encoding_utf8(self):
165
        c = Commit()
166
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
167
        c.message = "Some message"
168
        c.committer = "Committer"
169
        c.commit_time = 4
170
        c.author_time = 5
171
        c.commit_timezone = 60 * 5
172
        c.author_timezone = 60 * 3
173
        c.author = u"Authér".encode("utf-8")
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
174
        mapping = BzrGitMappingv1()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
175
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
176
            mapping.revision_id_foreign_to_bzr)
177
        self.assertEquals(None, roundtrip_revid)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
178
        self.assertEquals({}, verifiers)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
179
        self.assertEquals(u"Authér", rev.properties['author'])
180
        self.assertTrue("git-explicit-encoding" not in rev.properties)
181
        self.assertTrue("git-implicit-encoding" not in rev.properties)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
182
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
183
    def test_unknown_extra(self):
184
        c = Commit()
185
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
186
        c.message = "Some message"
187
        c.committer = "Committer"
188
        c.commit_time = 4
189
        c.author_time = 5
190
        c.commit_timezone = 60 * 5
191
        c.author_timezone = 60 * 3
192
        c.author = "Author"
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
193
        c._extra.append(("iamextra", "foo"))
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
194
        mapping = BzrGitMappingv1()
195
        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
196
            mapping.revision_id_foreign_to_bzr)
197
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
198
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
199
class RoundtripRevisionsFromBazaar(tests.TestCase):
200
201
    def setUp(self):
202
        super(RoundtripRevisionsFromBazaar, self).setUp()
203
        self.mapping = BzrGitMappingv1()
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
204
        self._parent_map = {}
205
        self._lookup_parent = self._parent_map.__getitem__
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
206
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
207
    def assertRoundtripRevision(self, orig_rev):
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
208
        commit = self.mapping.export_commit(orig_rev, "mysha",
0.200.1023 by Jelmer Vernooij
Set and verify testament.
209
            self._lookup_parent, True, "testamentsha")
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
210
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
211
            commit, self.mapping.revision_id_foreign_to_bzr)
212
        self.assertEquals(rev.revision_id,
213
            self.mapping.revision_id_foreign_to_bzr(commit.id))
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
214
        if self.mapping.roundtripping:
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
215
            self.assertEquals({"testament3-sha1": "testamentsha"} , verifiers)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
216
            self.assertEquals(orig_rev.revision_id, roundtrip_revid)
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
217
            self.assertEquals(orig_rev.properties, rev.properties)
218
            self.assertEquals(orig_rev.committer, rev.committer)
219
            self.assertEquals(orig_rev.timestamp, rev.timestamp)
220
            self.assertEquals(orig_rev.timezone, rev.timezone)
221
            self.assertEquals(orig_rev.message, rev.message)
222
            self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
0.200.1023 by Jelmer Vernooij
Set and verify testament.
223
        else:
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
224
            self.assertEquals({}, verifiers)
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
225
226
    def test_simple_commit(self):
227
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
228
        r.message = "MyCommitMessage"
229
        r.parent_ids = []
230
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
231
        r.timestamp = 453543543
232
        r.timezone = 0
233
        r.properties = {}
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
234
        self.assertRoundtripRevision(r)
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
235
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
236
    def test_revision_id(self):
237
        r = Revision("myrevid")
238
        r.message = "MyCommitMessage"
239
        r.parent_ids = []
240
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
241
        r.timestamp = 453543543
242
        r.timezone = 0
243
        r.properties = {}
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
244
        self.assertRoundtripRevision(r)
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
245
246
    def test_ghost_parent(self):
247
        r = Revision("myrevid")
248
        r.message = "MyCommitMessage"
249
        r.parent_ids = ["iamaghost"]
250
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
251
        r.timestamp = 453543543
252
        r.timezone = 0
253
        r.properties = {}
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
254
        self.assertRoundtripRevision(r)
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
255
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
256
    def test_custom_property(self):
257
        r = Revision("myrevid")
258
        r.message = "MyCommitMessage"
259
        r.parent_ids = []
260
        r.properties = {"fool": "bar"}
261
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
262
        r.timestamp = 453543543
263
        r.timezone = 0
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
264
        self.assertRoundtripRevision(r)
0.252.16 by Jelmer Vernooij
make sure file ids are roundtripped properly.
265
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
266
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
267
class RoundtripRevisionsFromGit(tests.TestCase):
268
269
    def setUp(self):
270
        super(RoundtripRevisionsFromGit, self).setUp()
271
        self.mapping = BzrGitMappingv1()
272
273
    def assertRoundtripTree(self, tree):
274
        raise NotImplementedError(self.assertRoundtripTree)
275
276
    def assertRoundtripBlob(self, blob):
277
        raise NotImplementedError(self.assertRoundtripBlob)
278
279
    def assertRoundtripCommit(self, commit1):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
280
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
281
            commit1, self.mapping.revision_id_foreign_to_bzr)
0.252.7 by Jelmer Vernooij
Add basic test for roundtripping from Bazaar.
282
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
0.200.1023 by Jelmer Vernooij
Set and verify testament.
283
            True, None)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
284
        self.assertEquals(commit1.committer, commit2.committer)
285
        self.assertEquals(commit1.commit_time, commit2.commit_time)
0.200.362 by Jelmer Vernooij
Fix tests.
286
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
287
        self.assertEquals(commit1.author, commit2.author)
288
        self.assertEquals(commit1.author_time, commit2.author_time)
0.200.362 by Jelmer Vernooij
Fix tests.
289
        self.assertEquals(commit1.author_timezone, commit2.author_timezone)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
290
        self.assertEquals(commit1.message, commit2.message)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
291
        self.assertEquals(commit1.encoding, commit2.encoding)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
292
293
    def test_commit(self):
294
        c = Commit()
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
295
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
296
        c.message = "Some message"
297
        c.committer = "Committer <Committer>"
298
        c.commit_time = 4
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
299
        c.commit_timezone = -60 * 3
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
300
        c.author_time = 5
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
301
        c.author_timezone = 60 * 2
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
302
        c.author = "Author <author>"
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
303
        self.assertRoundtripCommit(c)
304
0.200.1589 by Jelmer Vernooij
Add test to make sure that certain invalid timezones are roundtripped correctly.
305
    def test_commit_double_negative_timezone(self):
306
        c = Commit()
307
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
308
        c.message = "Some message"
309
        c.committer = "Committer <Committer>"
310
        c.commit_time = 4
311
        (c.commit_timezone, c._commit_timezone_neg_utc) = parse_timezone("--700")
312
        c.author_time = 5
313
        c.author_timezone = 60 * 2
314
        c.author = "Author <author>"
315
        self.assertRoundtripCommit(c)
316
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
317
    def test_commit_zero_utc_timezone(self):
318
        c = Commit()
319
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
320
        c.message = "Some message"
321
        c.committer = "Committer <Committer>"
322
        c.commit_time = 4
323
        c.commit_timezone = 0
324
        c._commit_timezone_neg_utc = True
325
        c.author_time = 5
326
        c.author_timezone = 60 * 2
327
        c.author = "Author <author>"
328
        self.assertRoundtripCommit(c)
329
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
330
    def test_commit_encoding(self):
331
        c = Commit()
332
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
333
        c.message = "Some message"
334
        c.committer = "Committer <Committer>"
335
        c.encoding = 'iso8859-1'
336
        c.commit_time = 4
337
        c.commit_timezone = -60 * 3
338
        c.author_time = 5
339
        c.author_timezone = 60 * 2
340
        c.author = "Author <author>"
341
        self.assertRoundtripCommit(c)
342
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
343
    def test_commit_extra(self):
344
        c = Commit()
345
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
346
        c.message = "Some message"
347
        c.committer = "Committer <Committer>"
348
        c.commit_time = 4
349
        c.commit_timezone = -60 * 3
350
        c.author_time = 5
351
        c.author_timezone = 60 * 2
352
        c.author = "Author <author>"
353
        c._extra = [("HG:rename-source", "hg")]
354
        self.assertRoundtripCommit(c)
355
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
356
357
class DirectoryToTreeTests(tests.TestCase):
358
359
    def test_empty(self):
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
360
        t = directory_to_tree({}, None, {}, None, allow_empty=False)
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
361
        self.assertEquals(None, t)
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
362
363
    def test_empty_dir(self):
364
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
365
        children = {'bar': child_ie}
366
        t = directory_to_tree(children, lambda x: None, {}, None,
367
                allow_empty=False)
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
368
        self.assertEquals(None, t)
369
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
370
    def test_empty_dir_dummy_files(self):
371
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
372
        children = {'bar':child_ie}
373
        t = directory_to_tree(children, lambda x: None, {}, ".mydummy",
374
                allow_empty=False)
0.252.30 by Jelmer Vernooij
Support creating dummy files for empty directories.
375
        self.assertTrue(".mydummy" in t)
376
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
377
    def test_empty_root(self):
378
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
379
        children = {'bar': child_ie}
380
        t = directory_to_tree(children, lambda x: None, {}, None,
381
                allow_empty=True)
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
382
        self.assertEquals(Tree(), t)
383
384
    def test_with_file(self):
385
        child_ie = InventoryFile('bar', 'bar', 'bar')
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
386
        children = {"bar": child_ie}
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
387
        b = Blob.from_string("bla")
0.275.4 by Jelmer Vernooij
Pass children list to directory_to_tree .
388
        t1 = directory_to_tree(children, lambda x: b.id, {}, None,
389
                allow_empty=False)
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
390
        t2 = Tree()
0.200.1152 by Jelmer Vernooij
Require dulwich 0.7.1.
391
        t2.add("bar", 0100644, b.id)
0.200.588 by Jelmer Vernooij
Cope with empty directories that are not allowed in git.
392
        self.assertEquals(t1, t2)