Add `darc vmr resolve` operation #5391

adamzip · 2025-10-21T09:23:19Z

Add new parameters to TrackedPullRequest DTO
Create a darc vmr resolve command that validates PR state, locally cloned repos, and attempts to flow the next build to flow using the rebase strategy.
Move the implementations of backflow and forward flow to the parent operation (vmr codeflow operation) and reuse it in the vmr resolve operation

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

Copilot

Pull Request Overview

This PR implements the darc vmr resolve command to help users resolve codeflow conflicts encountered by Maestro. The command validates PR state, verifies local repository configurations, and attempts to flow the next build using the rebase strategy.

Key Changes:

Added HeadBranch and NextBuildsToApply fields to the TrackedPullRequest API model for conflict resolution
Refactored forward flow and backflow implementations from child operations into the parent CodeFlowOperation class for reuse
Implemented the new ResolveOperation with comprehensive validations for subscription state, local repositories, and branch alignment

Reviewed Changes

Copilot reviewed 8 out of 10 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
`PullRequestController.cs`	Adds two new fields to TrackedPullRequest DTO and refactors duplicate code into a helper method
`LocalGitClient.cs`	Adds validation method to check for clean working directory (no conflicts or uncommitted changes)
`Local.cs`	Adds methods to retrieve source dependency and source manifest from local repositories
`ResolveCommandLineOptions.cs`	Defines command-line options for the new resolve command
`ResolveOperation.cs`	Implements the resolve operation with validation logic and codeflow execution
`ForwardFlowOperation.cs`	Removes FlowCodeAsync implementation, now uses parent class implementation
`CodeFlowOperation.cs`	Moves FlowForwardAsync and FlowBackAsync implementations from child classes
`BackflowOperation.cs`	Removes FlowCodeAsync implementation, now uses parent class implementation

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

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveOperation.cs

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

premun · 2025-10-21T12:58:23Z

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

+    private async Task ValidateLocalVmr(Subscription subscription)
+    {
+        var mappingName = string.IsNullOrEmpty(subscription.TargetDirectory)
+            ? subscription.SourceDirectory
+            : subscription.TargetDirectory;
+
+        var local = new Local(_options.GetRemoteTokenProvider(), _logger);
+
+        SourceManifest sourceManifest;
+        try
+        {
+            sourceManifest = await local.GetSourceManifestAsync(_vmrInfo.VmrPath);
+        }
+        catch (DependencyFileNotFoundException)
+        {
+            throw new DarcException("Could not find file `src/source-manifest.json` at the following" +
+                $"git repository: `{_vmrInfo.VmrPath}`. Please make sure it is a correct path to the VMR.");
+        }
+
+        if (!sourceManifest.Repositories.Any(repo => repo.Path.Equals(mappingName)))
+        {
+            throw new DarcException($"Could not find repo with name '{mappingName}' in the source-manifest.json" +
+                $" at the following git repository: `{_vmrInfo.VmrPath}. Please make sure it is a correct path to" +
+                " the VMR and that the mapping exists.");
+        }
+    }


I think this is a bit useless. If you call RefreshMetadata on the IDependencyTracker, it will do all this and throw an exception.
You need to call that one anyway to load the source mappings.

Have a look at the CheckoutAsync in VmrCloneManager.

The exception from RefreshMetaData() will likely be something like a "file not found" exception when trying to read source-manifest, right?
Instead, this validation provides a sensible message to the user that explains what the cause might be (maybe he is running the command from the wrong folder), and a suggestion for how to move next (make sure you run it from the correct target repo of the subscription)

Probably, but why re-implement what it does instead of catching that exception and turning it into your own more approchable user-friendly one?

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResolveCommandLineOptions.cs

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResolveConflictCommandLineOptions.cs

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

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

premun

@adamzip I fail to see where we clone the source repos - does that happen naturally inside the codeflowers?

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResolveConflictCommandLineOptions.cs

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

…lveOperation.cs Co-authored-by: Copilot <[email protected]>

premun · 2025-10-31T11:59:57Z

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/CodeFlowOperation.cs

+                excludedAssets: excludedAssets,
+                headBranch,
+                headBranch,
+                targetRepoUri ?? _vmrInfo.VmrPath,


Can you take this from my branch?

If targetRepoUri is null, we'd just put there the first remote we find in the VMR dir:

var vmr = _localGitRepoFactory.Create(_vmrInfo.VmrPath); (await vmr.GetRemotesAsync()).First().Uri

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ForwardFlowOperation.cs

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/BackflowOperation.cs

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

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

premun

All looks good now, just some wording nits. Please give it a test locally and we can merge

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

…lveConflictOperation.cs Co-authored-by: Přemek Vysoký <[email protected]>

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs

This reverts commit 43e6774.

This reverts commit 49dacaf.

