diff options
author | Jeremy Stribling <strib@alum.mit.edu> | 2019-02-08 11:28:24 -0800 |
---|---|---|
committer | Jeremy Stribling <strib@alum.mit.edu> | 2019-02-11 15:13:11 -0800 |
commit | f56336220f6ac9b5647980953fe6df8bb53ae01e (patch) | |
tree | 87032fe128e9a0128ff1c32656ccd8c809c2cd0b /plumbing | |
parent | efe6c8be74a942c902f4812146ff016827ad9626 (diff) | |
download | go-git-f56336220f6ac9b5647980953fe6df8bb53ae01e.tar.gz |
config: add a way to see if a "remote" URL is local or not
This factors out some URL-parsing code from the transport layer so it
can be used by config as well.
Issue: #909
Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
Diffstat (limited to 'plumbing')
-rw-r--r-- | plumbing/transport/common.go | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/plumbing/transport/common.go b/plumbing/transport/common.go index f7b882b..dcf9391 100644 --- a/plumbing/transport/common.go +++ b/plumbing/transport/common.go @@ -19,10 +19,10 @@ import ( "fmt" "io" "net/url" - "regexp" "strconv" "strings" + giturl "gopkg.in/src-d/go-git.v4/internal/url" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" @@ -224,34 +224,28 @@ func getPath(u *url.URL) string { return res } -var ( - isSchemeRegExp = regexp.MustCompile(`^[^:]+://`) - scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P<user>[^@]+)@)?(?P<host>[^:\s]+):(?:(?P<port>[0-9]{1,5})/)?(?P<path>[^\\].*)$`) -) - func parseSCPLike(endpoint string) (*Endpoint, bool) { - if isSchemeRegExp.MatchString(endpoint) || !scpLikeUrlRegExp.MatchString(endpoint) { + if giturl.MatchesScheme(endpoint) || !giturl.MatchesScpLike(endpoint) { return nil, false } - m := scpLikeUrlRegExp.FindStringSubmatch(endpoint) - - port, err := strconv.Atoi(m[3]) + user, host, portStr, path := giturl.FindScpLikeComponents(endpoint) + port, err := strconv.Atoi(portStr) if err != nil { port = 22 } return &Endpoint{ Protocol: "ssh", - User: m[1], - Host: m[2], + User: user, + Host: host, Port: port, - Path: m[4], + Path: path, }, true } func parseFile(endpoint string) (*Endpoint, bool) { - if isSchemeRegExp.MatchString(endpoint) { + if giturl.MatchesScheme(endpoint) { return nil, false } |