mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 04:19:41 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(git): support azure devops remote URL
Some checks are pending
Code QL / code-ql (push) Waiting to run
Details
Azure Static Web Apps CI/CD / Build and Deploy (push) Waiting to run
Details
Release / changelog (push) Waiting to run
Details
Release / artifacts (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-09-07 22:21:11 +02:00 committed by Jan De Dobbeleer
parent 58ba3b075c
commit 7836a240f1
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/segments/git.go
View file

@ -451,6 +451,14 @@ func (g *Git) setBranchStatus() {
} }
func (g *Git) cleanUpstreamURL(url string) string { 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"])
}
}
if strings.HasPrefix(url, "http") { if strings.HasPrefix(url, "http") {
return url return url
} }

5
src/segments/git_test.go
View file

@ -649,11 +649,12 @@ 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: "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: "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: "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"},
} }
for _, tc := range cases { for _, tc := range cases {
g := &Git{} g := &Git{}
upstreamIcon := g.cleanUpstreamURL(tc.Upstream) upstreamURL := g.cleanUpstreamURL(tc.Upstream)
assert.Equal(t, tc.Expected, upstreamIcon, tc.Case) assert.Equal(t, tc.Expected, upstreamURL, tc.Case)
} }
} }