Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly reset PCS branches during codeflow #4348

Merged
merged 11 commits into from
Jan 22, 2025
Merged

Properly reset PCS branches during codeflow #4348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb6dc17
Reset branches when preparing vmr/repo branch
dkurepa Jan 20, 2025
3c7c8a4
add comments, some small things
dkurepa Jan 20, 2025
7f3b6ca
nit
dkurepa Jan 20, 2025
d764452
resolve comments, revert change to VmrCloneManager so we can have mul…
dkurepa Jan 21, 2025
1799111
fix failing tests
dkurepa Jan 21, 2025
1b2d5a9
resole comments, fix build
dkurepa Jan 21, 2025
f96a231
Add e2e test for repo clone reseting
dkurepa Jan 21, 2025
4df18eb
resolve more comments
dkurepa Jan 21, 2025
70941db
fix tests
dkurepa Jan 21, 2025
2fe7769
nit
dkurepa Jan 21, 2025
5945d23
configure git before running repo cloning test
dkurepa Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/RepositoryCloneManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ public async Task<ILocalGitRepo> PrepareCloneAsync(
}

var repo = await PrepareCloneInternalAsync(mapping.Name, remoteUris, [checkoutRef], checkoutRef, resetToRemote, cancellationToken);
await repo.CheckoutAsync(checkoutRef);
return repo;
}

Expand All @@ -116,7 +115,6 @@ public async Task<ILocalGitRepo> PrepareCloneAsync(
// We store clones in directories named as a hash of the repo URI
var cloneDir = StringUtils.GetXxHash64(repoUri);
var repo = await PrepareCloneInternalAsync(cloneDir, [repoUri], [checkoutRef], checkoutRef, resetToRemote, cancellationToken);
await repo.CheckoutAsync(checkoutRef);
return repo;
}

Expand Down
5 changes: 2 additions & 3 deletions test/Microsoft.DotNet.Darc.VirtualMonoRepo.E2E.Tests/VmrRepositoryCloningTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ public async Task RepositoryBranchShouldResetToRemote(bool resetToRemote)

// We advance the clone one commit ahead to see if it rewinds back with the reset
File.WriteAllText(filePath, "new content");
await oldClone.StageAsync(["."]);
await oldClone.CommitAsync("Change test file", false);
await GitOperations.CommitAll(oldClone.Path, "Change test file");

var localCommit = await GitOperations.GetRepoLastCommit(oldClone.Path);
var localCommit = await oldClone.GetShaForRefAsync(branchName);
var localFileContent = File.ReadAllText(filePath);
localCommit.Should().NotBe(remoteCommit);
localFileContent.Should().NotBe(remoteFileContent);
Expand Down
16 changes: 15 additions & 1 deletion test/Microsoft.DotNet.DarcLib.Tests/VirtualMonoRepo/RepositoryCloneManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public void SetUp()
{
ExitCode = 0,
}));
_localGitRepo.Setup(x => x.GitRefExists(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(true);
_localGitRepoFactory
.Setup(x => x.Create(It.IsAny<NativePath>()))
.Returns((NativePath path) => new LocalGitRepo(path, _localGitRepo.Object, Mock.Of<IProcessManager>()));
Expand Down Expand Up @@ -157,7 +159,7 @@ void ResetCalls()
}

// Clone for the first time
var clone = await _manager.PrepareCloneAsync(mapping, new[] { mapping.DefaultRemote }, "main", default);
var clone = await _manager.PrepareCloneAsync(mapping, [mapping.DefaultRemote], "main", default);
clone.Path.Should().Be(clonePath);

_repoCloner.Verify(x => x.CloneNoCheckoutAsync(mapping.DefaultRemote, clonePath, null), Times.Once);
Expand All @@ -176,6 +178,10 @@ void ResetCalls()

// A third clone with a new remote
ResetCalls();
// We want to make it so we don't find all requested refs in the first remote
_localGitRepo.SetupSequence(x => x.GitRefExists(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(false)
.ReturnsAsync(true);
clone = await _manager.PrepareCloneAsync(mapping, new[] { mapping.DefaultRemote, newRemote }, Ref, default);

clone.Path.Should().Be(clonePath);
Expand All @@ -187,6 +193,10 @@ void ResetCalls()

// Same again, should be cached
ResetCalls();
// We want to make it so we don't find all requested refs in the first remote
_localGitRepo.SetupSequence(x => x.GitRefExists(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(false)
.ReturnsAsync(true);
clone = await _manager.PrepareCloneAsync(mapping, new[] { mapping.DefaultRemote, newRemote }, Ref + "3", default);

clone.Path.Should().Be(clonePath);
Expand All @@ -198,6 +208,8 @@ void ResetCalls()

// Call with URI directly
ResetCalls();
_localGitRepo.SetupSequence(x => x.GitRefExists(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(true);
clone = await _manager.PrepareCloneAsync(RepoUri, Ref + "4", default);

clone.Path.Should().Be(clonePath);
Expand All @@ -209,6 +221,8 @@ void ResetCalls()

// Call with the second URI directly
ResetCalls();
_localGitRepo.SetupSequence(x => x.GitRefExists(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(true);
clone = await _manager.PrepareCloneAsync(newRemote, Ref + "5", default);

clone.Path.Should().Be(clonePath);
Expand Down