diff --git a/packages/source-control-azure-devops/src/shared/definition.test.ts b/packages/source-control-azure-devops/src/shared/definition.test.ts index f18b627a874be..9234546a8a5a8 100644 --- a/packages/source-control-azure-devops/src/shared/definition.test.ts +++ b/packages/source-control-azure-devops/src/shared/definition.test.ts @@ -54,6 +54,18 @@ describe("Azure DevOps change request URLs", () => { } }); + it("takes a pull request URL that leaves the project out as a checkout reference", () => { + for (const url of [ + "https://dev.azure.com/acme/_git/web/pullrequest/17", + "https://acme.visualstudio.com/_git/web/pullrequest/17", + ]) { + expect(definition.isChangeRequestReference(url), url).toBe(true); + } + expect( + definition.isChangeRequestReference("https://dev.azure.com/_git/web/pullrequest/17"), + ).toBe(false); + }); + it.each([ ["ssh.dev.azure.com", "v3/org/project/web"], ["org.visualstudio.com", "defaultcollection/project/_git/web"], diff --git a/packages/source-control-azure-devops/src/shared/definition.ts b/packages/source-control-azure-devops/src/shared/definition.ts index 78f1a4df45a8d..a32ba471a7b48 100644 --- a/packages/source-control-azure-devops/src/shared/definition.ts +++ b/packages/source-control-azure-devops/src/shared/definition.ts @@ -21,7 +21,7 @@ const WORK_ITEM_PATH = /^\/([^/]+\/[^/]+)\/_workitems\/edit\/(\d+)(?:\/|$)/u; const LEGACY_WORK_ITEM_PATH = /^\/([^/]+)\/_workitems\/edit\/(\d+)(?:\/|$)/u; 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\/(?:DefaultCollection\/)?[^/\s]+)\/_git\/[^/\s]+\/pullrequest\/(\d+)(?:[/?#].*)?$/i; + /^https:\/\/(?:dev\.azure\.com\/[^/\s]+(?:\/[^/\s]+)?|[^/\s]+\.visualstudio\.com(?:\/DefaultCollection)?(?:\/[^/\s]+)?)\/_git\/[^/\s]+\/pullrequest\/(\d+)(?:[/?#].*)?$/i; // `ssh.dev.azure.com` is the default SSH clone host (git@ssh.dev.azure.com:v3/org/project/repo), // so any `*.dev.azure.com` subdomain is Azure. Legacy hosts stay under `.visualstudio.com`,