Merge lp:~jelmer/brz/git-multiple-authors into lp:brz/3.2

[Jelmer Vernooij]

Fix handling of invalid formatted authors field with multiple authors.

Fix handling of invalid formatted authors field with multiple authors.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/97/

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2021-08-18 22:38:08 +0000
+++ breezy/git/mapping.py	2022-01-12 23:42:28 +0000
@@ -310,8 +310,11 @@
             pass
         commit.committer = fix_person_identifier(rev.committer.encode(
             encoding))
+        first_author = rev.get_apparent_authors()[0]
+        if ',' in first_author and first_author.count('>') > 1:
+            first_author = first_author.split(',')[0]
         commit.author = fix_person_identifier(
-            rev.get_apparent_authors()[0].encode(encoding))
+            first_author.encode(encoding))
         # TODO(jelmer): Don't use this hack.
         long = getattr(__builtins__, 'long', int)
         commit.commit_time = long(rev.timestamp)

=== modified file 'breezy/git/tests/test_mapping.py'
--- breezy/git/tests/test_mapping.py	2021-03-22 21:07:08 +0000
+++ breezy/git/tests/test_mapping.py	2022-01-12 23:42:28 +0000
@@ -300,6 +300,7 @@
             self.assertEqual(list(orig_rev.parent_ids), list(rev.parent_ids))
         else:
             self.assertEqual({}, verifiers)
+        return commit
 
     def test_simple_commit(self):
         r = Revision(self.mapping.revision_id_foreign_to_bzr(
@@ -342,6 +343,34 @@
         r.timezone = 0
         self.assertRoundtripRevision(r)
 
+    def test_multiple_authors(self):
+        r = Revision(b"myrevid")
+        r.message = u"MyCommitMessage"
+        r.parent_ids = []
+        r.properties = {
+            u"authors":
+                "Jelmer Vernooij <[e-mail]>\n"
+                "Alex <[e-mail]>"}
+        r.committer = "Jelmer Vernooij <[e-mail]>"
+        r.timestamp = 453543543
+        r.timezone = 0
+        c = self.assertRoundtripRevision(r)
+        self.assertEqual(c.author, b'Jelmer Vernooij <[e-mail]>')
+
+    def test_multiple_authors_comma(self):
+        r = Revision(b"myrevid")
+        r.message = u"MyCommitMessage"
+        r.parent_ids = []
+        r.properties = {
+            u"authors":
+                "Jelmer Vernooij <[e-mail]>, "
+                "Alex <[e-mail]>"}
+        r.committer = "Jelmer Vernooij <[e-mail]>"
+        r.timestamp = 453543543
+        r.timezone = 0
+        c = self.assertRoundtripRevision(r)
+        self.assertEqual(c.author, b'Jelmer Vernooij <[e-mail]>')
+
 
 class RoundtripRevisionsFromGit(tests.TestCase):