/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: Jelmer Vernooij
  • Date: 2019-10-28 01:38:39 UTC
  • mto: This revision was merged to the branch mainline in revision 7412.
  • Revision ID: jelmer@jelmer.uk-20191028013839-q63zzm4yr0id9b3o
Allow unknown extras in git commits when just inspecting revisions, rather than importing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_mapping.py
34
34
    )
35
35
 
36
36
from .. import tests
37
 
from ..errors import (
38
 
    UnknownCommitExtra,
39
 
    UnknownMercurialCommitExtra,
40
 
    )
41
37
from ..mapping import (
42
38
    BzrGitMappingv1,
43
39
    escape_file_id,
44
40
    fix_person_identifier,
45
41
    unescape_file_id,
 
42
    UnknownCommitExtra,
 
43
    UnknownMercurialCommitExtra,
46
44
    )
47
45
 
48
46
 
111
109
        c.author_timezone = 60 * 3
112
110
        c.author = b"Author"
113
111
        mapping = BzrGitMappingv1()
114
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
115
 
                                                                mapping.revision_id_foreign_to_bzr)
 
112
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
113
            c, mapping.revision_id_foreign_to_bzr)
116
114
        self.assertEqual(None, roundtrip_revid)
117
115
        self.assertEqual({}, verifiers)
118
116
        self.assertEqual(u"Some message", rev.message)
136
134
        c.author = u"Authér".encode("iso8859-1")
137
135
        c.encoding = b"iso8859-1"
138
136
        mapping = BzrGitMappingv1()
139
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
140
 
                                                                mapping.revision_id_foreign_to_bzr)
 
137
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
138
            c, mapping.revision_id_foreign_to_bzr)
141
139
        self.assertEqual(None, roundtrip_revid)
142
140
        self.assertEqual({}, verifiers)
143
141
        self.assertEqual(u"Authér", rev.properties[u'author'])
155
153
        c.author_timezone = 60 * 3
156
154
        c.author = u"Authér".encode("latin1")
157
155
        mapping = BzrGitMappingv1()
158
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
159
 
                                                                mapping.revision_id_foreign_to_bzr)
 
156
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
157
            c, mapping.revision_id_foreign_to_bzr)
160
158
        self.assertEqual(None, roundtrip_revid)
161
159
        self.assertEqual({}, verifiers)
162
160
        self.assertEqual(u"Authér", rev.properties[u'author'])
174
172
        c.author_timezone = 60 * 3
175
173
        c.author = u"Authér".encode("utf-8")
176
174
        mapping = BzrGitMappingv1()
177
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
178
 
                                                                mapping.revision_id_foreign_to_bzr)
 
175
        rev, roundtrip_revid, verifiers = mapping.import_commit(
 
176
            c, mapping.revision_id_foreign_to_bzr)
179
177
        self.assertEqual(None, roundtrip_revid)
180
178
        self.assertEqual({}, verifiers)
181
179
        self.assertEqual(u"Authér", rev.properties[u'author'])
196
194
        mapping = BzrGitMappingv1()
197
195
        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
198
196
                          mapping.revision_id_foreign_to_bzr)
 
197
        mapping.import_commit(c, mapping.revision_id_foreign_to_bzr, strict=False)
199
198
 
200
199
    def test_mergetag(self):
201
200
        c = Commit()
235
234
        self.assertRaises(
236
235
            UnknownMercurialCommitExtra,
237
236
            mapping.import_commit, c, mapping.revision_id_foreign_to_bzr)
 
237
        mapping.import_commit(
 
238
            c, mapping.revision_id_foreign_to_bzr, strict=False)
238
239
        self.assertEqual(
239
240
            mapping.revision_id_foreign_to_bzr(c.id),
240
241
            mapping.get_revision_id(c))
267
268
        commit = self.mapping.export_commit(orig_rev, b"mysha",
268
269
                                            self._lookup_parent, True, b"testamentsha")
269
270
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
270
 
            commit, self.mapping.revision_id_foreign_to_bzr)
 
271
            commit, self.mapping.revision_id_foreign_to_bzr, strict=True)
271
272
        self.assertEqual(rev.revision_id,
272
273
                         self.mapping.revision_id_foreign_to_bzr(commit.id))
273
274
        if self.mapping.roundtripping:
338
339
 
339
340
    def assertRoundtripCommit(self, commit1):
340
341
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
341
 
            commit1, self.mapping.revision_id_foreign_to_bzr)
 
342
            commit1, self.mapping.revision_id_foreign_to_bzr, strict=True)
342
343
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
343
344
                                             True, None)
344
345
        self.assertEqual(commit1.committer, commit2.committer)