-
-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #378 from JyJyJcr/rel_ssh
feat: enable relative path ssh URL
- Loading branch information
Showing
2 changed files
with
28 additions
and
9 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,12 +112,16 @@ func newURL(ref string, ssh, forceMe bool) (*url.URL, error) { | |
user := matched[1] | ||
host := matched[2] | ||
path := matched[3] | ||
// If the path is a relative path not beginning with a slash like | ||
// `path/to/repo`, we might convert to like | ||
// `ssh://[email protected]/~/path/to/repo` using tilde, but | ||
// since GitHub doesn't support it, we treat relative and absolute | ||
// paths the same way. | ||
ref = fmt.Sprintf("ssh://%s%s/%s", user, host, strings.TrimPrefix(path, "/")) | ||
// When two conditions below are satisfied: | ||
// 1. the path is a relative path, which not beginning with a slash, like `path/to/repo`. | ||
// 2. the host is not github.com, which doesn't support relative paths. | ||
// then we convert the given SCP style URL to a normal style and relative path URL using tilde, like `ssh://[email protected]/~/path/to/repo`. | ||
if strings.HasPrefix(path, "/") { | ||
path = strings.TrimPrefix(path, "/") | ||
} else if host != "github.com" { | ||
path = "~/" + path | ||
} | ||
ref = fmt.Sprintf("ssh://%s%s/%s", user, host, path) | ||
} else { | ||
// If ref is like "github.com/motemen/ghq" convert to "https://github.com/motemen/ghq" | ||
paths := strings.Split(ref, "/") | ||
|
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 |
---|---|---|
|
@@ -20,20 +20,35 @@ func TestNewURL(t *testing.T) { | |
expect: "https://github.com/motemen/pusheen-explorer", | ||
host: "github.com", | ||
}, { | ||
name: "scp", // Convert SCP-like URL to SSH URL | ||
name: "scp to github", // Convert SCP-like URL to SSH URL | ||
url: "[email protected]:motemen/pusheen-explorer.git", | ||
expect: "ssh://[email protected]/motemen/pusheen-explorer.git", | ||
host: "github.com", | ||
}, { | ||
name: "scp with root", | ||
name: "scp with root to github", | ||
url: "[email protected]:/motemen/pusheen-explorer.git", | ||
expect: "ssh://[email protected]/motemen/pusheen-explorer.git", | ||
host: "github.com", | ||
}, { | ||
name: "scp without user", | ||
name: "scp without user to github", | ||
url: "github.com:motemen/pusheen-explorer.git", | ||
expect: "ssh://github.com/motemen/pusheen-explorer.git", | ||
host: "github.com", | ||
}, { | ||
name: "scp to others", | ||
url: "[email protected]:repo/www.git", | ||
expect: "ssh://[email protected]/~/repo/www.git", | ||
host: "example.com", | ||
}, { | ||
name: "scp with root to others", | ||
url: "[email protected]:/repo/www.git", | ||
expect: "ssh://[email protected]/repo/www.git", | ||
host: "example.com", | ||
}, { | ||
name: "scp without user to others", | ||
url: "example.com:repo/www.git", | ||
expect: "ssh://example.com/~/repo/www.git", | ||
host: "example.com", | ||
}, { | ||
name: "different name repository", | ||
url: "motemen/ghq", | ||
|