Mirror_Repos/git-tfs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #605 from pmiossec/rcheckin_with_libgit2sharp

Browse Source 
Rcheckin with libgit2sharp
This commit is contained in:
Philippe Miossec
2015-06-18 21:51:32 +02:00
parent 2d31d7e57f 519f694783
commit 3ded1e691b
7 changed files with 121 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs/Commands/Rcheckin.cs
+31 -69
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -105,44 +106,34 @@ namespace Sep.Git.Tfs.Commands
}
}
string tfsLatest = parentChangeset.Remote.MaxCommitHash;
// we could rcheckin only if tfsLatest changeset is a parent of HEAD
// so that we could rebase after each single checkin without conflicts
if (!String.IsNullOrWhiteSpace(_globals.Repository.CommandOneline("rev-list", tfsLatest, "^" + refToCheckin)))
IEnumerable<GitCommit> commitsToCheckin = _globals.Repository.FindParentCommits(refToCheckin, parentChangeset.Remote.MaxCommitHash);
Trace.WriteLine("Commit to checkin count:" + commitsToCheckin.Count());
if (!commitsToCheckin.Any())
throw new GitTfsException("error: latest TFS commit should be parent of commits being checked in");
return (!Old || _globals.Repository.IsBare) ? _PerformRCheckinQuick(parentChangeset, refToCheckin) : _PerformRCheckin(parentChangeset, refToCheckin);
return (!Old || _globals.Repository.IsBare) ? _PerformRCheckinQuick(parentChangeset, refToCheckin, commitsToCheckin) : _PerformRCheckin(parentChangeset, refToCheckin, commitsToCheckin);
}
private int _PerformRCheckinQuick(TfsChangesetInfo parentChangeset, string refToCheckin)
private int _PerformRCheckinQuick(TfsChangesetInfo parentChangeset, string refToCheckin, IEnumerable<GitCommit> commitsToCheckin)
{
var tfsRemote = parentChangeset.Remote;
string tfsLatest = parentChangeset.Remote.MaxCommitHash;
string[] revList = null;
_globals.Repository.CommandOutputPipe(tr => revList = tr.ReadToEnd().Split('\n').Where(s => !String.IsNullOrWhiteSpace(s)).ToArray(),
"rev-list", "--parents", "--ancestry-path", "--first-parent", "--reverse", tfsLatest + ".." + refToCheckin);
string currentParent = tfsLatest;
string currentParent = parentChangeset.Remote.MaxCommitHash;
long newChangesetId = 0;
var rc = new RCheckinCommit(_globals.Repository);
foreach (string commitWithParents in revList)
foreach (var commit in commitsToCheckin)
{
rc.ExtractCommit(commitWithParents, currentParent);
rc.BuildCommitMessage(!_checkinOptions.NoGenerateCheckinComment, currentParent);
string target = rc.Sha;
string tfsRepositoryPathOfMergedBranch = FindTfsRepositoryPathOfMergedBranch(tfsRemote, rc.Parents, target);
var message = BuildCommitMessage(commit, !_checkinOptions.NoGenerateCheckinComment, currentParent);
string target = commit.Sha;
var parents = commit.Parents.Where(c => c.Sha != currentParent).ToArray();
string tfsRepositoryPathOfMergedBranch = FindTfsRepositoryPathOfMergedBranch(tfsRemote, parents, target);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, rc.Message, rc.Commit);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, message, commit);
_stdout.WriteLine("Starting checkin of {0} '{1}'", target.Substring(0, 8), commitSpecificCheckinOptions.CheckinComment);
try
{
newChangesetId = tfsRemote.Checkin(target, currentParent, parentChangeset, commitSpecificCheckinOptions, tfsRepositoryPathOfMergedBranch);
var fetchResult = tfsRemote.FetchWithMerge(newChangesetId, false, rc.Parents);
var fetchResult = tfsRemote.FetchWithMerge(newChangesetId, false, parents.Select(c=>c.Sha).ToArray());
if (fetchResult.NewChangesetCount != 1)
{
var lastCommit = _globals.Repository.FindCommitHashByChangesetId(newChangesetId);
@@ -180,18 +171,16 @@ namespace Sep.Git.Tfs.Commands
return GitTfsExitCodes.OK;
}
private int _PerformRCheckin(TfsChangesetInfo parentChangeset, string refToCheckin)
private int _PerformRCheckin(TfsChangesetInfo parentChangeset, string refToCheckin, IEnumerable<GitCommit> commitsToCheckin)
{
var tfsRemote = parentChangeset.Remote;
string tfsLatest = parentChangeset.Remote.MaxCommitHash;
var rc = new RCheckinCommit(_globals.Repository);
while (true)
{
// determine first descendant of tfsLatest
string revList = _globals.Repository.CommandOneline("rev-list", "--parents", "--ancestry-path", "--first-parent", "--reverse", tfsLatest + ".." + refToCheckin);
if (String.IsNullOrWhiteSpace(revList))
var commit = commitsToCheckin.FirstOrDefault();
if (commit == null)
{
_stdout.WriteLine("No more to rcheckin.");
@@ -201,16 +190,16 @@ namespace Sep.Git.Tfs.Commands
return GitTfsExitCodes.OK;
}
rc.ExtractCommit(revList, tfsLatest);
rc.BuildCommitMessage(!_checkinOptions.NoGenerateCheckinComment, tfsLatest);
string target = rc.Sha;
string tfsRepositoryPathOfMergedBranch = FindTfsRepositoryPathOfMergedBranch(tfsRemote, rc.Parents, target);
var message = BuildCommitMessage(commit, !_checkinOptions.NoGenerateCheckinComment, tfsLatest);
string target = commit.Sha;
var parents = commit.Parents.Where(c => c.Sha != tfsLatest).ToArray();
string tfsRepositoryPathOfMergedBranch = FindTfsRepositoryPathOfMergedBranch(tfsRemote, parents, target);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, rc.Message, rc.Commit);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, message, commit);
_stdout.WriteLine("Starting checkin of {0} '{1}'", target.Substring(0, 8), commitSpecificCheckinOptions.CheckinComment);
long newChangesetId = tfsRemote.Checkin(rc.Sha, parentChangeset, commitSpecificCheckinOptions, tfsRepositoryPathOfMergedBranch);
tfsRemote.FetchWithMerge(newChangesetId, false, rc.Parents);
long newChangesetId = tfsRemote.Checkin(commit.Sha, parentChangeset, commitSpecificCheckinOptions, tfsRepositoryPathOfMergedBranch);
tfsRemote.FetchWithMerge(newChangesetId, false, parents.Select(c => c.Sha).ToArray());
if (tfsRemote.MaxChangesetId != newChangesetId)
throw new GitTfsException("error: New TFS changesets were found. Rcheckin was not finished.");
@@ -220,45 +209,18 @@ namespace Sep.Git.Tfs.Commands
RebaseOnto(tfsLatest, target);
_stdout.WriteLine("Rebase done successfully.");
commitsToCheckin = _globals.Repository.FindParentCommits(refToCheckin, tfsLatest);
}
}
private struct RCheckinCommit
public string BuildCommitMessage(GitCommit commit, bool generateCheckinComment, string latest)
{
public GitCommit Commit { get; private set; }
public string Sha { get; private set; }
public string Message { get; private set; }
public string[] Parents { get; private set; }
private readonly IGitRepository _repo;
public RCheckinCommit(IGitRepository repo)
: this()
{
_repo = repo;
Commit = null;
Sha = null;
Message = null;
Parents = null;
}
public void ExtractCommit(string revList, string latest)
{
string[] commitShas = revList.Split(' ');
Sha = commitShas[0];
Parents = commitShas.AsEnumerable().Skip(1).Where(hash => hash != latest).ToArray();
Commit = _repo.GetCommit(Sha);
}
public void BuildCommitMessage(bool generateCheckinComment, string latest)
{
Message = generateCheckinComment
? _repo.GetCommitMessage(Sha, latest)
: _repo.GetCommit(Sha).Message;
}
return generateCheckinComment
? _globals.Repository.GetCommitMessage(commit.Sha, latest)
: _globals.Repository.GetCommit(commit.Sha).Message;
}
private string FindTfsRepositoryPathOfMergedBranch(IGitTfsRemote remoteToCheckin, string[] gitParents, string target)
private string FindTfsRepositoryPathOfMergedBranch(IGitTfsRemote remoteToCheckin, GitCommit[] gitParents, string target)
{
if (gitParents.Length != 0)
{
@@ -270,7 +232,7 @@ namespace Sep.Git.Tfs.Commands
var tfsCommit = _globals.Repository.GetTfsCommit(gitParent);
if (tfsCommit != null)
return tfsCommit.Remote.TfsRepositoryPath;
var lastCheckinCommit = _globals.Repository.GetLastParentTfsCommits(gitParent).FirstOrDefault();
var lastCheckinCommit = _globals.Repository.GetLastParentTfsCommits(gitParent.Sha).FirstOrDefault();
if (lastCheckinCommit != null)
{
if(!ForceCheckin && lastCheckinCommit.Remote.Id != remoteToCheckin.Id)
GitTfs/Core/GitCommit.cs
+5
View File
@@ -70,6 +70,11 @@ namespace Sep.Git.Tfs.Core
return _commit.Message;
}
}
public IEnumerable<GitCommit> Parents
{
get { return _commit.Parents.Select(c => new GitCommit(c)); }
}
}
}
GitTfs/Core/GitRepository.cs
+21 -1
View File
@@ -353,9 +353,14 @@ namespace Sep.Git.Tfs.Core
return TryParseChangesetInfo(currentCommit.Message, currentCommit.Sha);
}
public TfsChangesetInfo GetTfsCommit(GitCommit commit)
{
return TryParseChangesetInfo(commit.Message, commit.Sha);
}
public TfsChangesetInfo GetTfsCommit(string sha)
{
return TryParseChangesetInfo(GetCommit(sha).Message, sha);
return GetTfsCommit(GetCommit(sha));
}
private TfsChangesetInfo TryParseChangesetInfo(string gitTfsMetaInfo, string commit)
@@ -655,5 +660,20 @@ namespace Sep.Git.Tfs.Core
return false;
}
}
public IEnumerable<GitCommit> FindParentCommits(string @from, string to)
{
var commits = _repository.Commits.QueryBy(
new CommitFilter() {Since = @from, Until = to, SortBy = CommitSortStrategies.Reverse, FirstParentOnly = true})
.Select(c=>new GitCommit(c));
var parent = to;
foreach (var gitCommit in commits)
{
if(!gitCommit.Parents.Any(c=>c.Sha == parent))
return new List<GitCommit>();
parent = gitCommit.Sha;
}
return commits;
}
}
}
GitTfs/Core/IGitRepository.cs
+2
View File
@@ -24,6 +24,7 @@ namespace Sep.Git.Tfs.Core
void MoveTfsRefForwardIfNeeded(IGitTfsRemote remote);
IEnumerable<TfsChangesetInfo> GetLastParentTfsCommits(string head);
TfsChangesetInfo GetTfsChangesetById(string remoteRef, long changesetId);
TfsChangesetInfo GetTfsCommit(GitCommit commit);
TfsChangesetInfo GetTfsCommit(string sha);
TfsChangesetInfo GetCurrentTfsCommit();
IDictionary<string, GitObject> CreateObjectsDictionary();
@@ -54,5 +55,6 @@ namespace Sep.Git.Tfs.Core
string GetCurrentBranch();
void GarbageCollect(bool auto = false, string additionalMessage = null);
bool Checkout(string commitish);
IEnumerable<GitCommit> FindParentCommits(string fromCommit, string toCommit);
}
}
GitTfsTest/Integration/GitRepositoryTests.cs
+57
View File
@@ -143,5 +143,62 @@ namespace Sep.Git.Tfs.Test.Integration
Assert.Equal(0, changesets.Count());
}
}
[Fact]
public void FindParentCommits()
{
//History of changesets:
//6
//|\
//| 5
//| |
//3 4
//| /
//2
//|
//1
string c1 = null;
string c2 = null;
string c3 = null;
string c4 = null;
string c5 = null;
string c6 = null;
h.SetupGitRepo("repo", g =>
{
c1 = g.Commit("C1-Common");
c2 = g.Commit("C2-Common");
g.CreateBranch("branch");
c4 = g.Commit("C4-branch");
c5 = g.Commit("C5-branch");
g.Checkout("master");
c3 = g.Commit("C3-master");
g.Merge("branch");
//Trick to create a merge commit similar to one fetched from TFS
c6 = g.Amend("C6-master (merge branch into)");
});
using (var repo = h.Repository("repo"))
{
var gitRepository = new GitRepository(new StringWriter(), repo.Info.WorkingDirectory, new Container(), null, new RemoteConfigConverter());
//string revList = gitRepository.CommandOneline("rev-list", "--parents", "--ancestry-path", "--first-parent", "--reverse", c1 + ".." + c4);
var changesets = gitRepository.FindParentCommits(c5, c1);
Assert.Equal(3, changesets.Count());
Assert.Equal(c2, changesets.ElementAt(0).Sha);
Assert.Equal(c4, changesets.ElementAt(1).Sha);
Assert.Equal(c5, changesets.ElementAt(2).Sha);
changesets = gitRepository.FindParentCommits(c6, c1);
Assert.Equal(3, changesets.Count());
Assert.Equal(c2, changesets.ElementAt(0).Sha);
Assert.Equal(c3, changesets.ElementAt(1).Sha);
Assert.Equal(c6, changesets.ElementAt(2).Sha);
changesets = gitRepository.FindParentCommits(c5, c3);
Assert.Equal(0, changesets.Count());
}
}
}
}
GitTfsTest/Integration/IntegrationHelper.cs
+3 -2
View File
@@ -116,9 +116,10 @@ namespace Sep.Git.Tfs.Test.Integration
_repo.Checkout(commitishName);
}
public void Merge(string branch)
public string Merge(string branch)
{
_repo.Merge(_repo.Branches[branch].Commits.First(), GetCommitter());
var mergeResult = _repo.Merge(_repo.Branches[branch].Commits.First(), GetCommitter());
return mergeResult.Commit.Sha;
}
public string Amend(string message)
doc/release-notes/NEXT.md
+2 -1
View File
@@ -1,3 +1,4 @@
* Add Vs2015 (and TFS2015) support (#760, @pmiossec)
* Manage the case where files are added when renaming a tfs branch (#718, @pmiossec)
* Being able to clone from a specific changeset (#784, @pmiossec)
* Being able to clone from a specific changeset (#784, @pmiossec)
* Rcheckin with libgit2sharp (#605, @pmiossec)