Support actual new Azure DevOps Git link format with forward slashes

Copilot · MrHinsh · Copilot · commit 7fcf0ee2a3ae · 2025-11-26T20:58:10.000Z
The new format uses forward slashes instead of %2f encoding:
- Legacy: vstfs:///Git/Commit/{projectId}%2f{repoId}%2f{commitId}
- New: vstfs:///Git/Commit/{projectName}/{repoName}/{commitId}

Key differences:
- New format uses / separator instead of %2f
- New format uses project/repo names instead of GUIDs
- Repo lookup is by name for new format, by ID for legacy

Updated tests to cover both formats correctly

Co-authored-by: MrHinsh &lt;5205575+MrHinsh@users.noreply.github.com&gt;
diff --git a/src/MigrationTools.Clients.TfsObjectModel.Tests/Tools/TfsGitRepositoryInfoTests.cs b/src/MigrationTools.Clients.TfsObjectModel.Tests/Tools/TfsGitRepositoryInfoTests.cs
@@ -30,9 +30,9 @@ private ExternalLink CreateMockExternalLink(string uri)
         }
 
         [TestMethod(), TestCategory("L0")]
-        public void CreateFromGit_ValidLinkWithThreeParts_ShouldSucceed()
+        public void CreateFromGit_ValidLinkWithThreeParts_LegacyFormat_ShouldSucceed()
         {
-            // Arrange
+            // Arrange - Legacy format with %2f encoding
             var validLink = "vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a%2f50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535";
             var externalLink = CreateMockExternalLink(validLink);
             var possibleRepos = new List<GitRepository>
@@ -50,9 +50,9 @@ public void CreateFromGit_ValidLinkWithThreeParts_ShouldSucceed()
         }
 
         [TestMethod(), TestCategory("L0")]
-        public void CreateFromGit_ValidLinkWithMultipleCommitParts_ShouldSucceed()
+        public void CreateFromGit_ValidLinkWithMultipleCommitParts_LegacyFormat_ShouldSucceed()
         {
-            // Arrange
+            // Arrange - Legacy format with extended commit ID
             var validLink = "vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a%2f50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535%2fextra%2fparts";
             var externalLink = CreateMockExternalLink(validLink);
             var possibleRepos = new List<GitRepository>
@@ -70,14 +70,18 @@ public void CreateFromGit_ValidLinkWithMultipleCommitParts_ShouldSucceed()
         }
 
         [TestMethod(), TestCategory("L0")]
-        public void CreateFromGit_ValidLinkWithTwoParts_NewFormat_ShouldSucceed()
+        public void CreateFromGit_ValidLinkWithSlashes_NewFormat_ShouldSucceed()
         {
-            // Arrange - New format without projectId
-            var newFormatLink = "vstfs:///Git/Commit/50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535";
+            // Arrange - New Azure DevOps format with forward slashes
+            var newFormatLink = "vstfs:///Git/Commit/MyProject/MyRepo/41dd2754058348d72a6417c0615c2543b9b55535";
             var externalLink = CreateMockExternalLink(newFormatLink);
             var possibleRepos = new List<GitRepository>
             {
-                new GitRepository { Id = Guid.Parse("50477259-3058-4dff-ba4c-e8c179ec5327") }
+                new GitRepository 
+                { 
+                    Id = Guid.Parse("50477259-3058-4dff-ba4c-e8c179ec5327"),
+                    Name = "MyRepo"
+                }
             };
 
             // Act
@@ -87,12 +91,14 @@ public void CreateFromGit_ValidLinkWithTwoParts_NewFormat_ShouldSucceed()
             Assert.IsNotNull(result);
             Assert.AreEqual("50477259-3058-4dff-ba4c-e8c179ec5327", result.RepoID);
             Assert.AreEqual("41dd2754058348d72a6417c0615c2543b9b55535", result.CommitID);
+            Assert.IsNotNull(result.GitRepo);
+            Assert.AreEqual("MyRepo", result.GitRepo.Name);
         }
 
         [TestMethod(), TestCategory("L0")]
-        public void CreateFromGit_InvalidLinkWithOnePart_ShouldReturnNull()
+        public void CreateFromGit_InvalidLinkWithOnePart_LegacyFormat_ShouldReturnNull()
         {
-            // Arrange
+            // Arrange - Legacy format with insufficient parts
             var invalidLink = "vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a";
             var externalLink = CreateMockExternalLink(invalidLink);
             var possibleRepos = new List<GitRepository>();
@@ -104,6 +110,36 @@ public void CreateFromGit_InvalidLinkWithOnePart_ShouldReturnNull()
             Assert.IsNull(result);
         }
 
