Fix repository fetching possibly not fetching all tags

This commit is contained in:
Jordan Dominion
2023-11-11 21:31:07 -05:00
parent 7cada26bdf
commit 30293c3e39
2 changed files with 79 additions and 2 deletions
@@ -450,6 +450,7 @@ namespace Tgstation.Server.Host.Components.Repository
OnTransferProgress = TransferProgressHandler(progressReporter.CreateSection("Fetch Origin", 1.0), cancellationToken),
OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested,
CredentialsProvider = credentialsProvider.GenerateCredentialsHandler(username, password),
TagFetchMode = TagFetchMode.All,
},
"Fetch origin commits");
}
+78 -2
View File
@@ -1,8 +1,11 @@
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using LibGit2Sharp;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -28,7 +31,7 @@ namespace Tgstation.Server.Tests
{
LibGit2Sharp.Repository.Clone("https://github.com/Cyberboss/test", tempPath);
var libGit2Repo = new LibGit2Sharp.Repository(tempPath);
using var repo = new Repository(
using var repo = new Host.Components.Repository.Repository(
libGit2Repo,
new LibGit2Commands(),
Mock.Of<IIOManager>(),
@@ -36,7 +39,7 @@ namespace Tgstation.Server.Tests
Mock.Of<ICredentialsProvider>(),
Mock.Of<IPostWriteHandler>(),
Mock.Of<IGitRemoteFeaturesFactory>(),
Mock.Of<ILogger<Repository>>(),
Mock.Of<ILogger<Host.Components.Repository.Repository>>(),
new GeneralConfiguration(),
() => { });
@@ -56,5 +59,78 @@ namespace Tgstation.Server.Tests
CancellationToken.None);
}
}
[TestMethod]
public async Task TestFetchingAdditionalCommits()
{
var tempPath = Path.Combine(Path.GetTempPath(), "TGS-Repository-Integration-Test", Guid.NewGuid().ToString());
var repoFac =
new LibGit2RepositoryFactory(
Mock.Of<ILogger<LibGit2RepositoryFactory>>());
var commands = new LibGit2Commands();
using var manager = new RepositoryManager(
repoFac,
commands,
new ResolvingIOManager(
new DefaultIOManager(),
tempPath),
Mock.Of<IEventConsumer>(),
new WindowsPostWriteHandler(),
Mock.Of<IGitRemoteFeaturesFactory>(),
Mock.Of<ILogger<Host.Components.Repository.Repository>>(),
Mock.Of<ILogger<RepositoryManager>>(),
new GeneralConfiguration());
try
{
using (await manager.CloneRepository(
new Uri("https://github.com/Cyberboss/common_core"),
null,
null,
null,
new JobProgressReporter(Mock.Of<ILogger<JobProgressReporter>>(), null, (_, _) => { }),
true,
default))
{
}
using (var repo = await repoFac.CreateFromPath(tempPath, default))
{
repo.Network.Remotes.Update("origin", updater =>
{
updater.Url = "https://github.com/tgstation/common_core";
});
var targetCommit = repo.Lookup<Commit>("5b0d0a38057a2c8306a852ccbd6cd6f4ae766a33");
Assert.IsNull(targetCommit);
}
using (var repo2 = await manager.LoadRepository(default))
{
await repo2.FetchOrigin(
new JobProgressReporter(Mock.Of<ILogger<JobProgressReporter>>(), null, (_, _) => { }),
null,
null,
false,
default);
}
using var repo3 = await repoFac.CreateFromPath(tempPath, default);
var remote = repo3.Network.Remotes.First();
commands.Fetch(repo3, remote.FetchRefSpecs.Select(x => x.Specification), remote, new FetchOptions
{
TagFetchMode = TagFetchMode.All,
Prune = true,
}, "test");
var targetCommit2 = repo3.Lookup<Commit>("5b0d0a38057a2c8306a852ccbd6cd6f4ae766a33");
Assert.IsNotNull(targetCommit2);
}
finally
{
await new DefaultIOManager().DeleteDirectory(
Path.GetDirectoryName(tempPath),
CancellationToken.None);
}
}
}
}