Implement a naive backflow conflict resolution strategy (#4343)

dotnet · Jan 21, 2025 · c64a725 · c64a725
1 parent 3c5ee43
commit c64a725
Show file tree

Hide file tree

Showing 15 changed files with 548 additions and 510 deletions.
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/BackFlowConflictResolver.cs b/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/BackFlowConflictResolver.cs
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/CodeFlowConflictResolver.cs b/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/CodeFlowConflictResolver.cs
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/ForwardFlowConflictResolver.cs b/src/Microsoft.DotNet.Darc/DarcLib/Conflicts/ForwardFlowConflictResolver.cs
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Helpers/IDependencyFileManager.cs b/src/Microsoft.DotNet.Darc/DarcLib/Helpers/IDependencyFileManager.cs
@@ -54,7 +54,7 @@ Task<GitFileContentContainer> UpdateDependencyFiles(
         IEnumerable<DependencyDetail> itemsToUpdate,
         SourceDependency? sourceDependency,
         string repoUri,
-        string branch,
+        string? branch,
         IEnumerable<DependencyDetail> oldDependencies,
         SemanticVersion? incomingDotNetSdkVersion);
 

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Local.cs b/src/Microsoft.DotNet.Darc/DarcLib/Local.cs
@@ -57,7 +57,7 @@ public async Task AddDependencyAsync(DependencyDetail dependency)
     ///     Updates existing dependencies in the dependency files
     /// </summary>
     /// <param name="dependencies">Dependencies that need updates.</param>
-    public async Task UpdateDependenciesAsync(List<DependencyDetail> dependencies, IRemoteFactory remoteFactory, IGitRepoFactory gitRepoFactory, IBarApiClient barClient)
+    public async Task UpdateDependenciesAsync(List<DependencyDetail> dependencies, IRemoteFactory remoteFactory, IGitRepoFactory gitRepoFactory, IBasicBarClient barClient)
     {
         // Read the current dependency files and grab their locations so that nuget.config can be updated appropriately.
         // Update the incoming dependencies with locations.

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs b/src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs
@@ -42,7 +42,7 @@ public LocalGitClient(
         _logger = logger;
     }
 
-    public async Task<string> GetFileContentsAsync(string relativeFilePath, string repoPath, string branch)
+    public async Task<string> GetFileContentsAsync(string relativeFilePath, string repoPath, string? branch)
     {
         // Load non-working-tree version
         if (!string.IsNullOrEmpty(branch))

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrBackFlower.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrBackFlower.cs
@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using LibGit2Sharp;
-using Microsoft.DotNet.DarcLib.Conflicts;
 using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
 using Microsoft.DotNet.ProductConstructionService.Client.Models;
@@ -61,10 +60,9 @@ public PcsVmrBackFlower(
             ILocalLibGit2Client libGit2Client,
             ICoherencyUpdateResolver coherencyUpdateResolver,
             IAssetLocationResolver assetLocationResolver,
-            IBackFlowConflictResolver conflictResolver,
             IFileSystem fileSystem,
             ILogger<VmrCodeFlower> logger)
-        : base(vmrInfo, sourceManifest, dependencyTracker, dependencyFileManager, vmrCloneManager, repositoryCloneManager, localGitClient, localGitRepoFactory, versionDetailsParser, vmrPatchHandler, workBranchFactory, basicBarClient, libGit2Client, coherencyUpdateResolver, assetLocationResolver, conflictResolver, fileSystem, logger)
+        : base(vmrInfo, sourceManifest, dependencyTracker, dependencyFileManager, vmrCloneManager, repositoryCloneManager, localGitClient, localGitRepoFactory, versionDetailsParser, vmrPatchHandler, workBranchFactory, basicBarClient, libGit2Client, coherencyUpdateResolver, assetLocationResolver, fileSystem, logger)
     {
         _sourceManifest = sourceManifest;
         _dependencyTracker = dependencyTracker;

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrForwardFlower.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrForwardFlower.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.DotNet.DarcLib.Conflicts;
 using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
 using Microsoft.DotNet.ProductConstructionService.Client.Models;
@@ -46,20 +45,15 @@ public PcsVmrForwardFlower(
         IVmrUpdater vmrUpdater,
         IVmrDependencyTracker dependencyTracker,
         IVmrCloneManager vmrCloneManager,
-        IDependencyFileManager dependencyFileManager,
         IRepositoryCloneManager repositoryCloneManager,
         ILocalGitClient localGitClient,
-        ILocalLibGit2Client libGit2Client,
         IBasicBarClient basicBarClient,
         ILocalGitRepoFactory localGitRepoFactory,
         IVersionDetailsParser versionDetailsParser,
         IProcessManager processManager,
-        ICoherencyUpdateResolver coherencyUpdateResolver,
-        IAssetLocationResolver assetLocationResolver,
-        IForwardFlowConflictResolver conflictResolver,
         IFileSystem fileSystem,
         ILogger<VmrCodeFlower> logger)
-        : base(vmrInfo, sourceManifest, vmrUpdater, dependencyTracker, vmrCloneManager, dependencyFileManager, localGitClient, libGit2Client, basicBarClient, localGitRepoFactory, versionDetailsParser, processManager, coherencyUpdateResolver, assetLocationResolver, conflictResolver, fileSystem, logger)
+        : base(vmrInfo, sourceManifest, vmrUpdater, dependencyTracker, vmrCloneManager, localGitClient, basicBarClient, localGitRepoFactory, versionDetailsParser, processManager, fileSystem, logger)
     {
         _sourceManifest = sourceManifest;
         _dependencyTracker = dependencyTracker;