Detect and abort non-linear codeflows#5195
Merged
premun merged 4 commits intodotnet:mainfrom Aug 26, 2025
Merged
Conversation
premun
commented
Aug 25, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR implements detection and prevention of non-linear codeflows in the VMR (Virtual Mono Repository) system to address issue #4973. The changes ensure that commits being flowed maintain a linear history relative to previously flown commits, preventing potential merge conflicts and repository inconsistencies.
Key changes include:
- Addition of linearity verification logic for both forward and backward flows
- Creation of a new
NonLinearCodeflowExceptionto handle violation cases - Comprehensive test coverage for both forward flow and backflow scenarios
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| GitOperationsHelper.cs | Added CreateBranch helper method for test setup |
| ForwardFlowTests.cs | Added test to verify detection of non-linear forward flows |
| BackflowTests.cs | Added test to verify detection of double backflows into same branch |
| VmrForwardFlower.cs | Implemented linearity verification for forward flows |
| VmrCodeflower.cs | Added abstract method and call to verify codeflow linearity |
| VmrBackflower.cs | Implemented linearity verification for backflows |
| Exceptions.cs | Added NonLinearCodeflowException class |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs
Outdated
Show resolved
Hide resolved
dkurepa
reviewed
Aug 25, 2025
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrBackflower.cs
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR implements detection and prevention of non-linear codeflows in the VMR (Virtual Mono Repository) system to ensure code changes flow in a proper linear sequence.
- Adds linearity verification to prevent flowing commits that are not descendants of previously flown commits
- Introduces a new
NonLinearCodeflowExceptionto handle non-linear flow scenarios - Implements abstract method for linearity verification in both forward and backflow operations
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
test/Microsoft.DotNet.DarcLib.Codeflow.Tests/Helpers/GitOperationsHelper.cs |
Adds CreateBranch helper method for test scenarios |
test/Microsoft.DotNet.DarcLib.Codeflow.Tests/ForwardFlowTests.cs |
Adds test for detecting non-linear forward flow scenarios |
test/Microsoft.DotNet.DarcLib.Codeflow.Tests/BackflowTests.cs |
Adds test for detecting double backflow scenarios |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs |
Implements linearity verification for forward flows |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrCodeflower.cs |
Adds abstract method and calls linearity verification |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrBackflower.cs |
Implements linearity verification for backflows |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/Exceptions.cs |
Defines new exception for non-linear codeflow scenarios |
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrCodeflower.cs
Outdated
Show resolved
Hide resolved
adamzip
reviewed
Aug 25, 2025
adamzip
previously approved these changes
Aug 26, 2025
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrBackflower.cs
Outdated
Show resolved
Hide resolved
adamzip
approved these changes
Aug 26, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#4973