Package system on libgit2 #11196
added
clone & fetch, updated 'Dir' and Cache
- Loading branch information
commit f836a71a6854c70a55cd6f342212cbc81e3fb29e
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,12 +13,14 @@ function __init__() | |
| end | ||
|
|
||
| include("libgit2/const.jl") | ||
| include("libgit2/error.jl") | ||
| include("libgit2/repository.jl") | ||
| include("libgit2/config.jl") | ||
| include("libgit2/clone.jl") | ||
|
|
||
| type GitRef | ||
| ptr::Ptr{Void} | ||
| function GitRef(ptr::Ptr{Void}) | ||
| r = new(ptr) | ||
| finalizer(r, r -> ccall((:git_reference_free, :libgit2), Void, (Ptr{Void},), r.ptr)) | ||
| return r | ||
|
|
@@ -40,10 +42,10 @@ function head(repo::GitRepo) | |
| (Ptr{Ptr{Void}}, Ptr{Void}), head_ptr, repo.ptr) | ||
|
|
||
| (err != 0) && return nothing | ||
| return GitRef(head_ptr[1]) | ||
| end | ||
|
|
||
| function ref_id(ref::GitRef) | ||
| ref == nothing && return "" | ||
|
|
||
| typ = ccall((:git_reference_type, :libgit2), Cint, (Ptr{Void},), ref.ptr) | ||
|
|
@@ -60,7 +62,7 @@ end | |
|
|
||
| head_oid(repo::GitRepo) = head(repo) |> ref_id | ||
|
|
||
| function ref_name(ref::GitRef) | ||
| ref == nothing && return "" | ||
|
|
||
| name_ptr = ccall((:git_reference_shorthand, :libgit2), Ptr{UInt8}, (Ptr{Void},), ref.ptr) | ||
|
|
@@ -153,14 +155,14 @@ end | |
| function set_remote_url(repo::GitRepo, url::AbstractString; remote::AbstractString="origin") | ||
| cfg = GitConfig(repo) | ||
|
|
||
| err = set!(AbstractString, cfg, "remote.$remote.url", url) | ||
| err !=0 && return | ||
|
|
||
| m = match(GITHUB_REGEX,url) | ||
| m == nothing && return | ||
| push = "[email protected]:$(m.captures[1]).git" | ||
| if push != url | ||
| err = set!(AbstractString, cfg, "remote.$remote.pushurl", push) | ||
| end | ||
| end | ||
|
|
||
|
|
@@ -170,6 +172,38 @@ function set_remote_url(path::AbstractString, url::AbstractString; remote::Abstr | |
| LibGit2.free!(prepo) | ||
| end | ||
|
|
||
| function mirror_callback(remote::Ptr{Ptr{Void}}, repo::Ptr{Void}, name::Ptr{UInt8}, url::Ptr{UInt8}, payload::Ptr{Void}) | ||
| # Create the remote with a mirroring url | ||
| fetch_spec = "+refs/*:refs/*" | ||
| err = ccall((:git_remote_create_with_fetchspec, :libgit2), Cint, | ||
| (Ptr{Ptr{Void}}, Ptr{Void}, Ptr{UInt8}, Ptr{UInt8}, Ptr{UInt8}), | ||
| remote, repo, name, url, fetch_spec) | ||
| err != 0 && return Cint(err) | ||
|
|
||
| # And set the configuration option to true for the push command | ||
| config = GitConfig(GitRepo(repo, false)) | ||
| name_str = bytestring(name) | ||
| err = set!(config, "remote.$name_str.mirror", true) | ||
| free!(config) | ||
| err != 0 && return Cint(err) | ||
|
|
||
| return Cint(0) | ||
| end | ||
| const mirror_cb = cfunction(mirror_callback, Cint, (Ptr{Ptr{Void}}, Ptr{Void}, Ptr{UInt8}, Ptr{UInt8}, Ptr{Void})) | ||
|
|
||
| function fetch(repo::GitRepo, remote::AbstractString="origin") | ||
| remote_ptr = [C_NULL] | ||
| err = ccall((:git_remote_lookup, :libgit2), Cint, | ||
| (Ptr{Ptr{Void}}, Ptr{Void}, Ptr{UInt8}), | ||
| remote_ptr, repo.ptr, remote) | ||
| err != 0 && return GitError(err) | ||
|
|
||
| err = ccall((:git_remote_fetch, :libgit2), Cint, | ||
| (Ptr{Void}, Ptr{Void}, Ptr{UInt8}), | ||
| remote_ptr[1], C_NULL, C_NULL) | ||
| err != 0 && return GitError(err) | ||
| end | ||
|
|
||
| function normalize_url(url::AbstractString) | ||
| m = match(GITHUB_REGEX,url) | ||
| m == nothing ? url : "git:https://github.com/$(m.captures[1]).git" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| immutable StrArrayStruct | ||
| strings::Ptr{Ptr{Uint8}} | ||
| count::Csize_t | ||
| end | ||
| StrArrayStruct() = StrArrayStruct(Ptr{Uint8}(0), zero(Csize_t)) | ||
|
|
||
| immutable CheckoutOptionsStruct | ||
| version::Cuint | ||
| checkout_strategy::Cuint | ||
| disable_filters::Cint | ||
| dir_mode::Cuint | ||
| file_mode::Cuint | ||
| file_open_flags::Cint | ||
| notify_flags::Cuint | ||
| notify_cb::Ptr{Void} | ||
| notify_payload::Ptr{Void} | ||
| progress_cb::Ptr{Void} | ||
| progress_payload::Ptr{Void} | ||
| paths::StrArrayStruct | ||
| baseline::Ptr{Void} | ||
| target_directory::Ptr{Uint8} | ||
| ancestor_label::Ptr{Uint8} | ||
| our_label::Ptr{Uint8} | ||
| their_label::Ptr{Uint8} | ||
| end | ||
| CheckoutOptionsStruct() = CheckoutOptionsStruct(one(Cuint), | ||
| GitConst.CHECKOUT_SAFE_CREATE, | ||
| zero(Cint), | ||
| zero(Cuint), # Cuint(0o755), # | ||
| zero(Cuint), # Cuint(0o755), # | ||
| zero(Cint), | ||
| GitConst.CHECKOUT_NOTIFY_NONE, | ||
| Ptr{Void}(0), Ptr{Void}(0), | ||
| Ptr{Void}(0), Ptr{Void}(0), | ||
| StrArrayStruct(), | ||
| Ptr{Void}(0), | ||
| Ptr{Uint8}(0), | ||
| Ptr{Uint8}(0), | ||
| Ptr{Uint8}(0), | ||
| Ptr{Uint8}(0)) | ||
|
|
||
| immutable RemoteCallbacksStruct | ||
| version::Cuint | ||
| sideband_progress::Ptr{Void} | ||
| completion::Ptr{Void} | ||
| credentials::Ptr{Void} | ||
| certificate_check::Ptr{Void} | ||
| transfer_progress::Ptr{Void} | ||
| update_tips::Ptr{Void} | ||
| pack_progress::Ptr{Void} | ||
| push_transfer_progress::Ptr{Void} | ||
| push_update_reference::Ptr{Void} | ||
| payload::Ptr{Void} | ||
| end | ||
| RemoteCallbacksStruct() = RemoteCallbacksStruct(one(Cuint), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0)) | ||
|
|
||
| type CloneOptionsStruct | ||
| version::Cuint | ||
| checkout_opts::CheckoutOptionsStruct | ||
| remote_callbacks::RemoteCallbacksStruct | ||
| bare::Cint | ||
| localclone::Cint | ||
| checkout_branch::Ptr{Uint8} | ||
| signature::Ptr{Void} | ||
| repository_cb::Ptr{Void} | ||
| repository_cb_payload::Ptr{Void} | ||
| remote_cb::Ptr{Void} | ||
| remote_cb_payload::Ptr{Void} | ||
| end | ||
|
|
||
| CloneOptionsStruct() = CloneOptionsStruct(one(Cuint), | ||
| CheckoutOptionsStruct(), | ||
| RemoteCallbacksStruct(), | ||
| zero(Cint), | ||
| zero(Cint), | ||
| Ptr{UInt8}(0), | ||
| Ptr{Void}(0), | ||
| Ptr{Void}(0), Ptr{Void}(0), | ||
| Ptr{Void}(0), Ptr{Void}(0) | ||
| ) | ||
|
|
||
| function clone(url::AbstractString, path::AbstractString; | ||
| branch::AbstractString="", | ||
| bare::Bool = false, | ||
| remote_cb::Ptr{Void} = C_NULL) | ||
| # start cloning | ||
| clone_opts = CloneOptionsStruct() | ||
| clone_opts.bare = Int32(bare) | ||
| if !isempty(branch) | ||
| clone_opts.checkout_branch = pointer(branch) | ||
| end | ||
| if remote_cb != C_NULL | ||
| clone_opts.remote_cb = remote_cb | ||
| end | ||
|
|
||
| clone_opts_ref = Ref(clone_opts) | ||
| repo_ptr = Ptr{Void}[C_NULL] | ||
| err = ccall((:git_clone, :libgit2), Cint, | ||
| (Ptr{Ptr{Void}}, Ptr{UInt8}, Ptr{UInt8}, Ref{CloneOptionsStruct}), | ||
| repo_ptr, url, path, clone_opts_ref) | ||
| err != 0 && return nothing | ||
|
|
||
| return GitRepo(repo_ptr[1]) | ||
| end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Potentially worth noting - IIUC - that this is an API change: this no longer errors if there is a problem with fetch (LibGit2.fetch just warns). New behaviour is better IMO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did not intend to warn on a
fetchfailure. I was a working version. I guess it is fine to leave it this way.