Remove all uses of functions that use withenv (#46)

Co-authored-by: Mosè Giordano <[email protected]>
Co-authored-by: Eric Hanson <[email protected]>

Co-authored-by: Mosè Giordano <[email protected]>
Co-authored-by: Eric Hanson <[email protected]>

Author: 3 people

Project.toml

@@ -1,21 +1,21 @@
 name = "GitCommand"
 uuid = "49b5b516-ca3f-4003-a081-42bdcf55082d"
 authors = ["Dilum Aluthge", "Brown Center for Biomedical Informatics"]
-version = "2.2.0"
+version = "2.2.1"
 
 [deps]
-JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 Git_jll = "f8c6e375-362e-5223-8a59-34ff63f689eb"
 ReplMaker = "b873ce64-0db9-51f5-a568-4457d8e49576"
 
 [compat]
-JLLWrappers = "1.1"
 Git_jll = "2.31"
+JLLWrappers = "1.1"
 ReplMaker = "0.2.3"
 julia = "1.6"
 
 [extras]
+JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["JLLWrappers", "Test"]

src/GitCommand.jl

@@ -1,6 +1,5 @@
 module GitCommand
 
-import JLLWrappers
 import Git_jll
 import ReplMaker
 
@@ -12,9 +11,7 @@ const GIT_REPL_MODE_NAME = "GitCommand.jl Git REPL mode"
 const GIT_REPL_MODE_PROMPT_TEXT = "git> "
 const GIT_REPL_MODE_START_KEY = ','
 
-include("env.jl")
 include("git.jl")
 include("repl.jl")
-include("utils.jl")
 
 end # end module GitCommand

src/env.jl

@@ -1,32 +1,41 @@
 function _git_cmd(str::AbstractString;
                   adjust_PATH::Bool = true,
                   adjust_LIBPATH::Bool = true)
-    git_path, env_mapping = _env_mapping(; adjust_PATH, adjust_LIBPATH)
-    return addenv(`$(git_path) $(split(str))`, env_mapping)
+    cmd = git(; adjust_PATH, adjust_LIBPATH)
+    return `$(cmd) $(split(str))`
 end
 
 macro git_cmd(ex)
     return _git_cmd(ex)
 end
 
-function _gitrepl_parser(repl_input::AbstractString)
-    return quote
-        GitCommand.git() do git
-            repl_input = $(Expr(:quote, repl_input))
-            run(`$(git) $(split(repl_input))`)
-            return nothing
-        end
-    end
-end
+function git(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
+    @static if Sys.iswindows()
+        return Git_jll.git(; adjust_PATH, adjust_LIBPATH)::Cmd
+    else
+        root = Git_jll.artifact_dir
 
-function git(;
-             adjust_PATH::Bool = true,
-             adjust_LIBPATH::Bool = true)
-    git_path, env_mapping = _env_mapping(; adjust_PATH, adjust_LIBPATH)
-    return addenv(`$(git_path)`, env_mapping...)
+        libexec = joinpath(root, "libexec")
+        libexec_git_core = joinpath(libexec, "git-core")
+
+        share = joinpath(root, "share")
+        share_git_core = joinpath(share, "git-core")
+        share_git_core_templates = joinpath(share_git_core, "templates")
+
+        ssl_cert = joinpath(dirname(Sys.BINDIR), "share", "julia", "cert.pem")
+
+        env_mapping = Dict{String,String}()
+        env_mapping["GIT_EXEC_PATH"]    = libexec_git_core
+        env_mapping["GIT_SSL_CAINFO"]   = ssl_cert
+        env_mapping["GIT_TEMPLATE_DIR"] = share_git_core_templates
+
+        original_cmd = Git_jll.git(; adjust_PATH, adjust_LIBPATH)::Cmd
+        return addenv(original_cmd, env_mapping...)::Cmd
+    end
 end
 
 # This function should be deprecated, it's kept only for backward-compatibility
+# We will remove it soon in a breaking release
 function git(f::Function;
              adjust_PATH::Bool = true,
              adjust_LIBPATH::Bool = true)

src/git.jl

@@ -1,5 +1,15 @@
 import ReplMaker
 
+function _gitrepl_parser(repl_input::AbstractString)
+    return quote
+        GitCommand.git() do git
+            repl_input = $(Expr(:quote, repl_input))
+            run(`$(git) $(split(repl_input))`)
+            return nothing
+        end
+    end
+end
+
 function gitrepl(; mode_name = GIT_REPL_MODE_NAME,
                    prompt_text = GIT_REPL_MODE_PROMPT_TEXT,
                    start_key = GIT_REPL_MODE_START_KEY,

src/repl.jl

@@ -1,22 +1,17 @@
 using GitCommand
 using Test
-using JLLWrappers
 
-get_env(env) = get(ENV, env, nothing)
-const orig_libpath = get_env(JLLWrappers.LIBPATH_env)
-const orig_execpath = get_env("GIT_EXEC_PATH")
-const orig_cainfo = get_env("GIT_SSL_CAINFO")
-const orig_templatedir = get_env("GIT_TEMPLATE_DIR")
+import JLLWrappers
+
+get_env(name) = get(ENV, name, nothing)
+const orig_libpath     = deepcopy(get_env(JLLWrappers.LIBPATH_env))
+const orig_execpath    = deepcopy(get_env("GIT_EXEC_PATH"))
+const orig_cainfo      = deepcopy(get_env("GIT_SSL_CAINFO"))
+const orig_templatedir = deepcopy(get_env("GIT_TEMPLATE_DIR"))
 
 include("test-utils.jl")
 
 @testset "GitCommand.jl" begin
-    if Sys.iswindows()
-        @test GitCommand._separator() == ';'
-    else
-        @test GitCommand._separator() == ':'
-    end
-
     with_temp_dir() do tmp_dir
         @test !isdir("GitCommand.jl")
         @test !isfile(joinpath("GitCommand.jl", "Project.toml"))