public void GetBranchesContainingCommitThrowsDirectlyOnNullCommit()
{
using var fixture = new EmptyRepositoryFixture();
var fixtureRepository = fixture.Repository.ToGitRepository();
var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
Assert.Throws <ArgumentNullException>(() => gitRepoMetadataProvider.GetBranchesContainingCommit(null));
}
public void FindsCorrectMergeBaseForForwardMergeMovesOn()
{
//*9dfb8b4 49 minutes ago(develop)
//*54f21b2 53 minutes ago
// |\
// | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
// | |/
// | *4441531 54 minutes ago
// | *89840df 56 minutes ago
// |/
//*91bf945 58 minutes ago(main)
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit("initial");
fixture.BranchTo("develop");
var fixtureRepository = fixture.Repository.ToGitRepository();
var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
// Create release from develop
fixture.BranchTo("release-2.0.0");
// Make some commits on release
fixture.MakeACommit("release 1");
fixture.MakeACommit("release 2");
var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
// First forward merge release to develop
fixture.Checkout("develop");
fixture.MergeNoFF("release-2.0.0");
// Make some new commit on release
fixture.Checkout("release-2.0.0");
fixture.MakeACommit("release 3 - after first merge");
// Make new commit on develop
fixture.Checkout("develop");
// Checkout to release (no new commits)
fixture.MakeACommit("develop after merge");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
var develop = fixtureRepository.FindBranch("develop");
var release = fixtureRepository.FindBranch("release-2.0.0");
var gitRepoMetadataProvider = new RepositoryStore(log, fixtureRepository);
var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
fixtureRepository.DumpGraph(Console.WriteLine);
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
developMergeBase.ShouldBe(expectedDevelopMergeBase);
}
public static void put(string repositoryId, string user, TokenObject tokenObject)
{
RepositoryStore repoStore = store[repositoryId];
if(repoStore == null)
{
store[repositoryId] = new RepositoryStore(repositoryId);
repoStore = store[repositoryId];
}
repoStore.put(user, tokenObject);
}
public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlySource()
{
using var fixture = new RemoteRepositoryFixture();
fixture.MakeACommit("initial");
var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();
var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository, this.incrementStrategyFinder);
var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(localRepository.FindBranch("main"), new Model.Configuration.Config(), Array.Empty <IBranch>());
Assert.IsNull(branchedCommit.Branch);
Assert.IsNull(branchedCommit.Commit);
}
public void FindsCorrectMergeBaseForMultipleForwardMerges()
{
//*403b294 44 minutes ago(develop)
//|\
//| *306b243 45 minutes ago(HEAD -> release-2.0.0)
//| *4cf5969 47 minutes ago
//| *4814083 51 minutes ago
//* | cddd3cc 49 minutes ago
//* | 2b2b52a 53 minutes ago
//|\ \
//| |/
//| *8113776 54 minutes ago
//| *3c0235e 56 minutes ago
//|/
//*f6f1283 58 minutes ago(main)
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit("initial");
fixture.BranchTo("develop");
var fixtureRepository = fixture.Repository.ToGitRepository();
var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
// Create release from develop
fixture.BranchTo("release-2.0.0");
// Make some commits on release
fixture.MakeACommit("release 1");
fixture.MakeACommit("release 2");
// First forward merge release to develop
fixture.Checkout("develop");
fixture.MergeNoFF("release-2.0.0");
// Make some new commit on release
fixture.Checkout("release-2.0.0");
fixture.MakeACommit("release 3 - after first merge");
// Make new commit on develop
fixture.Checkout("develop");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
fixture.Checkout("develop");
fixture.MakeACommit("develop after merge");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
// Make some new commit on release
fixture.MakeACommit("release 4");
fixture.MakeACommit("release 5");
var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
// Second merge release to develop
fixture.Checkout("develop");
fixture.MergeNoFF("release-2.0.0");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
var develop = fixtureRepository.FindBranch("develop");
var release = fixtureRepository.FindBranch("release-2.0.0");
var gitRepoMetadataProvider = new RepositoryStore(log, fixtureRepository);
var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
fixtureRepository.DumpGraph(Console.WriteLine);
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
developMergeBase.ShouldBe(expectedDevelopMergeBase);
}
