Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Git repository importer: use LibGit2Sharp instead of GitSharp.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgrunwald
dgrunwald committed Aug 16, 2011
1 parent 89cdfac commit ffc5b85
Show file tree
Hide file tree
Showing 15 changed files with 1,486 additions and 20,181 deletions.
9 changes: 7 additions & 2 deletions UsageDataCollector/Project/Collector/CollectorServiceLibrary/CollectorServiceLibrary.csproj
View file
Expand Up @@ -34,8 +34,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GitSharp.Core">
<HintPath>..\lib\GitSharp.Core.dll</HintPath>
<Reference Include="LibGit2Sharp">
<HintPath>..\lib\LibGit2Sharp.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\..\..\..\SharpDevelop\src\Libraries\log4net\log4net.dll</HintPath>
Expand Down Expand Up @@ -77,6 +77,7 @@
<None Include="App.config" />
<None Include="Tasks\ICSharpCode.UDC.Tasks.targets">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>
<None Include="Tasks\Import.proj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -97,6 +98,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="..\lib\git2.dll">
<Link>git2.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Import\DeleteImportTables.sql" />
<Content Include="Readme.txt" />
</ItemGroup>
Expand Down
75 changes: 32 additions & 43 deletions UsageDataCollector/Project/Collector/CollectorServiceLibrary/Tasks/ImportGitRepository.cs
View file
Expand Up @@ -3,12 +3,11 @@
using System.Linq;
using System.Text;
using Microsoft.Build.Utilities;
using GitSharp.Core.Transport;
using Microsoft.Build.Framework;
using GitSharp.Core;
using System.Diagnostics;
using ICSharpCode.UsageDataCollector.DataAccess.Collector;
using System.Text.RegularExpressions;
using LibGit2Sharp;

