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

[Jelmer Vernooij]

Support reading user identity from .git/config in git repositories.

Support reading user identity from .git/config in git repositories.

[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/29/

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

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

=== modified file 'breezy/git/config.py'
--- breezy/git/config.py	2018-11-11 14:23:06 +0000
+++ breezy/git/config.py	2020-03-21 22:11:54 +0000
@@ -46,19 +46,56 @@
         return self._get_best_value('_get_user_id')
 
 
+class GitConfigSectionDefault(config.Section):
+    """The "default" config section in git config file"""
+
+    def __init__(self, config):
+        self._config = config
+
+    def get(self, name, default=None, expand=True):
+        if name == 'email':
+            try:
+                email = self._config.get((b'user', ), b'email')
+            except KeyError:
+                return None
+            try:
+                name = self._config.get((b'user', ), b'name')
+            except KeyError:
+                return email.decode()
+            return '%s <%s>' % (name.decode(), email.decode())
+        return None
+
+
+class GitConfigStore(config.Store):
+    """Store that uses gitconfig."""
+
+    def __init__(self, config):
+        self._config = config
+
+    def get_sections(self):
+        return [
+            (self, GitConfigSectionDefault(self._config)),
+            ]
+
+
 class GitBranchStack(config._CompatibleStack):
     """GitBranch stack."""
 
     def __init__(self, branch):
+        section_getters = [self._get_overrides]
         lstore = config.LocationStore()
         loc_matcher = config.LocationMatcher(lstore, branch.base)
+        section_getters.append(loc_matcher.get_sections)
         # FIXME: This should also be looking in .git/config for
         # local git branches.
+        git = getattr(branch.repository, '_git', None)
+        if git:
+            cstore = GitConfigStore(git.get_config())
+            section_getters.append(cstore.get_sections)
         gstore = config.GlobalStore()
+        section_getters.append(gstore.get_sections)
         super(GitBranchStack, self).__init__(
-            [self._get_overrides,
-             loc_matcher.get_sections,
-             gstore.get_sections],
+            section_getters,
             # All modifications go to the corresponding section in
             # locations.conf
             lstore, branch.base)
 
=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2020-01-30 19:30:52 +0000
+++ breezy/git/tests/test_blackbox.py	2020-03-21 22:11:54 +0000
@@ -426,6 +426,25 @@
         self.assertEqual(out, '')
         self.assertTrue(err.endswith, '3 objects\n')
 
+    def test_local_whoami(self):
+        r = GitRepo.init("gitr", mkdir=True)
+        self.build_tree_contents([('gitr/.git/config', """\
+[user]
+  email = [e-mail]
+  name = Test User
+""")])
+        out, err = self.run_bzr(["whoami", "-d", "gitr"])
+        self.assertEqual(out, "Test User <[e-mail]>\n")
+        self.assertEqual(err, "")
+
+        self.build_tree_contents([('gitr/.git/config', """\
+[user]
+  email = [e-mail]
+""")])
+        out, err = self.run_bzr(["whoami", "-d", "gitr"])
+        self.assertEqual(out, "[e-mail]\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-02-21 22:54:31 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-03-21 22:11:54 +0000
@@ -114,6 +114,9 @@
  * Python 3 is now used by default to run scripts, etc. from the makefile.
    (Jelmer Vernooij)
 
+ * ``.git/config`` is now consulted to determine the users' identity
+   for commits. (Jelmer Vernooij)
+
 Bug Fixes
 *********