Skip to content

Allow Restore to discard pending changes #6330

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

Merged
scbedd merged 6 commits into from
Jun 14, 2023
Merged

Allow Restore to discard pending changes #6330

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31b24f7
allow restoring of a tag when changes have already been made
scbedd Jun 13, 2023
96862d6
integrate CheckoutRepoAtconfig with Clean. this simplifies the code a…
scbedd Jun 13, 2023
1492bad
Update tools/test-proxy/Azure.Sdk.Tools.TestProxy/Store/GitStore.cs
scbedd Jun 13, 2023
f960725
ensure that reset properly discards
scbedd Jun 14, 2023
ad4aaf8
add test for scenario this PR is adding
scbedd Jun 14, 2023
d444877
remove inaccurate comment
scbedd Jun 14, 2023
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
31 changes: 21 additions & 10 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy/Store/GitStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,7 @@ public async Task Reset(string pathToAssetsJson)

if (allowReset)
{
try
{
GitHandler.Run("checkout *", config);
GitHandler.Run("clean -xdf", config);
}
catch(GitProcessException e)
{
HideOrigin(config);
throw GenerateInvokeException(e.Result);
}
Clean(config);

if (!string.IsNullOrWhiteSpace(config.Tag))
{
Expand All @@ -235,6 +226,20 @@ public async Task Reset(string pathToAssetsJson)
HideOrigin(config);
}

private void Clean(GitAssetsConfiguration config)
{
try
{
GitHandler.Run("checkout *", config);
GitHandler.Run("clean -xdf", config);
}
catch (GitProcessException e)
{
HideOrigin(config);
throw GenerateInvokeException(e.Result);
}
}

/// <summary>
/// Given a CommandResult, generate an HttpException.
/// </summary>
Expand Down Expand Up @@ -299,10 +304,16 @@ private void HideOrigin(GitAssetsConfiguration config)
/// <param name="config"></param>
public void CheckoutRepoAtConfig(GitAssetsConfiguration config)
{
// we are already on a targeted tag and as such don't want to discard our recordings
if (Assets.TryGetValue(config.AssetsJsonRelativeLocation.ToString(), out var value) && value == config.Tag)
{
return;
}
// if we are NOT on our targeted tag, before we attempt to switch we need to reset without asking for permission
else
{
Clean(config);
}

var checkoutPaths = ResolveCheckoutPaths(config);

Expand Down