public void GetLastParentTfsCommits_WhenTheMergeCommitIsNotFromTfs_ThenReturnTheParentsFoundWithMainParentFromMasterFirst()
{
int ChangesetIdToTrickFetch = 1;
h.SetupFake(r =>
{
r.Changeset(ChangesetIdToTrickFetch, "UseLess! Just to have the same changeset Id that the commit already in repo (and fetch nothing)", DateTime.Parse("2012-01-01 12:12:12 -05:00"))
.Change(TfsChangeType.Add, TfsItemType.Folder, "$/MyProject");
});
string c1 = null;
string c2 = null;
string c3 = null;
h.SetupGitRepo("repo", g =>
{
c1 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C"+ ChangesetIdToTrickFetch);
g.CreateBranch("branch");
c2 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/branch;C" + ChangesetIdToTrickFetch);
g.Checkout("master");
c3 = g.Commit("A merge commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C" + ChangesetIdToTrickFetch);
g.Merge("branch");
});
using (var repo = h.Repository("repo"))
{
var gitRepository = new GitRepository(new StringWriter(), repo.Info.WorkingDirectory, new Container(), null, new RemoteConfigConverter());
var changesets = gitRepository.GetLastParentTfsCommits("HEAD");
Assert.Equal(2, changesets.Count());
//C3 must be returned first because that's the parent commit of the master branch where the other branch is merged
Assert.Equal(c3, changesets.First().GitCommit);
Assert.Equal(c2, changesets.ElementAt(1).GitCommit);
}
}
public void GetLastParentTfsCommits_WhenThereIsMoreThanTfsChangeset_ThenReturnTheLast()
{
h.SetupFake(r =>
{
r.Changeset(42, "UseLess! Just to have the same changeset Id that the commit already in repo (and fetch nothing)", DateTime.Parse("2012-01-01 12:12:12 -05:00"))
.Change(TfsChangeType.Add, TfsItemType.Folder, "$/MyProject");
});
string c1 = null;
string c2 = null;
string c3 = null;
h.SetupGitRepo("repo", g =>
{
c1 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C1");
c2 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C2");
c3 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C3");
});
using (var repo = h.Repository("repo"))
{
var gitRepository = new GitRepository(new StringWriter(), repo.Info.WorkingDirectory, new Container(), null, new RemoteConfigConverter());
var changesets = gitRepository.GetLastParentTfsCommits("HEAD");
Assert.Equal(1, changesets.Count());
Assert.Equal(c3, changesets.First().GitCommit);
}
}
public void GetLastParentTfsCommits_WhenNoCommitFromTfs_ThenReturnNothing()
{
h.SetupFake(r =>
{
r.Changeset(1, "UseLess! Just to have the same changeset Id that the commit already in repo (and fetch nothing)", DateTime.Parse("2012-01-01 12:12:12 -05:00"))
.Change(TfsChangeType.Add, TfsItemType.Folder, "$/MyProject");
});
h.SetupGitRepo("repo", g =>
{
g.Commit("1.A sample commit from TFS.");
g.Commit("2.A sample commit from TFS.");
g.Commit("3.A sample commit from TFS.");
});
using (var repo = h.Repository("repo"))
{
var gitRepository = new GitRepository(new StringWriter(), repo.Info.WorkingDirectory, new Container(), null, new RemoteConfigConverter());
var changesets = gitRepository.GetLastParentTfsCommits("HEAD");
Assert.Equal(0, changesets.Count());
}
}
public void GetLastParentTfsCommits_WhenTheMergeCommitIsFromTfs_ThenReturnThisCommit()
{
int ChangesetIdToTrickFetch = 1;
h.SetupFake(r =>
{
r.Changeset(1, "UseLess! Just to have the same changeset Id that the commit already in repo (and fetch nothing)", DateTime.Parse("2012-01-01 12:12:12 -05:00"))
.Change(TfsChangeType.Add, TfsItemType.Folder, "$/MyProject");
});
string c1 = null;
string c2 = null;
string c3 = null;
string c4 = null;
h.SetupGitRepo("repo", g =>
{
c1 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C" + ChangesetIdToTrickFetch);
g.CreateBranch("branch");
c2 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/branch;C" + ChangesetIdToTrickFetch);
g.Checkout("master");
c3 = g.Commit("A sample commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C" + ChangesetIdToTrickFetch);
g.Merge("branch");
//Trick to create a merge commit similar to one fetched from TFS
c4 = g.Amend("A merge commit from TFS.\n\ngit-tfs-id: [http://server/tfs]$/MyProject/trunk;C" + ChangesetIdToTrickFetch);
});
using (var repo = h.Repository("repo"))
{
var gitRepository = new GitRepository(repo.Info.WorkingDirectory, new Container(), null, new RemoteConfigConverter());
var changesets = gitRepository.GetLastParentTfsCommits("HEAD");
Assert.Equal(1, changesets.Count());
Assert.Equal(c4, changesets.First().GitCommit);
}
}
