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

🔥 temporary index stuff

Browse Source 
This dropped the time to run unit tests on my machine from ~8.3s to ~6.6s!
This commit is contained in:
Matt Burke
2014-01-17 16:43:02 -05:00
parent 1f5afb0e81
commit f20c7d0774
1 changed files with 1 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs/Core/GitTfsRemote.cs
+1 -65
View File
@@ -178,14 +178,6 @@ namespace Sep.Git.Tfs.Core
}
}
private string IndexFile
{
get
{
return Path.Combine(Dir, "index");
}
}
private string WorkingDirectory
@@ -325,7 +317,6 @@ namespace Sep.Git.Tfs.Core
fetchResult.NewChangesetCount = fetchedChangesets.Count;
foreach (var changeset in fetchedChangesets)
{
AssertTemporaryIndexClean(MaxCommitHash);
var log = Apply(MaxCommitHash, changeset);
if (changeset.IsMergeChangeset)
{
@@ -466,7 +457,6 @@ namespace Sep.Git.Tfs.Core
private void quickFetch(ITfsChangeset changeset)
{
AssertTemporaryIndexEmpty();
var log = CopyTree(MaxCommitHash, changeset);
UpdateTfsHead(Commit(log), changeset.Summary.ChangesetId);
DoGcIfNeeded();
@@ -548,42 +538,6 @@ namespace Sep.Git.Tfs.Core
}
}
private void AssertTemporaryIndexClean(string treeish)
{
if (string.IsNullOrEmpty(treeish))
{
AssertTemporaryIndexEmpty();
return;
}
WithTemporaryIndex(() => AssertIndexClean(treeish));
}
private void AssertTemporaryIndexEmpty()
{
if (File.Exists(IndexFile))
File.Delete(IndexFile);
}
private void AssertIndexClean(string treeish)
{
if (!File.Exists(IndexFile)) Repository.CommandNoisy("read-tree", treeish);
var currentTree = Repository.CommandOneline("write-tree");
var expectedCommitInfo = Repository.Command("cat-file", "commit", treeish);
var expectedCommitTree = treeShaRegex.Match(expectedCommitInfo).Groups[1].Value;
if (expectedCommitTree != currentTree)
{
Trace.WriteLine("Index mismatch: " + expectedCommitTree + " != " + currentTree);
Trace.WriteLine("rereading " + treeish);
File.Delete(IndexFile);
Repository.CommandNoisy("read-tree", treeish);
currentTree = Repository.CommandOneline("write-tree");
if (expectedCommitTree != currentTree)
{
throw new Exception("Unable to create a clean temporary index: trees (" + treeish + ") " + expectedCommitTree + " != " + currentTree);
}
}
}
private LogEntry Apply(string parent, ITfsChangeset changeset)
{
LogEntry result = null;
@@ -639,9 +593,7 @@ namespace Sep.Git.Tfs.Core
private string[] BuildCommitCommand(LogEntry logEntry)
{
var tree = logEntry.Tree ?? GetTemporaryIndexTreeSha();
tree.AssertValidSha();
var commitCommand = new List<string> { "commit-tree", tree };
var commitCommand = new List<string> { "commit-tree", logEntry.Tree };
foreach (var parent in logEntry.CommitParents)
{
commitCommand.Add("-p");
@@ -650,13 +602,6 @@ namespace Sep.Git.Tfs.Core
return commitCommand.ToArray();
}
private string GetTemporaryIndexTreeSha()
{
string tree = null;
WithTemporaryIndex(() => tree = Repository.CommandOneline("write-tree"));
return tree;
}
private string ParseCommitInfo(string commitTreeOutput)
{
return commitTreeOutput.Trim();
@@ -682,15 +627,6 @@ namespace Sep.Git.Tfs.Core
});
}
private void WithTemporaryIndex(Action action)
{
WithTemporaryEnvironment(() =>
{
Directory.CreateDirectory(Path.GetDirectoryName(IndexFile));
action();
}, new Dictionary<string, string> { { "GIT_INDEX_FILE", IndexFile } });
}
private void WithTemporaryEnvironment(Action action, IDictionary<string, string> newEnvironment)
{
var oldEnvironment = new Dictionary<string, string>();