mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-09-19 21:17:31 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(git): support azure devops remote URL - SSH

Browse source
This commit is contained in:
hsnabszhdn 2024-09-07 21:42:53 +00:00 committed by Jan De Dobbeleer
parent 7836a240f1
commit f1e74feec7
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/segments/git.go
View file

@ -451,11 +451,11 @@ func (g *Git) setBranchStatus() {
}
func (g *Git) cleanUpstreamURL(url string) string {
// https://{organization}@dev.azure.com/{organization}/{project}/_git/{repository}
if strings.Contains(url, "@dev.azure.com") {
match := regex.FindNamedRegexMatch(`.*@(?P<URL>dev.azure.com.*)`, url)
if len(match) != 0 {
return fmt.Sprintf("https://%s", match["URL"])
// Azure DevOps
if strings.Contains(url, "dev.azure.com") {
match := regex.FindNamedRegexMatch(`^.*@(ssh.)?dev\.azure\.com(:v3)?/(?P<ORGANIZATION>[A-Za-z0-9_-]+)/(?P<PROJECT>[A-Za-z0-9_-]+)/(_git/)?(?P<REPOSITORY>[A-Za-z0-9_-]+)$`, url)
if len(match) == 4 {
return fmt.Sprintf("https://dev.azure.com/%s/%s/_git/%s", match["ORGANIZATION"], match["PROJECT"], match["REPOSITORY"])
}
}

3
src/segments/git_test.go
View file

@ -649,7 +649,8 @@ func TestGitCleanSSHURL(t *testing.T) {
{Case: "gitea no port, no user", Expected: "https://src.example.com/user/repo", Upstream: "_gitea@src.example.com:user/repo.git"},
{Case: "git@ with user", Expected: "https://github.com/JanDeDobbeleer/oh-my-posh", Upstream: "git@github.com:JanDeDobbeleer/oh-my-posh"},
{Case: "unsupported", Upstream: "\\test\\repo.git"},
{Case: "Azure DevOps", Expected: "https://dev.azure.com/posh/oh-my-posh/_git/website", Upstream: "https://posh@dev.azure.com/posh/oh-my-posh/_git/website"},
{Case: "Azure DevOps, https", Expected: "https://dev.azure.com/posh/oh-my-posh/_git/website", Upstream: "https://posh@dev.azure.com/posh/oh-my-posh/_git/website"},
{Case: "Azure DevOps, ssh", Expected: "https://dev.azure.com/posh/oh-my-posh/_git/website", Upstream: "git@ssh.dev.azure.com:v3/posh/oh-my-posh/website"},
}
for _, tc := range cases {
g := &Git{}