Merge lp:~jelmer/brz/local-git-key into lp:brz/3.1

[Jelmer Vernooij]

Support user.signingkey configuration variable in .git/config.

Support user.signingkey configuration variable in .git/config.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

=== modified file 'breezy/git/config.py'
--- breezy/git/config.py	2020-03-21 21:01:54 +0000
+++ breezy/git/config.py	2020-03-21 21:01:54 +0000
@@ -69,6 +69,12 @@
             except KeyError:
                 return email.decode()
             return '%s <%s>' % (name.decode(), email.decode())
+        if name == 'gpg_signing_key':
+            try:
+                key = self._config.get((b'user', ), b'signingkey')
+            except KeyError:
+                return None
+            return key.decode()
         return None
 
 

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2020-03-21 21:01:54 +0000
+++ breezy/git/tests/test_blackbox.py	2020-03-21 21:01:54 +0000
@@ -445,6 +445,18 @@
         self.assertEqual(out, "[e-mail]\n")
         self.assertEqual(err, "")
 
+    def test_local_signing_key(self):
+        r = GitRepo.init("gitr", mkdir=True)
+        self.build_tree_contents([('gitr/.git/config', """\
+[user]
+  email = [e-mail]
+  name = Test User
+  signingkey = D729A457
+""")])
+        out, err = self.run_bzr(["config", "-d", "gitr", "gpg_signing_key"])
+        self.assertEqual(out, "D729A457\n")
+        self.assertEqual(err, "")
+
 
 class ShallowTests(ExternalBase):
 

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-03-21 21:01:54 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-03-21 21:01:54 +0000
@@ -115,7 +115,7 @@
    (Jelmer Vernooij)
 
  * ``.git/config`` is now consulted to determine the users' identity
-   for commits. (Jelmer Vernooij)
+   for commits, and the gpg_signing_key. (Jelmer Vernooij)
 
 Bug Fixes
 *********