/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 breezy/git/tests/test_mapping.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 07:18:33 UTC
  • mfrom: (7141.3.3 fix1799482)
  • Revision ID: breezy.the.bot@gmail.com-20181116071833-e01b0833f3hkc3et
Report correct paths when running "brz add" in git repositories.

Merged from https://code.launchpad.net/~jelmer/brz/fix1799482/+merge/357734

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_mapping.py
 
1
# Copyright (C) 2007-2018 Jelmer Vernooij <jelmer@jelmer.uk>
 
2
# -*- encoding: utf-8 -*-
 
3
#
 
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.
 
8
#
 
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.
 
13
#
 
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
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 
 
18
"""Tests for mapping."""
 
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
from ...revision import (
 
23
    Revision,
 
24
    )
 
25
 
 
26
from dulwich.objects import (
 
27
    Blob,
 
28
    Commit,
 
29
    Tag,
 
30
    Tree,
 
31
    parse_timezone,
 
32
    )
 
33
from dulwich.tests.utils import (
 
34
    make_object,
 
35
    )
 
36
 
 
37
from .. import tests
 
38
from ..errors import UnknownCommitExtra
 
39
from ..mapping import (
 
40
    BzrGitMappingv1,
 
41
    escape_file_id,
 
42
    fix_person_identifier,
 
43
    unescape_file_id,
 
44
    )
 
45
 
 
46
 
 
47
class TestRevidConversionV1(tests.TestCase):
 
48
 
 
49
    def test_simple_git_to_bzr_revision_id(self):
 
50
        self.assertEqual(b"git-v1:"
 
51
                         b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
 
52
                         BzrGitMappingv1().revision_id_foreign_to_bzr(
 
53
                            b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
 
54
 
 
55
    def test_simple_bzr_to_git_revision_id(self):
 
56
        self.assertEqual((b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
 
57
                         BzrGitMappingv1()),
 
58
                         BzrGitMappingv1().revision_id_bzr_to_foreign(
 
59
                            b"git-v1:"
 
60
                            b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
 
61
 
 
62
    def test_is_control_file(self):
 
63
        mapping = BzrGitMappingv1()
 
64
        if mapping.roundtripping:
 
65
            self.assertTrue(mapping.is_special_file(".bzrdummy"))
 
66
            self.assertTrue(mapping.is_special_file(".bzrfileids"))
 
67
        self.assertFalse(mapping.is_special_file(".bzrfoo"))
 
68
 
 
69
    def test_generate_file_id(self):
 
70
        mapping = BzrGitMappingv1()
 
71
        self.assertIsInstance(mapping.generate_file_id("la"), bytes)
 
72
        self.assertIsInstance(mapping.generate_file_id(u"é"), bytes)
 
73
 
 
74
 
 
75
class FileidTests(tests.TestCase):
 
76
 
 
77
    def test_escape_space(self):
 
78
        self.assertEqual(b"bla_s", escape_file_id(b"bla "))
 
79
 
 
80
    def test_escape_control_l(self):
 
81
        self.assertEqual(b"bla_c", escape_file_id(b"bla\x0c"))
 
82
 
 
83
    def test_unescape_control_l(self):
 
84
        self.assertEqual(b"bla\x0c", unescape_file_id(b"bla_c"))
 
85
 
 
86
    def test_escape_underscore(self):
 
87
        self.assertEqual(b"bla__", escape_file_id(b"bla_"))
 
88
 
 
89
    def test_escape_underscore_space(self):
 
90
        self.assertEqual(b"bla___s", escape_file_id(b"bla_ "))
 
91
 
 
92
    def test_unescape_underscore(self):
 
93
        self.assertEqual(b"bla ", unescape_file_id(b"bla_s"))
 
94
 
 
95
    def test_unescape_underscore_space(self):
 
96
        self.assertEqual(b"bla _", unescape_file_id(b"bla_s__"))
 
97
 
 
98
 
 
99
class TestImportCommit(tests.TestCase):
 
100
 
 
101
    def test_commit(self):
 
102
        c = Commit()
 
103
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
104
        c.message = b"Some message"
 
105
        c.committer = b"Committer"
 
106
        c.commit_time = 4
 
107
        c.author_time = 5
 
108
        c.commit_timezone = 60 * 5
 
109
        c.author_timezone = 60 * 3
 
110
        c.author = b"Author"
 
111
        mapping = BzrGitMappingv1()
 
112
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
 
113
            mapping.revision_id_foreign_to_bzr)
 
114
        self.assertEqual(None, roundtrip_revid)
 
115
        self.assertEqual({}, verifiers)
 
116
        self.assertEqual(u"Some message", rev.message)
 
117
        self.assertEqual(u"Committer", rev.committer)
 
118
        self.assertEqual(u"Author", rev.properties[u'author'])
 
119
        self.assertEqual(300, rev.timezone)
 
120
        self.assertEqual([], rev.parent_ids)
 
121
        self.assertEqual("5", rev.properties[u'author-timestamp'])
 
122
        self.assertEqual("180", rev.properties[u'author-timezone'])
 
123
        self.assertEqual(b"git-v1:" + c.id, rev.revision_id)
 
124
 
 
125
    def test_explicit_encoding(self):
 
126
        c = Commit()
 
127
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
128
        c.message = b"Some message"
 
129
        c.committer = b"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 = b"iso8859-1"
 
136
        mapping = BzrGitMappingv1()
 
137
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
 
138
            mapping.revision_id_foreign_to_bzr)
 
139
        self.assertEqual(None, roundtrip_revid)
 
140
        self.assertEqual({}, verifiers)
 
141
        self.assertEqual(u"Authér", rev.properties[u'author'])
 
142
        self.assertEqual("iso8859-1", rev.properties[u"git-explicit-encoding"])
 
143
        self.assertTrue(u"git-implicit-encoding" not in rev.properties)
 
144
 
 
145
    def test_implicit_encoding_fallback(self):
 
146
        c = Commit()
 
147
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
148
        c.message = b"Some message"
 
149
        c.committer = b"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")
 
155
        mapping = BzrGitMappingv1()
 
156
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
 
157
            mapping.revision_id_foreign_to_bzr)
 
