-
Notifications
You must be signed in to change notification settings - Fork 501
Allow for remote names other than origin.
#2509
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
RomeoV
wants to merge
5
commits into
JuliaDocs:master
Choose a base branch
from
RomeoV:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f1a82bc
Allow for remote names other than `origin`.
RomeoV ac069f6
Remove "Nothing" options for remotename cache.
RomeoV c704cfe
Automatically pick remote `origin` if it exists.
RomeoV d7425a0
Add note in docs.
RomeoV 7e3f8c3
Add tests for `getremotename` and `getremote`
RomeoV File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -421,7 +421,31 @@ const julia_remote = Remotes.GitHub("JuliaLang", "julia") | |
| """ | ||
| Stores the memoized results of [`getremote`](@ref). | ||
| """ | ||
| const GIT_REMOTE_CACHE = Dict{String,Union{Remotes.Remote,Nothing}}() | ||
| const GIT_REMOTENAME_CACHE = Dict{String,Union{String,Nothing}}() | ||
| const GIT_REMOTEURL_CACHE = Dict{String,Union{Remotes.Remote,Nothing}}() | ||
|
|
||
| """ | ||
| $(TYPEDSIGNATURES) | ||
|
|
||
| Determines the GitHub remote of a directory by checking `remote.pushDefault` of the repository. | ||
| Defaults to `origin`. | ||
|
|
||
| The results for a given directory are memoized in [`GIT_REMOTENAME_CACHE`](@ref), since calling | ||
| `git` is expensive and it is often called on the same directory over and over again. | ||
| """ | ||
| function getremotename(dir::AbstractString) | ||
| isdir(dir) || return nothing | ||
| return get!(GIT_REMOTENAME_CACHE, dir) do | ||
| try | ||
| remotename = readchomp(setenv(`$(git()) config --get remote.pushDefault`; dir=dir)) | ||
| @assert !isempty(remotename) | ||
| remotename | ||
| catch e | ||
| @warn "git config --get remote.pushDefault failed. Assuming remote `origin`." exception=(e, catch_backtrace()) | ||
| "origin" | ||
| end | ||
| end | ||
| end | ||
|
|
||
| function parse_remote_url(remote::AbstractString) | ||
| # TODO: we only match for GitHub repositories automatically. Could we engineer a | ||
|
|
@@ -435,24 +459,25 @@ end | |
| """ | ||
| $(TYPEDSIGNATURES) | ||
|
|
||
| Determines the GitHub remote of a directory by checking `remote.origin.url` of the | ||
| repository. Returns a [`Remotes.GitHub`](@ref), or `nothing` is something has gone wrong | ||
| (e.g. it's run on a directory not in a Git repo, or `origin.url` points to a non-GitHub | ||
| remote). | ||
| Determines the GitHub remote of a directory by checking `remote.\$(remotename).url` of the | ||
| repository. `remotename` is determined by [`getremotename`](@ref). Returns a [`Remotes.GitHub`](@ref), | ||
| or `nothing` is something has gone wrong (e.g. it's run on a directory not in a Git repo, or the url | ||
| points to a non-GitHub remote). | ||
|
|
||
| The results for a given directory are memoized in [`GIT_REMOTE_CACHE`](@ref), since calling | ||
| The results for a given directory are memoized in [`GIT_REMOTEURL_CACHE`](@ref), since calling | ||
| `git` is expensive and it is often called on the same directory over and over again. | ||
| """ | ||
| function getremote(dir::AbstractString) | ||
| isdir(dir) || return nothing | ||
| return get!(GIT_REMOTE_CACHE, dir) do | ||
| remote = try | ||
| readchomp(setenv(`$(git()) config --get remote.origin.url`; dir=dir)) | ||
| return get!(GIT_REMOTEURL_CACHE, dir) do | ||
| remotename = getremotename(dir) | ||
| remoteurl = try | ||
| readchomp(setenv(`$(git()) config --get remote.$(remotename).url`; dir=dir)) | ||
| catch e | ||
| @debug "git config --get remote.origin.url failed" exception=(e, catch_backtrace()) | ||
| @debug "git config --get remote.$(remotename).url failed" exception=(e, catch_backtrace()) | ||
| "" | ||
| end | ||
| return parse_remote_url(remote) | ||
| return parse_remote_url(remoteurl) | ||
| end | ||
| end | ||
|
|
||
|
|
@@ -616,7 +641,7 @@ it out automatically. | |
| `root` is the the directory where `git` gets run. `varname` is just informational and used | ||
| to construct the warning messages. | ||
| """ | ||
| function git_remote_head_branch(varname, root; remotename = "origin", fallback = "master") | ||
| function git_remote_head_branch(varname, root; fallback = "master") | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The docstring still references |
||
| gitcmd = git(nothrow = true) | ||
| if gitcmd === nothing | ||
| @warn """ | ||
|
|
@@ -628,8 +653,9 @@ function git_remote_head_branch(varname, root; remotename = "origin", fallback = | |
| end | ||
| # We need to do addenv() here to merge the new variables with the environment set by | ||
| # Git_jll and the git() function. | ||
| remotename = getremotename(root) | ||
| cmd = addenv( | ||
| setenv(`$gitcmd remote show $(remotename)`, dir=root), | ||
| setenv(`$gitcmd remote show $remotename`, dir=root), | ||
| "GIT_TERMINAL_PROMPT" => "0", | ||
| "GIT_SSH_COMMAND" => get(ENV, "GIT_SSH_COMMAND", "ssh -o \"BatchMode yes\""), | ||
| ) | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.