namespace ICSharpCode.UsageDataCollector.ServiceLibrary.Tasks
{
Expand Down Expand Up @@ -42,11 +41,6 @@ public ImportGitRepository()
/// </summary>
public DateTime EarliestCommitDate { get; set; }

/// <summary>
/// Whether to run "git fetch" in the repository.
/// </summary>
public bool Fetch { get; set; }

/// <summary>
/// Whether to look for 'git-svn' in messages; used to adjust sessions created by SharpDevelop versions prior to the git migration.
/// </summary>
Expand All @@ -58,19 +52,18 @@ public override bool Execute()
db = new CollectorRepository();
db.Context = context;

using (repo = Repository.Open(this.Directory)) {
if (Fetch) {
using (Transport t = Transport.open(repo, this.Remote)) {
t.RemoveDeletedRefs = true;
t.fetch(NullProgressMonitor.Instance, null);
}
}
foreach (var tag in repo.getTags()) {
ImportTag(tag.Key, tag.Value.PeeledObjectId ?? tag.Value.ObjectId, true);
using (repo = new Repository(System.IO.Path.Combine(this.Directory, ".git"))) {
foreach (var tag in repo.Tags) {
ObjectId commitID = tag.IsAnnotated ? tag.Annotation.TargetId : tag.Target.Id;
ImportTag(tag.Name, (LibGit2Sharp.Commit)repo.Lookup(commitID, GitObjectType.Commit), true);
}
foreach (var branch in repo.RefDatabase.getRefs("refs/remotes/" + this.Remote + "/")) {
if (branch.Key == "HEAD") continue;
ImportTag(branch.Key, branch.Value.PeeledObjectId ?? branch.Value.ObjectId, false);
foreach (var branch in repo.Branches) {
if (branch.IsRemote && branch.Name.StartsWith(this.Remote + "/", StringComparison.Ordinal)) {
string branchName = branch.Name.Substring(this.Remote.Length + 1);
if (branchName != "HEAD") {
ImportTag(branchName, branch.Tip, false);
}
}
}
}
if (EnableGitSvnImport && svnRevisionToCommitIdMapping.Count > 0) {
Expand All @@ -93,19 +86,20 @@ public override bool Execute()
return true;
}

private void ImportTag(string name, ObjectId commit, bool isRelease)
private void ImportTag(string name, LibGit2Sharp.Commit commit, bool isRelease)
{
Debug.WriteLine("ImportTag({0}, {1}, {2})", name, commit.Sha, isRelease);
int? commitId = ImportCommit(commit);
if (commitId == null)
return;
TaggedCommit tag = db.GetTag(name, isRelease);
if (tag != null) {
if (tag.CommitId == commitId)
return;
Debug.WriteLine("Update " + (isRelease ? "tag" : "branch") + " " + name + " (commit " + commit + ")");
Debug.WriteLine("Update " + (isRelease ? "tag" : "branch") + " " + name + " (commit " + commit.Sha + ")");
tag.CommitId = commitId.Value;
} else {
Debug.WriteLine("Import " + (isRelease ? "tag" : "branch") + " " + name + " (commit " + commit + ")");
Debug.WriteLine("Import " + (isRelease ? "tag" : "branch") + " " + name + " (commit " + commit.Sha + ")");
tag = new TaggedCommit();
tag.CommitId = commitId.Value;
tag.Name = name;
Expand All @@ -121,21 +115,21 @@ private void ImportTag(string name, ObjectId commit, bool isRelease)
Dictionary<int, int> svnRevisionToCommitIdMapping = new Dictionary<int, int>();

/* Recursive implementation - runs into StackOverflowException
private int? ImportCommit(ObjectId commitRef)
private int? ImportCommit(LibGit2Sharp.Commit gitCommit)
{
var gitCommit = repo.MapCommit(commitRef);
var gitCommit = (LibGit2Sharp.Commit)repo.Lookup(commitRef, GitObjectType.Commit);
// Test whether this commit is already imported
var commit = db.GetCommitByHash(gitCommit.CommitId.Name);
var commit = db.GetCommitByHash(gitCommit.Sha);
if (commit != null)
return commit.Id;
// Test whether the commit is too old to be imported
if (GetDate(gitCommit.Committer) < EarliestCommitDate)
if (gitCommit.Committer.When < EarliestCommitDate)
return null;
List<int> parentCommits = new List<int>();
foreach (ObjectId parent in gitCommit.ParentIds) {
foreach (LibGit2Sharp.Commit parent in gitCommit.Parents) {
int? parentCommit = ImportCommit(parent);
if (parentCommit != null)
parentCommits.Add(parentCommit.Value);
Expand All @@ -145,38 +139,38 @@ private void ImportTag(string name, ObjectId commit, bool isRelease)

class Frame
{
public readonly GitSharp.Core.Commit gitCommit;
public readonly LibGit2Sharp.Commit gitCommit;
public int state; // 0 = initial state; 1 = check loop condition; 2 = within loop
public int loopIndex;
public List<int> parentCommitIds;

public Frame(GitSharp.Core.Commit gitCommit)
public Frame(LibGit2Sharp.Commit gitCommit)
{
this.gitCommit = gitCommit;
}
}

int? ImportCommit(ObjectId commitRef)
int? ImportCommit(LibGit2Sharp.Commit startingCommit)
{
// Using an explicit stack, because we would run into StackOverflowException when writing this
// as a recursive method. See comment above "class Frame" for the recursive implementation.

int? result = null; // variable used to store the return value (passed from one stack frame to the calling frame)
Stack<Frame> stack = new Stack<Frame>();
stack.Push(new Frame(repo.MapCommit(commitRef)));
stack.Push(new Frame(startingCommit));
while (stack.Count > 0) {
Frame f = stack.Peek();
switch (f.state) {
case 0:
// Test whether this commit is already imported
var commit = db.GetCommitByHash(f.gitCommit.CommitId.Name);
var commit = db.GetCommitByHash(f.gitCommit.Sha);
if (commit != null) {
result = commit.Id;
stack.Pop();
break;
}
// Test whether the commit is too old to be imported
if (GetDate(f.gitCommit.Committer) < EarliestCommitDate) {
if (f.gitCommit.Committer.When < EarliestCommitDate) {
result = null;
stack.Pop();
break;
Expand All @@ -186,10 +180,10 @@ public Frame(GitSharp.Core.Commit gitCommit)
goto case 1; // proceed to first loop iteration
case 1:
// check the loop condition (whether we have imported all necessary commits)
if (f.loopIndex < f.gitCommit.ParentIds.Length) {
if (f.loopIndex < f.gitCommit.Parents.Count()) {
// recursive invocation (to fetch the commit ID of the parent)
f.state = 2;
stack.Push(new Frame(repo.MapCommit(f.gitCommit.ParentIds[f.loopIndex])));
stack.Push(new Frame(f.gitCommit.Parents.ElementAt(f.loopIndex)));
break;
} else {
// we are done with the loop; all parent commit IDs were collected
Expand All @@ -208,17 +202,12 @@ public Frame(GitSharp.Core.Commit gitCommit)
return result;
}

DateTime GetDate(GitSharp.Core.PersonIdent personIdent)
{
return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc) + TimeSpan.FromMilliseconds(personIdent.When);
}

int? FinishImportCommit(GitSharp.Core.Commit gitCommit, List<int> parentCommits)
int? FinishImportCommit(LibGit2Sharp.Commit gitCommit, List<int> parentCommits)
{
string commitHash = gitCommit.CommitId.Name;
string commitHash = gitCommit.Sha;
var commit = new DataAccess.Collector.Commit();
commit.Hash = commitHash;
commit.CommitDate = GetDate(gitCommit.Committer);
commit.CommitDate = gitCommit.Committer.When.UtcDateTime;
db.Context.Commits.AddObject(commit);
db.Context.SaveChanges();
Debug.WriteLine("Imported commit " + commitHash + " as " + commit.Id);
Expand Down
1 change: 0 additions & 1 deletion UsageDataCollector/Project/Collector/RepositoryImport/Program.cs
View file
Expand Up @@ -14,7 +14,6 @@ static void Main(string[] args)
task.ConnectionString = "name=UDCContext";
task.Directory = "c:\\sharpdevelop";
task.EnableGitSvnImport = true;
task.Fetch = false;
task.Execute();
}
}
Expand Down
36 changes: 0 additions & 36 deletions UsageDataCollector/Project/Collector/lib/GitSharp licence.txt
View file

This file was deleted.

Binary file removed UsageDataCollector/Project/Collector/lib/GitSharp.Core.dll
View file
Binary file not shown.

0 comments on commit ffc5b85

Please sign in to comment.