Skip to content

Add support for Azure DevOps projects and repos with spaces #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kzu merged 1 commit into from
Sep 10, 2025
Merged

Add support for Azure DevOps projects and repos with spaces #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/Core/RemoteRef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,21 @@ public override string ToString() =>

public static bool TryParse(string value, [NotNullWhen(true)] out RemoteRef? remote)
{
if (string.IsNullOrEmpty(value) || ParseExp().Match(value) is not { Success: true } match)
Match GetMatch(string input)
{
// Try Azure DevOps first since it is more specific
var match = ParseAzureDevOpsExp().Match(input);

if (match.Success)
{
return match;
}

return ParseExp().Match(input);
}

if (string.IsNullOrEmpty(value)
|| GetMatch(value) is not { Success: true } match)
{
remote = null;
return false;
Expand All @@ -28,10 +42,7 @@ public static bool TryParse(string value, [NotNullWhen(true)] out RemoteRef? rem
var reference = match.Groups["ref"].Value;
var filePath = match.Groups["path"].Value;

// If a third segment was provided, treat the originally parsed <repo> as the Azure DevOps project
if (!string.IsNullOrEmpty(project))
(project, repo) = (repo, project);
else
if (string.IsNullOrEmpty(project))
project = null;

// If project is provided, host is required, since GH does not support projects
Expand All @@ -57,4 +68,7 @@ public static bool TryParse(string value, [NotNullWhen(true)] out RemoteRef? rem

[GeneratedRegex(@"^(?:(?<host>[A-Za-z0-9.-]+\.[A-Za-z]{2,})/)?(?<owner>[A-Za-z0-9](?:-?[A-Za-z0-9]){0,38})/(?<repo>[A-Za-z0-9._-]{1,100})(?:/(?<project>[A-Za-z0-9._-]{1,100}))?(?:@(?<ref>[^:\s]+))?(?::(?<path>.+))?$")]
private static partial Regex ParseExp();

[GeneratedRegex(@"^(?:(?<host>dev.azure.com)/)(?<owner>[A-Za-z0-9](?:-?[A-Za-z0-9]){0,38})/(?<project>[%A-Za-z0-9._-]{1,100})(?:/(?<repo>[%A-Za-z0-9._-]{1,100}))?(?:@(?<ref>[^:\s]+))?(?::(?<path>.+))?$")]
private static partial Regex ParseAzureDevOpsExp();
}
8 changes: 5 additions & 3 deletions src/Tests/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ public void TryParse_EdgeCaseMinimalPaths_WorksCorrectly(string input, string ex
[InlineData("git.example.com/company/app", "git.example.com", "company", "app", null, null)]
[InlineData("source.internal.org/internal/project", "source.internal.org", "internal", "project", null, null)]
[InlineData("dev.azure.com/org/project/repo", "dev.azure.com", "org", "repo", null, null)]
[InlineData("dev.azure.com/org/project/repo%20space", "dev.azure.com", "org", "repo%20space", null, null)]
[InlineData("dev.azure.com/org/project%20space/repo%20space", "dev.azure.com", "org", "repo%20space", null, null)]
[InlineData("git.sr.ht/user/repo", "git.sr.ht", "user", "repo", null, null)]
public void TryParse_WithHost_SetsHostAndOwnerRepo(string input, string expectedHost, string expectedOwner, string expectedRepo, string? expectedBranch, string? expectedPath)
{
Expand All @@ -273,7 +275,7 @@ public void TryParse_WithHost_SetsHostAndOwnerRepo(string input, string expected
[InlineData("codeberg.org/dev/tool@v1.0.0", "codeberg.org", "dev", "tool", "v1.0.0", null)]
[InlineData("git.example.com/company/app@release/2024", "git.example.com", "company", "app", "release/2024", null)]
[InlineData("source.internal.org/internal/project@hotfix/urgent", "source.internal.org", "internal", "project", "hotfix/urgent", null)]
[InlineData("dev.azure.com/org/project@refs/heads/main", "dev.azure.com", "org", "project", "refs/heads/main", null)]
[InlineData("dev.azure.com/org/project/repo@refs/heads/main", "dev.azure.com", "org", "repo", "refs/heads/main", null)]
[InlineData("git.sr.ht/user/repo@master", "git.sr.ht", "user", "repo", "master", null)]
public void TryParse_WithHostAndBranch_SetsHostOwnerRepoAndBranch(string input, string expectedHost, string expectedOwner, string expectedRepo, string expectedBranch, string? expectedPath)
{
Expand All @@ -296,7 +298,7 @@ public void TryParse_WithHostAndBranch_SetsHostOwnerRepoAndBranch(string input,
[InlineData("codeberg.org/dev/tool:lib/utils.py", "codeberg.org", "dev", "tool", null, "lib/utils.py")]
[InlineData("git.example.com/company/app:frontend/index.html", "git.example.com", "company", "app", null, "frontend/index.html")]
[InlineData("source.internal.org/internal/project:scripts/deploy.sh", "source.internal.org", "internal", "project", null, "scripts/deploy.sh")]
[InlineData("dev.azure.com/org/project:azure-pipelines.yml", "dev.azure.com", "org", "project", null, "azure-pipelines.yml")]
[InlineData("dev.azure.com/org/project/repo:azure-pipelines.yml", "dev.azure.com", "org", "repo", null, "azure-pipelines.yml")]
[InlineData("git.sr.ht/user/repo:Makefile", "git.sr.ht", "user", "repo", null, "Makefile")]
public void TryParse_WithHostAndPath_SetsHostOwnerRepoAndPath(string input, string expectedHost, string expectedOwner, string expectedRepo, string? expectedBranch, string expectedPath)
{
Expand All @@ -319,7 +321,7 @@ public void TryParse_WithHostAndPath_SetsHostOwnerRepoAndPath(string input, stri
[InlineData("codeberg.org/dev/tool@v2.1.0:lib/utils.py", "codeberg.org", "dev", "tool", "v2.1.0", "lib/utils.py")]
[InlineData("git.example.com/company/app@release/2024:frontend/index.html", "git.example.com", "company", "app", "release/2024", "frontend/index.html")]
[InlineData("source.internal.org/internal/project@hotfix/critical:scripts/deploy.sh", "source.internal.org", "internal", "project", "hotfix/critical", "scripts/deploy.sh")]
[InlineData("dev.azure.com/org/project@refs/heads/feature:azure-pipelines.yml", "dev.azure.com", "org", "project", "refs/heads/feature", "azure-pipelines.yml")]
[InlineData("dev.azure.com/org/project/repo@refs/heads/feature:azure-pipelines.yml", "dev.azure.com", "org", "repo", "refs/heads/feature", "azure-pipelines.yml")]
[InlineData("git.sr.ht/user/repo@experimental:Makefile", "git.sr.ht", "user", "repo", "experimental", "Makefile")]
public void TryParse_WithHostBranchAndPath_SetsAllProperties(string input, string expectedHost, string expectedOwner, string expectedRepo, string expectedBranch, string expectedPath)
{
Expand Down