Skip to content
TypeScript

fix(azure-devops): legacy DefaultCollection pull request URLs can be pasted to check out (#29763)

Alex Southwell19a2bad15553
diff --git a/packages/client-runtime/src/pullRequestLinkInput.test.ts b/packages/client-runtime/src/pullRequestLinkInput.test.ts
index 79bbc96bdea..49404975ab6 100644
--- a/packages/client-runtime/src/pullRequestLinkInput.test.ts
+++ b/packages/client-runtime/src/pullRequestLinkInput.test.ts
@@ -159,6 +159,11 @@ describe("parsePullRequestReference", () => {
expect(
parsePullRequestReference("https://acme.visualstudio.com/project/_git/t3code/pullrequest/42"),
).toBe("https://acme.visualstudio.com/project/_git/t3code/pullrequest/42");
+ expect(
+ parsePullRequestReference(
+ "https://acme.visualstudio.com/DefaultCollection/project/_git/t3code/pullrequest/42",
+ ),
+ ).toBe("https://acme.visualstudio.com/DefaultCollection/project/_git/t3code/pullrequest/42");
});
it.each([
diff --git a/packages/source-control-azure-devops/src/shared/definition.ts b/packages/source-control-azure-devops/src/shared/definition.ts
index e0491368d72..5f6fca54f08 100644
--- a/packages/source-control-azure-devops/src/shared/definition.ts
+++ b/packages/source-control-azure-devops/src/shared/definition.ts
@@ -15,7 +15,7 @@ const CHANGE_REQUEST_PATH = /^\/((?:[^/]+\/)*_git\/[^/]+)\/pullrequest\/(\d+)(?:
const COMMIT_PATH = /^\/((?:[^/]+\/)*_git\/[^/]+)\/commit\/([0-9a-f]+)\/?$/iu;
const CHECKOUT_COMMAND = /^az\s+repos\s+pr\s+checkout\s+(.+)$/i;
const CHANGE_REQUEST_REFERENCE =
- /^https:\/\/(?:dev\.azure\.com\/[^/\s]+\/[^/\s]+|[^/\s]+\.visualstudio\.com\/[^/\s]+)\/_git\/[^/\s]+\/pullrequest\/(\d+)(?:[/?#].*)?$/i;
+ /^https:\/\/(?:dev\.azure\.com\/[^/\s]+\/[^/\s]+|[^/\s]+\.visualstudio\.com\/(?:DefaultCollection\/)?[^/\s]+)\/_git\/[^/\s]+\/pullrequest\/(\d+)(?:[/?#].*)?$/i;
/**
* Azure alone addresses one repository under two names that share no part: `ssh.dev.azure.com` and