158
        self.assertEqual(None, roundtrip_revid)
 
159
        self.assertEqual({}, verifiers)
 
160
        self.assertEqual(u"Authér", rev.properties[u'author'])
 
161
        self.assertEqual("latin1", rev.properties[u"git-implicit-encoding"])
 
162
        self.assertTrue(u"git-explicit-encoding" not in rev.properties)
 
163
 
 
164
    def test_implicit_encoding_utf8(self):
 
165
        c = Commit()
 
166
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
167
        c.message = b"Some message"
 
168
        c.committer = b"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")
 
174
        mapping = BzrGitMappingv1()
 
175
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
 
176
            mapping.revision_id_foreign_to_bzr)
 
177
        self.assertEqual(None, roundtrip_revid)
 
178
        self.assertEqual({}, verifiers)
 
179
        self.assertEqual(u"Authér", rev.properties[u'author'])
 
180
        self.assertTrue(u"git-explicit-encoding" not in rev.properties)
 
181
        self.assertTrue(u"git-implicit-encoding" not in rev.properties)
 
182
 
 
183
    def test_unknown_extra(self):
 
184
        c = Commit()
 
185
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
186
        c.message = b"Some message"
 
187
        c.committer = b"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 = b"Author"
 
193
        c._extra.append((b"iamextra", b"foo"))
 
194
        mapping = BzrGitMappingv1()
 
195
        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
 
196
            mapping.revision_id_foreign_to_bzr)
 
197
 
 
198
    def test_mergetag(self):
 
199
        c = Commit()
 
200
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
201
        c.message = b"Some message"
 
202
        c.committer = b"Committer"
 
203
        c.commit_time = 4
 
204
        c.author_time = 5
 
205
        c.commit_timezone = 60 * 5
 
206
        c.author_timezone = 60 * 3
 
207
        c.author = b"Author"
 
208
        tag = make_object(Tag,
 
209
                tagger=b'Jelmer Vernooij <jelmer@samba.org>',
 
210
                name=b'0.1', message=None,
 
211
                object=(Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
 
212
                tag_time=423423423, tag_timezone=0)
 
213
        c.mergetag = [tag]
 
214
        mapping = BzrGitMappingv1()
 
215
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
216
                c, mapping.revision_id_foreign_to_bzr)
 
217
        self.assertEqual(rev.properties[u'git-mergetag-0'], tag.as_raw_string())
 
218
 
 
219
 
 
220
class RoundtripRevisionsFromBazaar(tests.TestCase):
 
221
 
 
222
    def setUp(self):
 