+        [TestMethod(), TestCategory("L0")]
+        public void CreateFromGit_InvalidLinkWithTwoParts_LegacyFormat_ShouldReturnNull()
+        {
+            // Arrange - Legacy format with only 2 parts (missing commitId)
+            var invalidLink = "vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a%2f50477259-3058-4dff-ba4c-e8c179ec5327";
+            var externalLink = CreateMockExternalLink(invalidLink);
+            var possibleRepos = new List<GitRepository>();
+
+            // Act
+            var result = TfsGitRepositoryInfo.CreateFromGit(externalLink, possibleRepos);
+
+            // Assert
+            Assert.IsNull(result);
+        }
+
+        [TestMethod(), TestCategory("L0")]
+        public void CreateFromGit_InvalidLinkWithTwoParts_NewFormat_ShouldReturnNull()
+        {
+            // Arrange - New format with insufficient parts
+            var invalidLink = "vstfs:///Git/Commit/MyProject/MyRepo";
+            var externalLink = CreateMockExternalLink(invalidLink);
+            var possibleRepos = new List<GitRepository>();
+
+            // Act
+            var result = TfsGitRepositoryInfo.CreateFromGit(externalLink, possibleRepos);
+
+            // Assert
+            Assert.IsNull(result);
+        }
+
         [TestMethod(), TestCategory("L0")]
         public void CreateFromGit_EmptyLink_ShouldReturnNull()
         {
diff --git a/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryInfo.cs b/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryInfo.cs
@@ -91,40 +91,73 @@ public static TfsGitRepositoryInfo CreateFromGit(ExternalLink gitExternalLink, I
             string commitID;
             string repoID;
             GitRepository gitRepo;
-            //Old format: vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a%2f50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535
-            //New format: vstfs:///Git/Commit/50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535
-            string guidbits = gitExternalLink.LinkedArtifactUri.Substring(gitExternalLink.LinkedArtifactUri.LastIndexOf('/') + 1);
-            string[] bits = Regex.Split(guidbits, "%2f", RegexOptions.IgnoreCase);
+            //Legacy format: vstfs:///Git/Commit/25f94570-e3e7-4b79-ad19-4b434787fd5a%2f50477259-3058-4dff-ba4c-e8c179ec5327%2f41dd2754058348d72a6417c0615c2543b9b55535
+            //New format: vstfs:///Git/Commit/projectName/repoName/commitId
             
-            // Validate that we have at least 2 parts (repoId, commitId) for new format
-            // or 3 parts (projectId, repoId, commitId) for old format
-            if (bits.Length < 2)
+            // Determine which format we're dealing with
+            if (gitExternalLink.LinkedArtifactUri.Contains("%2f", StringComparison.OrdinalIgnoreCase))
             {
-                Log.Warning("GitRepositoryInfo: Invalid Git external link format. Expected at least 2 parts separated by %2f, but got {count} parts. Link: {link}", bits.Length, gitExternalLink.LinkedArtifactUri);
-                return null;
-            }
-            
-            // Support both old format (3+ parts) and new format (2 parts)
-            if (bits.Length >= 3)
-            {
-                // Old format: projectId%2frepoId%2fcommitId
+                // Legacy format with %2f encoding
+                string guidbits = gitExternalLink.LinkedArtifactUri.Substring(gitExternalLink.LinkedArtifactUri.LastIndexOf('/') + 1);
+                string[] bits = Regex.Split(guidbits, "%2f", RegexOptions.IgnoreCase);
+                
+                // Validate that we have at least 3 parts (projectId, repoId, commitId) for legacy format
+                if (bits.Length < 3)
+                {
+                    Log.Warning("GitRepositoryInfo: Invalid Git external link format (legacy). Expected at least 3 parts separated by %2f, but got {count} parts. Link: {link}", bits.Length, gitExternalLink.LinkedArtifactUri);
+                    return null;
+                }
+                
+                // Legacy format: projectId%2frepoId%2fcommitId
                 repoID = bits[1];
                 commitID = $"{bits[2]}";
                 for (int i = 3; i < bits.Count(); i++)
                 {
                     commitID += $"%2f{bits[i]}";
                 }
+                
+                gitRepo = (from g in possibleRepos 
+                          where string.Equals(g.Id.ToString(), repoID, StringComparison.OrdinalIgnoreCase) 
+                          select g).SingleOrDefault();
             }
             else
             {
-                // New format: repoId%2fcommitId
-                repoID = bits[0];
-                commitID = bits[1];
+                // New format with forward slashes: vstfs:///Git/Commit/projectName/repoName/commitId
+                const string prefix = "vstfs:///Git/Commit/";
+                if (!gitExternalLink.LinkedArtifactUri.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    Log.Warning("GitRepositoryInfo: Invalid Git external link format (new). Link does not start with expected prefix. Link: {link}", gitExternalLink.LinkedArtifactUri);
+                    return null;
+                }
+                
+                string remainder = gitExternalLink.LinkedArtifactUri.Substring(prefix.Length);
+                string[] parts = remainder.Split('/');
+                
+                // Validate that we have at least 3 parts (projectName, repoName, commitId)
+                if (parts.Length < 3)
+                {
+                    Log.Warning("GitRepositoryInfo: Invalid Git external link format (new). Expected at least 3 parts separated by /, but got {count} parts. Link: {link}", parts.Length, gitExternalLink.LinkedArtifactUri);
+                    return null;
+                }
+                
+                // New format: projectName/repoName/commitId
+                string repoName = parts[1];
+                commitID = parts[2];
+                
+                // Handle commit IDs that may contain additional slashes
+                for (int i = 3; i < parts.Length; i++)
+                {
+                    commitID += $"/{parts[i]}";
+                }
+                
+                // Look up repo by name instead of ID
+                gitRepo = (from g in possibleRepos 
+                          where string.Equals(g.Name, repoName, StringComparison.OrdinalIgnoreCase) 
+                          select g).SingleOrDefault();
+                
+                repoID = gitRepo?.Id.ToString();
             }
             
-            gitRepo =
-                (from g in possibleRepos where string.Equals(g.Id.ToString(), repoID, StringComparison.OrdinalIgnoreCase) select g)
-                .SingleOrDefault();
             return new TfsGitRepositoryInfo(commitID, repoID, gitRepo);
         }
 
