Merge pull request #1314 from eric-wieser/patch-1

Do not call get_user_id if it is not needed

Author: Yobmod

git/util.py

@@ -705,7 +705,11 @@ def default_name() -> str:
                 setattr(actor, attr, val)
             except KeyError:
                 if config_reader is not None:
-                    setattr(actor, attr, config_reader.get_value('user', cvar, default()))
+                    try:
+                        val = config_reader.get('user', cvar)
+                    except Exception:
+                        val = default()
+                    setattr(actor, attr, val)
                 # END config-reader handling
                 if not getattr(actor, attr):
                     setattr(actor, attr, default())

test/test_util.py

@@ -22,7 +22,10 @@
     parse_date,
     tzoffset,
     from_timestamp)
-from test.lib import TestBase
+from test.lib import (
+    TestBase,
+    with_rw_repo,
+)
 from git.util import (
     LockFile,
     BlockingLockFile,
@@ -217,16 +220,31 @@ def test_actor(self):
             self.assertIsInstance(Actor.author(cr), Actor)
         # END assure config reader is handled
 
+    @with_rw_repo('HEAD')
     @mock.patch("getpass.getuser")
-    def test_actor_get_uid_laziness_not_called(self, mock_get_uid):
+    def test_actor_get_uid_laziness_not_called(self, rwrepo, mock_get_uid):
+        with rwrepo.config_writer() as cw:
+            cw.set_value("user", "name", "John Config Doe")
+            cw.set_value("user", "email", "[email protected]")
+        
+        cr = rwrepo.config_reader()
+        committer = Actor.committer(cr)
+        author = Actor.author(cr)
+        
+        self.assertEqual(committer.name, 'John Config Doe')
+        self.assertEqual(committer.email, '[email protected]')
+        self.assertEqual(author.name, 'John Config Doe')
+        self.assertEqual(author.email, '[email protected]')
+        self.assertFalse(mock_get_uid.called)
+            
         env = {
             "GIT_AUTHOR_NAME": "John Doe",
             "GIT_AUTHOR_EMAIL": "[email protected]",
             "GIT_COMMITTER_NAME": "Jane Doe",
             "GIT_COMMITTER_EMAIL": "[email protected]",
         }
         os.environ.update(env)
-        for cr in (None, self.rorepo.config_reader()):
+        for cr in (None, rwrepo.config_reader()):
             committer = Actor.committer(cr)
             author = Actor.author(cr)
             self.assertEqual(committer.name, 'Jane Doe')
@@ -238,16 +256,16 @@ def test_actor_get_uid_laziness_not_called(self, mock_get_uid):
     @mock.patch("getpass.getuser")
     def test_actor_get_uid_laziness_called(self, mock_get_uid):
         mock_get_uid.return_value = "user"
-        for cr in (None, self.rorepo.config_reader()):
-            committer = Actor.committer(cr)
-            author = Actor.author(cr)
-            if cr is None:  # otherwise, use value from config_reader
-                self.assertEqual(committer.name, 'user')
-                self.assertTrue(committer.email.startswith('user@'))
-                self.assertEqual(author.name, 'user')
-                self.assertTrue(committer.email.startswith('user@'))
+        committer = Actor.committer(None)
+        author = Actor.author(None)
+        # We can't test with `self.rorepo.config_reader()` here, as the uuid laziness
+        # depends on whether the user running the test has their global user.name config set.
+        self.assertEqual(committer.name, 'user')
+        self.assertTrue(committer.email.startswith('user@'))
+        self.assertEqual(author.name, 'user')
+        self.assertTrue(committer.email.startswith('user@'))
         self.assertTrue(mock_get_uid.called)
-        self.assertEqual(mock_get_uid.call_count, 4)
+        self.assertEqual(mock_get_uid.call_count, 2)
 
     def test_actor_from_string(self):
         self.assertEqual(Actor._from_string("name"), Actor("name", None))