223
        super(RoundtripRevisionsFromBazaar, self).setUp()
 
224
        self.mapping = BzrGitMappingv1()
 
225
        self._parent_map = {}
 
226
        self._lookup_parent = self._parent_map.__getitem__
 
227
 
 
228
    def assertRoundtripRevision(self, orig_rev):
 
229
        commit = self.mapping.export_commit(orig_rev, b"mysha",
 
230
            self._lookup_parent, True, b"testamentsha")
 
231
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
 
232
            commit, self.mapping.revision_id_foreign_to_bzr)
 
233
        self.assertEqual(rev.revision_id,
 
234
            self.mapping.revision_id_foreign_to_bzr(commit.id))
 
235
        if self.mapping.roundtripping:
 
236
            self.assertEqual({"testament3-sha1": b"testamentsha"} , verifiers)
 
237
            self.assertEqual(orig_rev.revision_id, roundtrip_revid)
 
238
            self.assertEqual(orig_rev.properties, rev.properties)
 
239
            self.assertEqual(orig_rev.committer, rev.committer)
 
240
            self.assertEqual(orig_rev.timestamp, rev.timestamp)
 
241
            self.assertEqual(orig_rev.timezone, rev.timezone)
 
242
            self.assertEqual(orig_rev.message, rev.message)
 
243
            self.assertEqual(list(orig_rev.parent_ids), list(rev.parent_ids))
 
244
        else:
 
245
            self.assertEqual({}, verifiers)
 
246
 
 
247
    def test_simple_commit(self):
 
248
        r = Revision(self.mapping.revision_id_foreign_to_bzr(b"edf99e6c56495c620f20d5dacff9859ff7119261"))
 
249
        r.message = "MyCommitMessage"
 
250
        r.parent_ids = []
 
251
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
252
        r.timestamp = 453543543
 
253
        r.timezone = 0
 
254
        r.properties = {}
 
255
        self.assertRoundtripRevision(r)
 
256
 
 
257
    def test_revision_id(self):
 
258
        r = Revision(b"myrevid")
 
259
        r.message = "MyCommitMessage"
 
260
        r.parent_ids = []
 
261
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
262
        r.timestamp = 453543543
 
263
        r.timezone = 0
 
264
        r.properties = {}
 
265
        self.assertRoundtripRevision(r)
 
266
 
 
267
    def test_ghost_parent(self):
 
268
        r = Revision(b"myrevid")
 
269
        r.message = u"MyCommitMessage"
 
270
        r.parent_ids = [b"iamaghost"]
 
271
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
272
        r.timestamp = 453543543
 
273
        r.timezone = 0
 
274
        r.properties = {}
 
275
        self.assertRoundtripRevision(r)
 
276
 
 
277
    def test_custom_property(self):
 
278
        r = Revision(b"myrevid")
 
279
        r.message = u"MyCommitMessage"
 
280
        r.parent_ids = []
 
281
        r.properties = {u"fool": "bar"}
 
282
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
283
        r.timestamp = 453543543
 
284
        r.timezone = 0
 
285
        self.assertRoundtripRevision(r)
 
286
 
 
287
 
 
288
class RoundtripRevisionsFromGit(tests.TestCase):
 
289
 
 
290
    def setUp(self):
 
291
        super(RoundtripRevisionsFromGit, self).setUp()
 
292
        self.mapping = BzrGitMappingv1()
 
293
 
 
294
    def assertRoundtripTree(self, tree):
 
295
        raise NotImplementedError(self.assertRoundtripTree)
 
296
 
 
297
    def assertRoundtripBlob(self, blob):
 
298
        raise NotImplementedError(self.assertRoundtripBlob)
 
299
 
 
300
    def assertRoundtripCommit(self, commit1):
 
301
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
 
302
            commit1, self.mapping.revision_id_foreign_to_bzr)
 
303
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
 
304
            True, None)
 
305
        self.assertEqual(commit1.committer, commit2.committer)
 
306
        self.assertEqual(commit1.commit_time, commit2.commit_time)
 
307
        self.assertEqual(commit1.commit_timezone, commit2.commit_timezone)
 
308
        self.assertEqual(commit1.author, commit2.author)
 
309
        self.assertEqual(commit1.author_time, commit2.author_time)
 
310
        self.assertEqual(commit1.author_timezone, commit2.author_timezone)
 
311
        self.assertEqual(commit1.message, commit2.message)
 
