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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_mapping.py
177
177
        self.assertEqual(None, roundtrip_revid)
178
178
        self.assertEqual({}, verifiers)
179
179
        self.assertEqual(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)
 
180
        self.assertTrue(u"git-explicit-encoding" not in rev.properties)
 
181
        self.assertTrue(u"git-implicit-encoding" not in rev.properties)
182
182
 
183
183
    def test_unknown_extra(self):
184
184
        c = Commit()
185
 
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
186
 
        c.message = "Some message"
187
 
        c.committer = "Committer"
 
185
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
186
        c.message = b"Some message"
 
187
        c.committer = b"Committer"
188
188
        c.commit_time = 4
189
189
        c.author_time = 5
190
190
        c.commit_timezone = 60 * 5
191
191
        c.author_timezone = 60 * 3
192
 
        c.author = "Author"
193
 
        c._extra.append(("iamextra", "foo"))
 
192
        c.author = b"Author"
 
193
        c._extra.append((b"iamextra", b"foo"))
194
194
        mapping = BzrGitMappingv1()
195
195
        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
196
196
            mapping.revision_id_foreign_to_bzr)
197
197
 
198
198
    def test_mergetag(self):
199
199
        c = Commit()
200
 
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
201
 
        c.message = "Some message"
202
 
        c.committer = "Committer"
 
200
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
201
        c.message = b"Some message"
 
202
        c.committer = b"Committer"
203
203
        c.commit_time = 4
204
204
        c.author_time = 5
205
205
        c.commit_timezone = 60 * 5
206
206
        c.author_timezone = 60 * 3
207
 
        c.author = "Author"
 
207
        c.author = b"Author"
208
208
        tag = make_object(Tag,
209
209
                tagger=b'Jelmer Vernooij <jelmer@samba.org>',
210
210
                name=b'0.1', message=None,
214
214
        mapping = BzrGitMappingv1()
215
215
        rev, roundtrip_revid, verifiers = mapping.import_commit(
216
216
                c, mapping.revision_id_foreign_to_bzr)
217
 
        self.assertEqual(rev.properties['git-mergetag-0'], tag.as_raw_string())
 
217
        self.assertEqual(rev.properties[u'git-mergetag-0'], tag.as_raw_string())
218
218
 
219
219
 
220
220
class RoundtripRevisionsFromBazaar(tests.TestCase):
245
245
            self.assertEqual({}, verifiers)
246
246
 
247
247
    def test_simple_commit(self):
248
 
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
249
 
        r.message = "MyCommitMessage"
 
248
        r = Revision(self.mapping.revision_id_foreign_to_bzr(b"edf99e6c56495c620f20d5dacff9859ff7119261"))
 
249
        r.message = b"MyCommitMessage"
250
250
        r.parent_ids = []
251
251
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
252
252
        r.timestamp = 453543543
255
255
        self.assertRoundtripRevision(r)
256
256
 
257
257
    def test_revision_id(self):
258
 
        r = Revision("myrevid")
259
 
        r.message = "MyCommitMessage"
 
258
        r = Revision(b"myrevid")
 
259
        r.message = b"MyCommitMessage"
260
260
        r.parent_ids = []
261
261
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
262
262
        r.timestamp = 453543543
265
265
        self.assertRoundtripRevision(r)
266
266
 
267
267
    def test_ghost_parent(self):
268
 
        r = Revision("myrevid")
269
 
        r.message = "MyCommitMessage"
270
 
        r.parent_ids = ["iamaghost"]
 
268
        r = Revision(b"myrevid")
 
269
        r.message = u"MyCommitMessage"
 
270
        r.parent_ids = [b"iamaghost"]
271
271
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
272
272
        r.timestamp = 453543543
273
273
        r.timezone = 0
275
275
        self.assertRoundtripRevision(r)
276
276
 
277
277
    def test_custom_property(self):
278
 
        r = Revision("myrevid")
279
 
        r.message = "MyCommitMessage"
 
278
        r = Revision(b"myrevid")
 
279
        r.message = u"MyCommitMessage"
280
280
        r.parent_ids = []
281
 
        r.properties = {"fool": "bar"}
 
281
        r.properties = {u"fool": "bar"}
282
282
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
283
283
        r.timestamp = 453543543
284
284
        r.timezone = 0