premun

@adamzip please also change the rebase scenario tests to use the new command (and then please run them locally to make sure they go green).

Also when doing so, I think they account for the fact the codeflow commands don't return 0 when conflicts are hit so we have a try/catch there but with your command, we should not expect failures so the try/catch can go.

premun · 2025-11-05T09:01:22Z

I tried that out and it went green

adamzip commented Oct 21, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs Outdated Show resolved Hide resolved

adamzip force-pushed the darc-vmr-resolve branch 3 times, most recently from 5f859f5 to aeb22c3 Compare October 21, 2025 09:52

adamzip marked this pull request as ready for review October 21, 2025 12:21

Copilot AI review requested due to automatic review settings October 21, 2025 12:21

Copilot AI reviewed Oct 21, 2025

View reviewed changes

adamzip requested review from dkurepa and premun October 21, 2025 12:31

adamzip changed the title ~~darc vmr resolve~~ Add darc vmr resolve operation Oct 21, 2025

adamzip commented Oct 21, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

premun reviewed Oct 21, 2025

View reviewed changes

dkurepa reviewed Oct 22, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

dkurepa reviewed Oct 22, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

dkurepa reviewed Oct 22, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

premun reviewed Oct 22, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

premun reviewed Oct 22, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

adamzip force-pushed the darc-vmr-resolve branch 2 times, most recently from 670ddee to 96229d8 Compare October 23, 2025 11:03

premun reviewed Oct 23, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResolveConflictCommandLineOptions.cs Outdated Show resolved Hide resolved

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

adamzip and others added 10 commits October 30, 2025 16:30

darc vmr resolve

a32adcf

update swagger spec

2a678f4

Update src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/Reso…

5cfbba9

…lveOperation.cs Co-authored-by: Copilot <[email protected]>

Update src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/Reso…

626a213

…lveOperation.cs Co-authored-by: Copilot <[email protected]>

Update src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/Reso…

da18ecd

…lveOperation.cs Co-authored-by: Copilot <[email protected]>

Update src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/Reso…

9292f32

…lveOperation.cs Co-authored-by: Copilot <[email protected]>

Apply suggestion from @adamzip

8a75749

remove unused method

49c8ddd

Rename operation

27e28f9

CR changes #1

d94f6f5

premun and others added 4 commits October 30, 2025 16:31

Register command in DI

7f06d05

Add PR operations to BAR API client

05f2e27

Fix VMR/repo cloning

2c81aea

set correct vmr Uri in resolve-conflict FF

75a3927

adamzip force-pushed the darc-vmr-resolve branch from 1b2c320 to 75a3927 Compare October 31, 2025 11:56

premun reviewed Oct 31, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ForwardFlowOperation.cs Outdated Show resolved Hide resolved

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/BackflowOperation.cs Outdated Show resolved Hide resolved

premun reviewed Oct 31, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

premun reviewed Oct 31, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/DarcLib/IBarApiClient.cs Outdated Show resolved Hide resolved

adamzip added 3 commits October 31, 2025 16:30

Fix indentation + simplify build query

1605510

remove whitespace changes

469d23e

Remove branch validation

90ea17a

premun previously approved these changes Nov 3, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

Update src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/Reso…

7237026

…lveConflictOperation.cs Co-authored-by: Přemek Vysoký <[email protected]>

adamzip dismissed premun’s stale review via 7237026 November 3, 2025 11:17

specify num of conflicted files

ba7a919

premun reviewed Nov 3, 2025

View reviewed changes

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResolveConflictOperation.cs Outdated Show resolved Hide resolved

adamzip and others added 7 commits November 3, 2025 14:20

conflicted files fix

927e942

Commit changes in PCS while rebasing without conflicts

de6eba0

Integrate changes from rebase e2e tests

49dacaf

fix merge errors

43e6774

Revert "fix merge errors"

67d66a8

This reverts commit 43e6774.

Revert "Integrate changes from rebase e2e tests"

2242398

This reverts commit 49dacaf.

merge changes from main

a4c567b

premun reviewed Nov 5, 2025

View reviewed changes

Use the new command in the rebase scenario tests

335a753

premun approved these changes Nov 5, 2025

View reviewed changes

pavel-purma approved these changes Nov 5, 2025

View reviewed changes

adamzip merged commit 866ebe2 into dotnet:main Nov 5, 2025
8 of 9 checks passed

Add darc vmr resolve operation #5391

Add darc vmr resolve operation #5391

Conversation

adamzip commented Oct 21, 2025

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

premun Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

adamzip Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

premun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

premun Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

premun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

premun left a comment

Choose a reason for hiding this comment

Uh oh!

premun commented Nov 5, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Add `darc vmr resolve` operation #5391

Add `darc vmr resolve` operation #5391

premun Oct 23, 2025 •

edited

Loading