312
        self.assertEqual(commit1.encoding, commit2.encoding)
 
313
 
 
314
    def test_commit(self):
 
315
        c = Commit()
 
316
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
317
        c.message = b"Some message"
 
318
        c.committer = b"Committer <Committer>"
 
319
        c.commit_time = 4
 
320
        c.commit_timezone = -60 * 3
 
321
        c.author_time = 5
 
322
        c.author_timezone = 60 * 2
 
323
        c.author = b"Author <author>"
 
324
        self.assertRoundtripCommit(c)
 
325
 
 
326
    def test_commit_double_negative_timezone(self):
 
327
        c = Commit()
 
328
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
329
        c.message = b"Some message"
 
330
        c.committer = b"Committer <Committer>"
 
331
        c.commit_time = 4
 
332
        (c.commit_timezone, c._commit_timezone_neg_utc) = parse_timezone(b"--700")
 
333
        c.author_time = 5
 
334
        c.author_timezone = 60 * 2
 
335
        c.author = b"Author <author>"
 
336
        self.assertRoundtripCommit(c)
 
337
 
 
338
    def test_commit_zero_utc_timezone(self):
 
339
        c = Commit()
 
340
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
341
        c.message = b"Some message"
 
342
        c.committer = b"Committer <Committer>"
 
343
        c.commit_time = 4
 
344
        c.commit_timezone = 0
 
345
        c._commit_timezone_neg_utc = True
 
346
        c.author_time = 5
 
347
        c.author_timezone = 60 * 2
 
348
        c.author = b"Author <author>"
 
349
        self.assertRoundtripCommit(c)
 
350
 
 
351
    def test_commit_encoding(self):
 
352
        c = Commit()
 
353
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
354
        c.message = b"Some message"
 
355
        c.committer = b"Committer <Committer>"
 
356
        c.encoding = b'iso8859-1'
 
357
        c.commit_time = 4
 
358
        c.commit_timezone = -60 * 3
 
359
        c.author_time = 5
 
360
        c.author_timezone = 60 * 2
 
361
        c.author = b"Author <author>"
 
362
        self.assertRoundtripCommit(c)
 
363
 
 
364
    def test_commit_extra(self):
 
365
        c = Commit()
 
366
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
367
        c.message = b"Some message"
 
368
        c.committer = b"Committer <Committer>"
 
369
        c.commit_time = 4
 
370
        c.commit_timezone = -60 * 3
 
371
        c.author_time = 5
 
372
        c.author_timezone = 60 * 2
 
373
        c.author = b"Author <author>"
 
374
        c._extra = [(b"HG:rename-source", b"hg")]
 
375
        self.assertRoundtripCommit(c)
 
376
 
 
377
    def test_commit_mergetag(self):
 
378
        c = Commit()
 
379
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
380
        c.message = b"Some message"
 
381
        c.committer = b"Committer <Committer>"
 
382
        c.commit_time = 4
 
383
        c.commit_timezone = -60 * 3
 
384
        c.author_time = 5
 
385
        c.author_timezone = 60 * 2
 
386
        c.author = b"Author <author>"
 
387
        tag = make_object(Tag,
 
388
                tagger=b'Jelmer Vernooij <jelmer@samba.org>',
 
389
                name=b'0.1', message=None,
 
390
                object=(Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
 
391
                tag_time=423423423, tag_timezone=0)
 
392
        c.mergetag = [tag]
 
393
        self.assertRoundtripCommit(c)
 
394
 
 
395
 
 
396
class FixPersonIdentifierTests(tests.TestCase):
 
397
 
 
398
    def test_valid(self):
 
399
        self.assertEqual(b"foo <bar@blah.nl>",
 
400
                         fix_person_identifier(b"foo <bar@blah.nl>"))
 
401
        self.assertEqual(b"bar@blah.nl <bar@blah.nl>",
 
402
                         fix_person_identifier(b"bar@blah.nl"))
 
403
 
 
404
    def test_fix(self):
 
405
        self.assertEqual(b"person <bar@blah.nl>",
 
406
                         fix_person_identifier(b"somebody <person <bar@blah.nl>>"))
 
407
        self.assertEqual(b"person <bar@blah.nl>",
 
408
                         fix_person_identifier(b"person<bar@blah.nl>"))
 
409
        self.assertRaises(ValueError,
 
410
                         fix_person_identifier, b"person >bar@blah.nl<")