--- mapping.py 2013-09-01 17:54:58.000000000 -0700 +++ mappingnew.py 2016-06-14 17:17:02.771803138 -0700 @@ -96,6 +96,8 @@ trace.warning("Escaped %d XML-invalid characters in %s. Will be unable " "to regenerate the SHA map.", num_escaped, commit) +def warn_gpgsig(commit): + trace.warning("GPGSIG tag found, these are unsupported and may cause issues.", commit) def warn_unusual_mode(commit, path, mode): trace.mutter("Unusual file mode %o for %s in %s. Storing as revision " @@ -331,7 +333,11 @@ testament sha1 """ if commit is None: - raise AssertionError("Commit object can't be None") + for (extra_key, extra_value) in commit.extra: + if extra_key == "gpgsig": + raise warn_gpgsig(commit) + else: + raise UnknownCommitExtra(commit, [item[0] for item in commit.extra]) if commit.extra: raise UnknownCommitExtra(commit, [item[0] for item in commit.extra]) rev = ForeignRevision(commit.id, self,