lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistently construct Endpoint from urls the same way

Browse Source 
There are 2 ways to construct LFS urls - from explicit URLs and from the
clone URL (which gets info/lfs appended). Previously there were multiple
paths where the Endpoint could be constructed in a short-circuit manner
which prevents future expansion in common functions. This standardises
the Endpoint construction so it always happens via NewEndpoint, and
NewEndpointFromCloneURL performs the extra step of appending info/lfs.

This has a current effect of supporting SSH urls in all config settings,
and not just the remote clone URL as before. But mostly this is to enable
future expansion (improved SSH support)
This commit is contained in:
Steve Streeting 2015-06-17 11:04:22 +01:00
parent 968faba7e1
commit 7342df5d03
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lfs/config.go
View File

@ -62,7 +62,7 @@ func (c *Configuration) Getenv(key string) string {
func (c *Configuration) Endpoint() Endpoint {
if url, ok := c.GitConfig("lfs.url"); ok {
return Endpoint{Url: url}
return NewEndpoint(url)
}
if len(c.CurrentRemote) > 0 && c.CurrentRemote != defaultRemote {
@ -105,38 +105,47 @@ func (c *Configuration) RemoteEndpoint(remote string) Endpoint {
if len(remote) == 0 {
remote = defaultRemote
}
if url, ok := c.GitConfig("remote." + remote + ".lfsurl"); ok {
return Endpoint{Url: url}
return NewEndpoint(url)
}
if url, ok := c.GitConfig("remote." + remote + ".url"); ok {
return remoteEndpointFromUrl(url)
return NewEndpointFromCloneURL(url)
}
return Endpoint{}
}
func remoteEndpointFromUrl(url string) Endpoint {
const ENDPOINT_URL_UNKNOWN = "<unknown>"
// Create a new endpoint from a URL associated with a git clone URL
// The difference to NewEndpoint is that it appends [.git]/info/lfs to the URL since it
// is the clone URL
func NewEndpointFromCloneURL(url string) Endpoint {
e := NewEndpoint(url)
if e.Url != ENDPOINT_URL_UNKNOWN {
// When using main remote URL for HTTP, append info/lfs
if path.Ext(url) == ".git" {
e.Url += "/info/lfs"
} else {
e.Url += ".git/info/lfs"
}
}
return e
}
// Create a new endpoint from a general URL
func NewEndpoint(url string) Endpoint {
e := Endpoint{Url: url}
if !httpPrefixRe.MatchString(url) {
pieces := strings.SplitN(url, ":", 2)
hostPieces := strings.SplitN(pieces[0], "@", 2)
if len(hostPieces) < 2 {
e.Url = "<unknown>"
return e
if len(hostPieces) == 2 {
e.SshUserAndHost = pieces[0]
e.SshPath = pieces[1]
e.Url = fmt.Sprintf("https://%s/%s", hostPieces[1], pieces[1])
}
e.SshUserAndHost = pieces[0]
e.SshPath = pieces[1]
e.Url = fmt.Sprintf("https://%s/%s", hostPieces[1], pieces[1])
}
if path.Ext(url) == ".git" {
e.Url += "/info/lfs"
} else {
e.Url += ".git/info/lfs"
}
return e