Support `darc vmr reset` from the source repo by Copilot · Pull Request #6434 · dotnet/arcade-services

Copilot · 2026-06-23T10:50:59Z

darc vmr reset required an explicit [mapping]:[sha], unlike darc vmr forwardflow, which can infer context from the current source repo. This change aligns reset with that workflow so vmr-sync callers can invoke reset from the repo being synchronized and only provide --vmr.

CLI behavior
- Allow darc vmr reset to omit the positional target when invoked from a source repo.
- Resolve the mapping from the repo’s eng/Version.Details.xml <Source> tag.
- Resolve the target revision from the current repo HEAD.
Reset execution
- Add the current repo as an additional remote for the inferred mapping so reset can materialize the current commit into the target VMR.
- Keep existing explicit [mapping]:[sha], --build, and --channel flows unchanged.
Diagnostics
- Improve the failure path when the current directory is not a git repo or when the repo does not have a usable <Source> tag.

# before
darc vmr reset product-repo1:HEAD --vmr /path/to/vmr

# now
cd /path/to/product-repo1
darc vmr reset --vmr /path/to/vmr

#5973

dkurepa · 2026-06-23T12:39:13Z

 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Xml;


@copilot revert all changes to this project

Addressed in 195a0dd.

dkurepa · 2026-06-23T12:48:42Z

-            // Default behavior: Target is in the format [mapping]:[sha]
-            var parts = _options.Target.Split(':', 2);
-            if (parts.Length != 2)
+            currentRepositoryTarget = await TryResolveTargetFromCurrentRepositoryAsync();


@copilot let's flip it around. If target is provided, we use it. If it's not we look if we're in the repo and get the data from it

Addressed in aa5b235.

dkurepa · 2026-06-23T13:00:53Z

            // When --build or --channel is provided, Target should only be the mapping name
            mappingName = _options.Target;
+
+            if (string.IsNullOrWhiteSpace(mappingName))


@copilot let's move this check above assigning mappingName the target value

Addressed in 64b55f8.

Copilot

Pull request overview

Aligns darc vmr reset with darc vmr forwardflow by allowing reset to infer the target mapping and SHA from the current source repository context (so callers can run reset from the repo being synchronized and pass only --vmr).

Changes:

Makes Target positional argument optional for darc vmr reset and documents the inferred-default behavior.
Adds inference logic to resolve mapping from eng/Version.Details.xml <Source> and SHA from current repo HEAD when Target is omitted.
Adds the current repo path as an additional remote for the inferred mapping so reset can materialize the local commit into the VMR.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

File	Description
src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResetCommandLineOptions.cs	Makes `Target` optional and updates help text to describe inferred behavior.
src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResetOperation.cs	Implements target inference from the current repo and injects dependencies to read Version.Details and resolve HEAD SHA; adds an additional remote when inferred.

dkurepa · 2026-06-23T13:49:25Z

+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Could not resolve a git repository root from '{path}'", Environment.CurrentDirectory);
+            return null;
+        }


@copilot replace the logDebug with the suggestion provided in this comment

Updated in 79ce0c8.

+                if (currentRepositoryTarget == null)
+                {
+                    _logger.LogError(
+                        "Target must be provided as [mapping]:[sha], or the command must be run from a source repository with a VMR Source tag.");
+                    return Constants.ErrorCode;
+                }


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…vmr-reset

adamzip

LGTM

Initial plan

7ccc562

Copilot AI assigned Copilot and dkurepa Jun 23, 2026

Copilot started work on behalf of dkurepa June 23, 2026 10:51 View session

Copilot AI added 3 commits June 23, 2026 10:58

Implement repo-driven darc vmr reset

85c958a

Refine darc vmr reset inference

af12020

Tidy reset inference validation feedback

babb8bd

Copilot AI changed the title ~~[WIP] Support darc vmr reset outside of vmr directory~~ Support darc vmr reset from the source repo Jun 23, 2026

Copilot finished work on behalf of dkurepa June 23, 2026 11:04

Copilot AI requested a review from dkurepa June 23, 2026 11:04

dkurepa reviewed Jun 23, 2026

View reviewed changes

Copilot started work on behalf of dkurepa June 23, 2026 12:39 View session

Revert codeflow test project changes

195a0dd

Copilot finished work on behalf of dkurepa June 23, 2026 12:44

Copilot AI requested a review from dkurepa June 23, 2026 12:44

dkurepa reviewed Jun 23, 2026

View reviewed changes

Copilot started work on behalf of dkurepa June 23, 2026 12:49 View session

Prioritize explicit reset targets

aa5b235

Copilot finished work on behalf of dkurepa June 23, 2026 12:54

Copilot AI requested a review from dkurepa June 23, 2026 12:54

dkurepa reviewed Jun 23, 2026

View reviewed changes

Copilot started work on behalf of dkurepa June 23, 2026 13:01 View session

Move reset target validation earlier

64b55f8

Copilot finished work on behalf of dkurepa June 23, 2026 13:05

Copilot AI requested a review from dkurepa June 23, 2026 13:05

dkurepa marked this pull request as ready for review June 23, 2026 13:20

Copilot AI review requested due to automatic review settings June 23, 2026 13:20

Copilot started reviewing on behalf of dkurepa June 23, 2026 13:20 View session

Copilot AI reviewed Jun 23, 2026

View reviewed changes

Potential fix for pull request finding

82f64cd

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot started work on behalf of dkurepa June 23, 2026 13:49 View session

Improve reset git-root diagnostics

79ce0c8

dkurepa reviewed Jun 23, 2026

View reviewed changes

Comment thread src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResetOperation.cs Outdated

Copilot AI requested a review from dkurepa June 23, 2026 13:58

Copilot finished work on behalf of dkurepa June 23, 2026 13:58

Copilot started work on behalf of dkurepa June 23, 2026 13:58 View session

Remove extra debug log in reset target resolver

d5e1c9d

Copilot finished work on behalf of dkurepa June 23, 2026 14:05

adamzip reviewed Jun 24, 2026

View reviewed changes

Comment thread src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/ResetCommandLineOptions.cs Outdated

Merge remote-tracking branch 'source/main' into copilot/support-darc-…

040a01b

…vmr-reset

adamzip reviewed Jun 24, 2026

View reviewed changes

Comment thread src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResetOperation.cs Outdated

make vmr reset work similar to forwardflow

a747fa3

adamzip approved these changes Jun 26, 2026

View reviewed changes

Uh oh!

Conversation

Copilot AI commented Jun 23, 2026 • edited by dkurepa Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dkurepa Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

dkurepa Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

dkurepa Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

dkurepa Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamzip left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Jun 23, 2026 •

edited by dkurepa

Loading