Merge lp:~simon-marchi/bzr-git/devel into lp:bzr-git

[Qwerty Chouskie]

Ignore gpgsig tags (temporary fix for https://bugs.launchpad.net/ubuntu/+source/bzr-git/+bug/1084403?comments=all)

See https://bugs.launchpad.net/ubuntu/+source/bzr-git/+bug/1084403/comments/20
I do not claim credit for this code, just found it.

[Gianfranco Costamagna (costamagnagianfranco)]

+1 for merging this one, I can't test but I really would like to see the bug fixed.

Unmerged revisions

1629. By Simon Marchi on 2013-10-22

Ignore gpgsig fields when importing git commits

tests/test_mapping.py is modified accordingly.

=== modified file 'mapping.py'
--- mapping.py	2013-09-02 00:54:58 +0000
+++ mapping.py	2016-06-13 02:50:14 +0000
@@ -333,7 +333,11 @@
         if commit is None:
             raise AssertionError("Commit object can't be None")
         if commit.extra:
-            raise UnknownCommitExtra(commit, [item[0] for item in commit.extra])
+            for (extra_key, extra_value) in commit.extra:
+                if extra_key == "gpgsig":
+                    pass
+                else:
+                    raise UnknownCommitExtra(commit, [item[0] for item in commit.extra])
         rev = ForeignRevision(commit.id, self,
                 self.revision_id_foreign_to_bzr(commit.id))
         rev.git_metadata = None

=== modified file 'tests/test_mapping.py'
--- tests/test_mapping.py	2012-03-26 20:48:24 +0000
+++ tests/test_mapping.py	2016-06-13 02:50:14 +0000
@@ -186,8 +186,10 @@
         c.commit_timezone = 60 * 5
         c.author_timezone = 60 * 3
         c.author = "Author"
+        c.extra.append(("gpgsig", "cryptostuff"))
+        mapping = BzrGitMappingv1()
+        mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
         c.extra.append(("iamextra", "foo"))
-        mapping = BzrGitMappingv1()
         self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
             mapping.revision_id_foreign_to_bzr)