def test_commit_mergetag(self): c = Commit() c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba" c.message = b"Some message" c.committer = b"Committer <Committer>" c.commit_time = 4 c.commit_timezone = -60 * 3 c.author_time = 5 c.author_timezone = 60 * 2 c.author = b"Author <author>" tag = make_object(Tag, tagger=b'Jelmer Vernooij <*****@*****.**>', name=b'0.1', message=None, object=( Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'), tag_time=423423423, tag_timezone=0) c.mergetag = [tag] self.assertRoundtripCommit(c)
def test_mergetag(self): c = Commit() c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba" c.message = b"Some message" c.committer = b"Committer" c.commit_time = 4 c.author_time = 5 c.commit_timezone = 60 * 5 c.author_timezone = 60 * 3 c.author = b"Author" tag = make_object(Tag, tagger=b'Jelmer Vernooij <*****@*****.**>', name=b'0.1', message=None, object=( Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'), tag_time=423423423, tag_timezone=0) c.mergetag = [tag] mapping = BzrGitMappingv1() rev, roundtrip_revid, verifiers = mapping.import_commit( c, mapping.revision_id_foreign_to_bzr) self.assertEqual( rev.properties[u'git-mergetag-0'], tag.as_raw_string())