Merge lp:~jelmer/brz-git/mergetag into lp:brz-git

[Jelmer Vernooij]

Add support for the mergetag property.

Add support for the mergetag property.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'mapping.py'
--- mapping.py	2018-03-30 22:49:03 +0000
+++ mapping.py	2018-04-02 18:04:42 +0000
@@ -263,7 +263,7 @@
         :param verifiers: Verifiers info
         :return dulwich.objects.Commit represent the revision:
         """
-        from dulwich.objects import Commit
+        from dulwich.objects import Commit, Tag
         commit = Commit()
         commit.tree = tree_sha
         if not lossy:
@@ -335,6 +335,12 @@
                 raise NoPushSupport()
         if type(commit.message) is not str:
             raise TypeError(commit.message)
+        i = 0
+        propname = 'git-mergetag-0'
+        while propname in rev.properties:
+            commit.mergetag.append(Tag.from_string(rev.properties[propname].encode(encoding)))
+            i += 1
+            propname = 'git-mergetag-%d' % i
         if 'git-extra' in rev.properties:
             commit.extra.extend([l.split(' ', 1) for l in rev.properties['git-extra'].splitlines()])
         return commit
@@ -387,6 +393,9 @@
             rev.properties['commit-timezone-neg-utc'] = ""
         if commit.gpgsig:
             rev.properties['git-gpg-signature'] = commit.gpgsig.decode('ascii')
+        if commit.mergetag:
+            for i, tag in enumerate(commit.mergetag):
+                rev.properties['git-mergetag-%d' % i] = tag.as_raw_string()
         rev.timestamp = commit.commit_time
         rev.timezone = commit.commit_timezone
         rev.parent_ids = None

=== modified file 'tests/test_mapping.py'
--- tests/test_mapping.py	2018-03-30 22:49:03 +0000
+++ tests/test_mapping.py	2018-04-02 18:04:42 +0000
@@ -30,9 +30,13 @@
 from dulwich.objects import (
     Blob,
     Commit,
+    Tag,
     Tree,
     parse_timezone,
     )
+from dulwich.tests.utils import (
+    make_object,
+    )
 
 from .. import tests
 from ..errors import UnknownCommitExtra
@@ -196,6 +200,27 @@
         self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
             mapping.revision_id_foreign_to_bzr)
 
+    def test_mergetag(self):
+        c = Commit()
+        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
+        c.message = "Some message"
+        c.committer = "Committer"
+        c.commit_time = 4
+        c.author_time = 5
+        c.commit_timezone = 60 * 5
+        c.author_timezone = 60 * 3
+        c.author = "Author"
+        tag = make_object(Tag,
+                tagger=b'Jelmer Vernooij <[e-mail]>',
+                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['git-mergetag-0'], tag.as_raw_string())
+
 
 class RoundtripRevisionsFromBazaar(tests.TestCase):
 
@@ -354,6 +379,24 @@
         c._extra = [("HG:rename-source", "hg")]
         self.assertRoundtripCommit(c)
 
+    def test_commit_mergetag(self):
+        c = Commit()
+        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
+        c.message = "Some message"
+        c.committer = "Committer <Committer>"
+        c.commit_time = 4
+        c.commit_timezone = -60 * 3
+        c.author_time = 5
+        c.author_timezone = 60 * 2
+        c.author = "Author <author>"
+        tag = make_object(Tag,
+                tagger=b'Jelmer Vernooij <[e-mail]>',
+                name=b'0.1', message=None,
+                object=(Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
+                tag_time=423423423, tag_timezone=0)
+        c.mergetag = [tag]
+        self.assertRoundtripCommit(c)
+
 
 class DirectoryToTreeTests(tests.TestCase):