Fix conflict message when flows are blocked (#5473)

Author: dkurepa

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

@@ -61,10 +61,8 @@ public class ConflictInPrBranchException : DarcException
 
     public ConflictInPrBranchException(
             string failedMergeMessage,
-            string targetBranch,
-            string mappingName,
-            bool isForwardFlow)
-        : this(ParseResult(failedMergeMessage, mappingName, isForwardFlow), targetBranch)
+            string targetBranch)
+        : this(ParseResult(failedMergeMessage), targetBranch)
     {
     }
 
@@ -74,7 +72,7 @@ public ConflictInPrBranchException(IReadOnlyCollection<string> conflictedFiles,
         ConflictedFiles = conflictedFiles;
     }
 
-    private static List<string> ParseResult(string failureException, string mappingName, bool isForwardFlow)
+    private static List<string> ParseResult(string failureException)
     {
         List<string> filesInConflict = [];
         var errors = failureException.Split(Environment.NewLine);
@@ -91,16 +89,7 @@ private static List<string> ParseResult(string failureException, string mappingN
             }
         }
 
-        if (isForwardFlow)
-        {
-            // Convert VMR paths to normal repo paths, for example src/repo/file.cs -> file.cs
-            return [..filesInConflict.Select(file => file.Split('/', 3)[2]).Distinct()];
-        }
-        else
-        {
-            // If we're backflowing, the file paths are already normalized
-            return [..filesInConflict.Distinct().Select(file => $"src/{mappingName}/{file}")];
-        }
+        return [..filesInConflict.Distinct()];
     }
 }
 

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

@@ -360,7 +360,7 @@ codeflowOptions with
                 if (headBranchExisted)
                 {
                     _logger.LogInformation("Failed to update a PR branch because of a conflict. Stopping the flow..");
-                    throw new ConflictInPrBranchException(e.Result.StandardError, codeflowOptions.TargetBranch, codeflowOptions.Mapping.Name, isForwardFlow: false);
+                    throw new ConflictInPrBranchException(e.Result.StandardError, codeflowOptions.TargetBranch);
                 }
 
                 // Otherwise, we have a conflicting change in the last backflow PR (before merging)

test/ProductConstructionService.DependencyFlow.Tests/PullRequestUpdaterTests.cs

@@ -586,9 +586,7 @@ protected void WithForwardFlowConflict(Mock<IRemote> remote, IReadOnlyCollection
                 ? new PatchApplicationLeftConflictsException(conflictedFiles, new NativePath(VmrPath))
                 : new ConflictInPrBranchException(
                     "error: patch failed: " + string.Join(Environment.NewLine + "error: patch failed: ", conflictedFiles),
-                    "branch",
-                    "repo",
-                    isForwardFlow: true));
+                    "branch"));
     }
 
     protected void AndShouldHavePullRequestCheckReminder(string? url = null)

tools/ProductConstructionService.ReproTool/Operations/Operation.cs

@@ -79,7 +79,7 @@ protected async Task<Build> CreateBuildAsync(string repositoryUrl, string branch
     protected async Task TriggerSubscriptionAsync(string subscriptionId, int buildId = 0)
     {
         logger.LogInformation("Triggering subscription {subscriptionId}", subscriptionId);
-        await localPcsApi.Subscriptions.TriggerSubscriptionAsync(buildId, force: false, Guid.Parse(subscriptionId));
+        await localPcsApi.Subscriptions.TriggerSubscriptionAsync(buildId, force: true, Guid.Parse(subscriptionId));
     }
 
     protected async Task<AsyncDisposableValue<string>> PrepareVmrForkAsync(string branch, bool skipCleanup)