Merge lp:~jelmer/brz/encoding-false into lp:brz/3.1

[Jelmer Vernooij]

Cope with 'encoding: false' in Git commits.

Cope with 'encoding: false' in Git commits.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Project setup failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/767/

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

Project setup failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/772/

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2020-08-13 18:22:05 +0000
+++ breezy/git/mapping.py	2021-01-21 17:44:29 +0000
@@ -418,9 +418,11 @@
                 rev.properties[u'author'] = commit.author.decode(encoding)
             rev.message, rev.git_metadata = self._decode_commit_message(
                 rev, commit.message, encoding)
+
         if commit.encoding is not None:
             rev.properties[u'git-explicit-encoding'] = commit.encoding.decode(
                 'ascii')
+        if commit.encoding is not None and commit.encoding != b'false':
             decode_using_encoding(rev, commit, commit.encoding.decode('ascii'))
         else:
             for encoding in ('utf-8', 'latin1'):

=== modified file 'breezy/git/tests/test_mapping.py'
--- breezy/git/tests/test_mapping.py	2020-06-08 23:03:56 +0000
+++ breezy/git/tests/test_mapping.py	2021-01-21 17:44:29 +0000
@@ -142,6 +142,26 @@
         self.assertEqual("iso8859-1", rev.properties[u"git-explicit-encoding"])
         self.assertTrue(u"git-implicit-encoding" not in rev.properties)
 
+    def test_explicit_encoding_false(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 = u"Authér".encode("utf-8")
+        c.encoding = b"false"
+        mapping = BzrGitMappingv1()
+        rev, roundtrip_revid, verifiers = mapping.import_commit(
+            c, mapping.revision_id_foreign_to_bzr)
+        self.assertEqual(None, roundtrip_revid)
+        self.assertEqual({}, verifiers)
+        self.assertEqual(u"Authér", rev.properties[u'author'])
+        self.assertEqual("false", rev.properties[u"git-explicit-encoding"])
+        self.assertTrue(u"git-implicit-encoding" not in rev.properties)
+
     def test_implicit_encoding_fallback(self):
         c = Commit()
         c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"