michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

optimize<Commit>: use binary search to find first ancestor of current HEAD when HEAD is filtered out

Browse source
This commit is contained in:
leo 2020-12-17 13:12:52 +08:00
parent 3e6c837916
commit bdd979eb58
1 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/Git/Commit.cs
View file

@ -153,6 +153,17 @@ namespace SourceGit.Git {
commits.Add(current);
}
if (!findHead && commits.Count > 0) {
if (commits[commits.Count - 1].IsAncestorOfHead(repo)) {
if (commits.Count == 1) {
commits[0].IsMerged = true;
} else {
var head = FindFirstMerged(repo, commits, 0, commits.Count - 1);
if (head != null) head.IsMerged = true;
}
}
}
return commits;
}
@ -277,6 +288,41 @@ namespace SourceGit.Git {
File.Delete(bat);
}
private bool IsAncestorOfHead(Repository repo) {
var startInfo = new ProcessStartInfo();
startInfo.FileName = App.Setting.Tools.GitExecutable;
startInfo.Arguments = $"merge-base --is-ancestor {SHA} HEAD";
startInfo.WorkingDirectory = repo.Path;
startInfo.UseShellExecute = false;
startInfo.CreateNoWindow = true;
startInfo.RedirectStandardOutput = false;
startInfo.RedirectStandardError = false;
var proc = new Process() { StartInfo = startInfo };
proc.Start();
proc.WaitForExit();
var ret = proc.ExitCode;
proc.Close();
return ret == 0;
}
private static Commit FindFirstMerged(Repository repo, List<Commit> commits, int start, int end) {
var isStartAncestor = commits[start].IsAncestorOfHead(repo);
if (isStartAncestor) return commits[start];
if (end - start <= 1) {
return commits[end];
} else {
var mid = (int)Math.Floor((end + start) * 0.5f);
if (commits[mid].IsAncestorOfHead(repo)) {
return FindFirstMerged(repo, commits, start + 1, mid);
} else {
return FindFirstMerged(repo, commits, mid + 1, end);
}
}
}
private static void ParseSHA(Commit commit, string data) {
var decoratorStart = data.IndexOf('(');
if (decoratorStart < 0) {