!squash more

Author: tony

src/libvcs/pytest_plugin.py

@@ -69,6 +69,20 @@ def vcs_user(vcs_name: str, vcs_email: str) -> str:
     return f"{vcs_name} <{vcs_email}>"
 
 
+@pytest.fixture(scope="session")
+def git_commit_envvars(vcs_name: str, vcs_email: str) -> "_ENV":
+    """Return environment variables for `git commit`.
+
+    For some reason, `GIT_CONFIG` via {func}`set_gitconfig` doesn't work for `git
+    commit`."""
+    return {
+        "GIT_AUTHOR_NAME": vcs_name,
+        "GIT_AUTHOR_EMAIL": vcs_email,
+        "GIT_COMMITTER_NAME": vcs_name,
+        "GIT_COMMITTER_EMAIL": vcs_email,
+    }
+
+
 class RandomStrSequence:
     """Create a random string sequence."""
 
@@ -290,6 +304,7 @@ def _create_git_remote_repo(
     remote_repo_path: pathlib.Path,
     remote_repo_post_init: Optional[CreateRepoPostInitFn] = None,
     init_cmd_args: InitCmdArgs = DEFAULT_GIT_REMOTE_REPO_CMD_ARGS,
+    env: "_ENV | None" = None,
 ) -> pathlib.Path:
     if init_cmd_args is None:
         init_cmd_args = []
@@ -299,7 +314,7 @@ def _create_git_remote_repo(
     )
 
     if remote_repo_post_init is not None and callable(remote_repo_post_init):
-        remote_repo_post_init(remote_repo_path=remote_repo_path)
+        remote_repo_post_init(remote_repo_path=remote_repo_path, env=env)
 
     return remote_repo_path
 
@@ -444,20 +459,14 @@ def git_remote_repo_single_commit_post_init(
 def git_remote_repo(
     create_git_remote_repo: CreateRepoPytestFixtureFn,
     gitconfig: pathlib.Path,
-    vcs_email: str,
-    vcs_name: str,
+    git_commit_envvars: "_ENV",
 ) -> pathlib.Path:
     """Copy the session-scoped Git repository to a temporary directory."""
     # TODO: Cache the effect of of this in a session-based repo
     repo_path = create_git_remote_repo()
     git_remote_repo_single_commit_post_init(
         remote_repo_path=repo_path,
-        env={
-            "GIT_AUTHOR_NAME": vcs_name,
-            "GIT_AUTHOR_EMAIL": vcs_email,
-            "GIT_COMMITTER_NAME": vcs_name,
-            "GIT_COMMITTER_EMAIL": vcs_email,
-        },
+        env=git_commit_envvars,
     )
     return repo_path
 
@@ -772,6 +781,8 @@ def add_doctest_fixtures(
     doctest_namespace: dict[str, Any],
     tmp_path: pathlib.Path,
     set_home: pathlib.Path,
+    git_commit_envvars: "_ENV",
+    hgconfig: pathlib.Path,
     create_git_remote_repo: CreateRepoPytestFixtureFn,
     create_svn_remote_repo: CreateRepoPytestFixtureFn,
     create_hg_remote_repo: CreateRepoPytestFixtureFn,
@@ -786,7 +797,9 @@ def add_doctest_fixtures(
     if shutil.which("git"):
         doctest_namespace["create_git_remote_repo"] = functools.partial(
             create_git_remote_repo,
-            remote_repo_post_init=git_remote_repo_single_commit_post_init,
+            remote_repo_post_init=functools.partial(
+                git_remote_repo_single_commit_post_init, env=git_commit_envvars
+            ),
             init_cmd_args=None,
         )
         doctest_namespace["create_git_remote_repo_bare"] = create_git_remote_repo
@@ -801,5 +814,8 @@ def add_doctest_fixtures(
         doctest_namespace["create_hg_remote_repo_bare"] = create_hg_remote_repo
         doctest_namespace["create_hg_remote_repo"] = functools.partial(
             create_hg_remote_repo,
-            remote_repo_post_init=hg_remote_repo_single_commit_post_init,
+            remote_repo_post_init=functools.partial(
+                hg_remote_repo_single_commit_post_init,
+                env={"HGRCPATH": str(hgconfig)},
+            ),
         )