[Wizard] Use BinaryBuilderBase.cached_git_clone to clone git repo (#1203)

Author: giordano

Manifest.toml

@@ -30,12 +30,12 @@ version = "0.2.0"
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[deps.BinaryBuilderBase]]
-deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "LibGit2_jll", "Libdl", "Logging", "OrderedCollections", "OutputCollectors", "Pkg", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"]
-git-tree-sha1 = "7076ed525d498038d44118ac3fa95b765d26a9d6"
+deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "LibGit2_jll", "Libdl", "Logging", "OrderedCollections", "OutputCollectors", "Pkg", "ProgressMeter", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"]
+git-tree-sha1 = "515d28b82ab1a721b31ddb6a11f8fa5662fc9e91"
 repo-rev = "master"
 repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
-version = "1.8.0"
+version = "1.10.1"
 
 [[deps.CodecZlib]]
 deps = ["TranscodingStreams", "Zlib_jll"]
@@ -45,9 +45,9 @@ version = "0.7.0"
 
 [[deps.Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "96b0bc6c52df76506efc8a441c6cf1adcb1babc4"
+git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.42.0"
+version = "3.43.0"
 
 [[deps.CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -260,9 +260,9 @@ version = "0.1.1"
 
 [[deps.Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "85b5da0fa43588c75bb1ff986493443f821c70b7"
+git-tree-sha1 = "621f4f3b4977325b9128d5fae7a8b4829a0c2222"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.3"
+version = "2.2.4"
 
 [[deps.Pidfile]]
 deps = ["FileWatching", "Test"]
@@ -292,9 +292,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [[deps.ProgressMeter]]
 deps = ["Distributed", "Printf"]
-git-tree-sha1 = "afadeba63d90ff223a6a48d2009434ecee2ec9e8"
+git-tree-sha1 = "d7a7aef8f8f2d537104f170139553b14dfe39fe9"
 uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
-version = "1.7.1"
+version = "1.7.2"
 
 [[deps.REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]

Project.toml

@@ -20,7 +20,6 @@ ObjectFile = "d8793406-e978-5875-9003-1fc021f44a92"
 OutputCollectors = "6c11c7d4-943b-4e2b-80de-f2cfc2930a8c"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PkgLicenses = "fc669557-7ec9-5e45-bca9-462afbc28879"
-ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Registrator = "4418983a-e44d-11e8-3aec-9789530b3b3e"
@@ -34,7 +33,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
 
 [compat]
 ArgParse = "1.1"
-BinaryBuilderBase = "1.4"
+BinaryBuilderBase = "1.10"
 GitHub = "5.1"
 HTTP = "0.8, 0.9"
 JLD2 = "0.1.6, 0.2, 0.3, 0.4"
@@ -44,7 +43,6 @@ LoggingExtras = "0.4"
 ObjectFile = "0.3.6"
 OutputCollectors = "0.1"
 PkgLicenses = "0.2"
-ProgressMeter = "1"
 Registrator = "1.1"
 RegistryTools = "1.3.4"
 Scratch = "1.0"

src/wizard/obtain_source.jl

@@ -1,7 +1,5 @@
-using BinaryBuilderBase: available_gcc_builds, available_llvm_builds, enable_apple_file, macos_sdk_already_installed, accept_apple_sdk
-using ProgressMeter
+using BinaryBuilderBase: available_gcc_builds, available_llvm_builds, enable_apple_file, macos_sdk_already_installed, accept_apple_sdk, cached_git_clone
 import Downloads
-const update! = ProgressMeter.update!
 
 """
 Canonicalize a GitHub repository URL
@@ -36,53 +34,6 @@ function canonicalize_file_url(url)
     url
 end
 
-struct GitTransferProgress
-    total_objects::Cuint
-    indexed_objects::Cuint
-    received_objects::Cuint
-    local_objects::Cuint
-    total_deltas::Cuint
-    indexed_deltas::Cuint
-    received_bytes::Csize_t
-end
-
-function transfer_progress(progress::Ptr{GitTransferProgress}, p::Any)
-    progress = unsafe_load(progress)
-    p.n = progress.total_objects
-    if progress.total_deltas != 0
-        p.desc = "Resolving Deltas: "
-        p.n = progress.total_deltas
-        update!(p, Int(max(1, progress.indexed_deltas)))
-    else
-        update!(p, Int(max(1, progress.received_objects)))
-    end
-    return Cint(0)
-end
-
-"""
-    clone(url::String, source_path::String)
-
-Clone a git repository hosted at `url` into `source_path`, with a progress bar
-displayed to stdout.
-"""
-function clone(url::String, source_path::String)
-    # Clone with a progress bar
-    p = Progress(0, 1, "Cloning: ")
-    GC.@preserve p begin
-        callbacks = LibGit2.RemoteCallbacks(
-            transfer_progress=@cfunction(
-                transfer_progress,
-                Cint,
-                (Ptr{GitTransferProgress}, Any)
-            ),
-            payload = p
-        )
-        fetch_opts = LibGit2.FetchOptions(callbacks=callbacks)
-        clone_opts = LibGit2.CloneOptions(fetch_opts=fetch_opts, bare = Cint(true))
-        return LibGit2.clone(url, source_path, clone_opts)
-    end
-end
-
 """
     download_source(state::WizardState)
 
@@ -130,13 +81,12 @@ function download_source(state::WizardState)
         println(state.outs)
     end
 
-    # Record the source path and the source hash
-    source_path = joinpath(state.workspace, basename(url))
     local source_hash
 
     if endswith(url, ".git") || startswith(url, "git://")
+        source_path = cached_git_clone(url; progressbar=true, verbose=true)
         # Clone the URL, record the current gitsha for the given branch
-        repo = clone(url, source_path)
+        repo = GitRepo(source_path)
 
         msg = "You have selected a git repository. Please enter a branch, commit or tag to use.\n" *
         "Please note that for reproducibility, the exact commit will be recorded, \n" *