Fix E2E code flow tests (fetching refs, updating version files)

docs/DevGuide.md

@@ -17,6 +17,7 @@
       ('https://github.com/maestro-auth-test/maestro-test', 289474),
       ('https://github.com/maestro-auth-test/maestro-test2', 289474),
       ('https://github.com/maestro-auth-test/maestro-test3', 289474),
+      ('https://github.com/maestro-auth-test/maestro-test-vmr', 289474),
       ('https://github.com/maestro-auth-test/arcade', 289474),
       ('https://github.com/maestro-auth-test/dnceng-vmr', 289474);
   ```

src/Microsoft.DotNet.Darc/DarcLib/ILocalGitClient.cs

@@ -140,6 +140,14 @@ Task CommitAsync(
     /// <returns>List of currently modified staged files</returns>
     Task<string[]> GetStagedFiles(string repoPath);
 
+    /// <summary>
+    ///     Determines if a given path is a git repository.
+    /// </summary>
+    /// <param name="repoPath">Path to a git repository</param>
+    /// <param name="gitRef">Git reference to check for</param>
+    /// <returns>True if the path is a git repository, false otherwise</returns>
+    Task<bool> GitRefExists(string repoPath, string gitRef, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Fetches from all remotes.
     /// </summary>

src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs

@@ -22,6 +22,8 @@ namespace Microsoft.DotNet.DarcLib;
 /// </summary>
 public class LocalGitClient : ILocalGitClient
 {
+    private static readonly Regex ShaRegex = new(@"^[0-9a-fA-F]{40}$", RegexOptions.Compiled);
+
     private readonly IRemoteTokenProvider _remoteConfiguration;
     private readonly ITelemetryRecorder _telemetryRecorder;
     private readonly IProcessManager _processManager;
@@ -210,7 +212,6 @@ public async Task<GitObjectType> GetObjectTypeAsync(string repoPath, string obje
         };
 
         var result = await _processManager.ExecuteGit(repoPath, args);
-        result.ThrowIfFailed($"Failed to find object {objectSha} in {repoPath}");
 
         return result.StandardOutput.Trim() switch
         {
@@ -443,6 +444,22 @@ public async Task<string> BlameLineAsync(string repoPath, string relativeFilePat
         return result.StandardOutput.Trim().Split(' ').First();
     }
 
+    public async Task<bool> GitRefExists(string repoPath, string gitRef, CancellationToken cancellationToken = default)
+    {
+        // If the ref is a SHA, we can check it directly via git cat-file -t
+        if (ShaRegex.IsMatch(gitRef))
+        {
+            var objectType = await GetObjectTypeAsync(repoPath, gitRef);
+            return objectType != GitObjectType.Unknown;
+        }
+
+        // If it's a branch name, we need to scan all fetched remotes too
+        // git cat-file -t doesn't work because we would have to query for [remote name]/gitRef
+        var result = await RunGitCommandAsync(repoPath, ["branch", "-a", "--list", "*/" + gitRef], cancellationToken);
+        result.ThrowIfFailed($"Failed to verify if git ref '{gitRef}' exists in {repoPath}");
+        return result.StandardOutput.Contains(gitRef);
+    }
+
     public async Task<bool> HasWorkingTreeChangesAsync(string repoPath)
     {
         var result = await _processManager.ExecuteGit(repoPath, ["diff", "--exit-code"]);

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CloneManager.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using LibGit2Sharp;
@@ -79,14 +80,13 @@ protected async Task<ILocalGitRepo> PrepareCloneInternalAsync(
             var missingCommit = false;
 
             // Verify that all requested commits are available
-            foreach (string commit in refsToVerify.ToArray())
+            foreach (string gitRef in refsToVerify.ToArray())
             {
                 try
                 {
-                    var objectType = await _localGitRepo.GetObjectTypeAsync(path, commit);
-                    if (objectType == GitObjectType.Commit)
+                    if (await _localGitRepo.GitRefExists(path, gitRef, cancellationToken))
                     {
-                        refsToVerify.Remove(commit);
+                        refsToVerify.Remove(gitRef);
                     }
                 }
                 catch

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrDependencyTracker.cs

@@ -45,7 +45,6 @@ public class VmrDependencyTracker : IVmrDependencyTracker
 {
     private readonly AllVersionsPropsFile _repoVersions;
     private readonly ISourceManifest _sourceManifest;
-    private readonly LocalPath _allVersionsFilePath;
     private readonly IVmrInfo _vmrInfo;
     private readonly IFileSystem _fileSystem;
     private readonly ISourceMappingParser _sourceMappingParser;
@@ -63,7 +62,6 @@ public VmrDependencyTracker(
         ISourceManifest sourceManifest)
     {
         _vmrInfo = vmrInfo;
-        _allVersionsFilePath = vmrInfo.VmrPath / VmrInfo.GitInfoSourcesDir / AllVersionsPropsFile.FileName;
         _sourceManifest = sourceManifest;
         _repoVersions = new AllVersionsPropsFile(sourceManifest.Repositories);
         _fileSystem = fileSystem;
@@ -94,7 +92,7 @@ public async Task InitializeSourceMappings(string? sourceMappingsPath = null)
     public void UpdateDependencyVersion(VmrDependencyUpdate update)
     {
         _repoVersions.UpdateVersion(update.Mapping.Name, update.TargetRevision, update.TargetVersion);
-        _repoVersions.SerializeToXml(_allVersionsFilePath);
+        _repoVersions.SerializeToXml(_vmrInfo.AllVersionsFilePath);
 
         _sourceManifest.UpdateVersion(update.Mapping.Name, update.RemoteUri, update.TargetRevision, update.TargetVersion);
         _fileSystem.WriteToFile(_vmrInfo.SourceManifestPath, _sourceManifest.ToJson());
@@ -126,7 +124,7 @@ public bool RemoveRepositoryVersion(string repo)
 
         if (_repoVersions.DeleteVersion(repo))
         {
-            _repoVersions.SerializeToXml(_allVersionsFilePath);
+            _repoVersions.SerializeToXml(_vmrInfo.AllVersionsFilePath);
             hasChanges = true;
         }
 

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrInfo.cs

@@ -59,6 +59,11 @@ public interface IVmrInfo
     /// Gets a full path leading to sources belonging to a given repo
     /// </summary>
     NativePath GetRepoSourcesPath(string mappingName);
+
+    /// <summary>
+    /// Path to the AllRepoVersions.props
+    /// </summary>
+    NativePath AllVersionsFilePath { get; }
 }
 
 public class VmrInfo : IVmrInfo
@@ -137,4 +142,6 @@ public VmrInfo(NativePath vmrPath, NativePath tmpPath)
     public static UnixPath GetRelativeRepoSourcesPath(string mappingName) => RelativeSourcesDir / mappingName;
 
     public NativePath SourceManifestPath { get; private set; }
+
+    public NativePath AllVersionsFilePath => VmrPath / GitInfoSourcesDir / AllVersionsPropsFile.FileName;
 }

src/ProductConstructionService/ProductConstructionService.WorkItems/ReminderManager.cs

@@ -50,7 +50,8 @@ public async Task UnsetReminderAsync(bool isCodeFlow)
         {
             await client.DeleteWorkItemAsync(receipt.MessageId, receipt.PopReceipt);
         }
-        catch (RequestFailedException e) when (e.Message.Contains("The specified message does not exist") || e.Message.Contains("did not match the pop receipt"))
+        catch (RequestFailedException e) when (e.Message.Contains("The specified message does not exist")
+                                            || e.Message.Contains("did not match the pop receipt"))
         {
             // The message was already deleted, so we can ignore this exception.
         }

src/ProductConstructionService/Readme.md

@@ -17,6 +17,7 @@
       ('https://github.com/maestro-auth-test/maestro-test', 289474),
       ('https://github.com/maestro-auth-test/maestro-test2', 289474),
       ('https://github.com/maestro-auth-test/maestro-test3', 289474),
+      ('https://github.com/maestro-auth-test/maestro-test-vmr', 289474),
       ('https://github.com/maestro-auth-test/arcade', 289474),
       ('https://github.com/maestro-auth-test/dnceng-vmr', 289474);
   ```