Skip to content

NGit support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pvginkel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

NGit support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7087c
Replaced git command line usage with NGit.
Dec 7, 2015
458b739
Fix tracking of changes.
Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Libraries/NGit/ICSharpCode.SharpZipLib.dll
View file
Open in desktop
Binary file not shown.
Binary file added Libraries/NGit/Mono.Security.dll
View file
Open in desktop
Binary file not shown.
Binary file added Libraries/NGit/NGit.dll
View file
Open in desktop
Binary file not shown.
45,097 changes: 45,097 additions & 0 deletions Libraries/NGit/NGit.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Libraries/NGit/NSch.dll
View file
Open in desktop
Binary file not shown.
1,204 changes: 1,204 additions & 0 deletions Libraries/NGit/NSch.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Libraries/NGit/Sharpen.dll
View file
Open in desktop
Binary file not shown.
12 changes: 8 additions & 4 deletions Vss2Git/AbstractVcsWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,17 +259,21 @@ public int Execute(ProcessStartInfo startInfo, out string stdout, out string std
}

public virtual string QuoteRelativePath(string path)
{
return Quote(RelativePath(path));
}

public virtual string RelativePath(string path)
{
if (path.StartsWith(outputDirectory))
{
path = path.Substring(outputDirectory.Length);
if (path.StartsWith("\\") || path.StartsWith("/"))
{
path = path.Substring(1);
}
}
return Quote(path);
return path;
}

/// <summary>
/// Puts quotes around a command-line argument if it includes whitespace
/// or quotes.
Expand Down Expand Up @@ -367,7 +371,7 @@ public virtual bool NeedsCommit()
return needsCommit;
}

public void SetNeedsCommit()
public virtual void SetNeedsCommit()
{
needsCommit = true;
}
Expand Down
218 changes: 70 additions & 148 deletions Vss2Git/GitWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using NGit;
using NGit.Api;
using NGit.Dircache;

namespace Hpdi.Vss2Git
{
Expand All @@ -31,11 +35,11 @@ namespace Hpdi.Vss2Git
class GitWrapper : AbstractVcsWrapper
{
public static readonly string gitMetaDir = ".git";
public static readonly string gitExecutable = "git";

private List<String> addQueue = new List<string>();
private List<String> deleteQueue = new List<string>();
private List<String> dirDeleteQueue = new List<string>();
private Git git;

private Encoding commitEncoding = Encoding.UTF8;

Expand All @@ -54,15 +58,15 @@ public bool ForceAnnotatedTags

public GitWrapper(string outputDirectory, Logger logger, Encoding commitEncoding,
bool forceAnnotatedTags)
: base(outputDirectory, logger, gitExecutable, gitMetaDir)
: base(outputDirectory, logger, null, gitMetaDir)
{
this.commitEncoding = commitEncoding;
this.forceAnnotatedTags = forceAnnotatedTags;
}

public override string QuoteRelativePath(string path)
public override string RelativePath(string path)
{
return base.QuoteRelativePath(path).Replace('\\', '/'); // cygwin git compatibility
return base.RelativePath(path).Replace('\\', '/'); // cygwin git compatibility
}

public override void Init(bool resetRepo)
Expand All @@ -72,7 +76,7 @@ public override void Init(bool resetRepo)
DeleteDirectory(GetOutputDirectory());
Thread.Sleep(0);
Directory.CreateDirectory(GetOutputDirectory());
VcsExec("init");
git = Git.Init().SetDirectory(GetOutputDirectory()).Call();
}
}

Expand All @@ -91,33 +95,20 @@ public override bool Add(string path)
return true;
}

private bool DoAdd(string paths)
{
var startInfo = GetStartInfo("add --" + paths);

// add fails if there are no files (directories don't count)
bool result = ExecuteUnless(startInfo, "did not match any files");
if (result) SetNeedsCommit();
return result;
}

private bool DoAdds()
{
bool rc = false;
string paths = "";
if (addQueue.Count == 0)
return false;

var add = git.Add();
foreach (string path in addQueue)
{
if (paths.Length > 8000)
{
rc |= DoAdd(paths);
paths = "";
}
paths += " " + QuoteRelativePath(path);
add.AddFilepattern(RelativePath(path));
}
addQueue.Clear();
if (paths.Length > 1)
rc |= DoAdd(paths);
return rc;
add.Call();
base.SetNeedsCommit();
return true;
}

public override bool AddDir(string path)
Expand All @@ -134,42 +125,33 @@ public override bool NeedsCommit()

public override bool AddAll()
{
var startInfo = GetStartInfo("add -A");

// add fails if there are no files (directories don't count)
bool result = ExecuteUnless(startInfo, "did not match any files");
if (result) SetNeedsCommit();
return result;
// git.Add().AddFilepattern(".").Call();
// base.SetNeedsCommit();
return true;
}

public override void RemoveFile(string path)
{
deleteQueue.Add(path);
SetNeedsCommit();
}

private void DoDelete(string paths)
private bool DoDeletes()
{
VcsExec("rm -r -f --" + paths); // is always recursive
}
if (deleteQueue.Count == 0)
return false;

private void DoDeletes()
{
string paths = "";
var delete = git.Rm();
foreach (string path in deleteQueue)
{
if (paths.Length > 8000)
{
DoDelete(paths);
paths = "";
}
paths += " " + QuoteRelativePath(path);
delete.AddFilepattern(RelativePath(path));
}
deleteQueue.Clear();
if (paths.Length > 1)
DoDelete(paths);
delete.Call();
CleanupEmptyDirs();
base.SetNeedsCommit();
return true;
}

private void CleanupEmptyDirs()
{
foreach (string dir in dirDeleteQueue)
Expand All @@ -184,7 +166,6 @@ public override void RemoveDir(string path, bool recursive)
{
deleteQueue.Add(path); // is always recursive
dirDeleteQueue.Add(path);
SetNeedsCommit();
}

public override void RemoveEmptyDir(string path)
Expand All @@ -194,8 +175,9 @@ public override void RemoveEmptyDir(string path)

public override void Move(string sourcePath, string destPath)
{
VcsExec("mv -- " + QuoteRelativePath(sourcePath) + " " + QuoteRelativePath(destPath));
SetNeedsCommit();
git.Rm().AddFilepattern(RelativePath(sourcePath)).Call();
git.Add().AddFilepattern(RelativePath(destPath)).Call();
base.SetNeedsCommit();
}

public override void MoveEmptyDir(string sourcePath, string destPath)
Expand All @@ -204,125 +186,65 @@ public override void MoveEmptyDir(string sourcePath, string destPath)
Directory.Move(sourcePath, destPath);
}

public override bool DoCommit(string authorName, string authorEmail, string comment, DateTime localTime)
public override void SetNeedsCommit()
{
TempFile commentFile;

var args = "commit";
AddComment(comment, ref args, out commentFile);

using (commentFile)
{
var startInfo = GetStartInfo(args);
startInfo.EnvironmentVariables["GIT_AUTHOR_NAME"] = authorName;
startInfo.EnvironmentVariables["GIT_AUTHOR_EMAIL"] = authorEmail;
startInfo.EnvironmentVariables["GIT_AUTHOR_DATE"] = GetUtcTimeString(localTime);

// also setting the committer is supposedly useful for converting to Mercurial
startInfo.EnvironmentVariables["GIT_COMMITTER_NAME"] = authorName;
startInfo.EnvironmentVariables["GIT_COMMITTER_EMAIL"] = authorEmail;
startInfo.EnvironmentVariables["GIT_COMMITTER_DATE"] = GetUtcTimeString(localTime);

// ignore empty commits, since they are non-trivial to detect
// (e.g. when renaming a directory)
return ExecuteUnless(startInfo, "nothing to commit");
}
// Suppress explicit calls.
}

public override void Tag(string name, string taggerName, string taggerEmail, string comment, DateTime localTime)
public override bool DoCommit(string authorName, string authorEmail, string comment, DateTime localTime)
{
TempFile commentFile;
#if false
// enable this when you find empty commits or uncommitted changes; this will throw on that commit

var args = "tag";
// tools like Mercurial's git converter only import annotated tags
// remark: annotated tags are created with the git -a option,
// see e.g. http://learn.github.com/p/tagging.html
if (forceAnnotatedTags)
{
args += " -a";
}
AddComment(comment, ref args, out commentFile);
var status = git.Status().Call();

// tag names are not quoted because they cannot contain whitespace or quotes
args += " -- " + name;
if (status.IsClean())
throw new InvalidOperationException("Expected changes");

using (commentFile)
{
var startInfo = GetStartInfo(args);
startInfo.EnvironmentVariables["GIT_COMMITTER_NAME"] = taggerName;
startInfo.EnvironmentVariables["GIT_COMMITTER_EMAIL"] = taggerEmail;
startInfo.EnvironmentVariables["GIT_COMMITTER_DATE"] = GetUtcTimeString(localTime);
if (status.GetModified().Count > 0 || status.GetMissing().Count > 0 || status.GetUntracked().Count > 0 || status.GetConflicting().Count > 0)
throw new InvalidOperationException("Have modified, missing, untracked or conflicting files");
#endif

ExecuteUnless(startInfo, null);
}
}
var person = new PersonIdent(authorName, authorEmail, localTime, TimeZoneInfo.Local);

private void SetConfig(string name, string value)
{
VcsExec("config " + name + " " + Quote(value));
git.Commit()
.SetMessage(comment)
.SetAuthor(person)
.SetCommitter(person)
.Call();

return true;
}

private void AddComment(string comment, ref string args, out TempFile tempFile)
public override void Tag(string name, string taggerName, string taggerEmail, string comment, DateTime localTime)
{
tempFile = null;
if (!string.IsNullOrEmpty(comment))
{
// need to use a temporary file to specify the comment when not
// using the system default code page or it contains newlines
if (commitEncoding.CodePage != Encoding.Default.CodePage || comment.IndexOf('\n') >= 0)
{
Logger.WriteLine("Generating temp file for comment: {0}", comment);
tempFile = new TempFile();
tempFile.Write(comment, commitEncoding);

// temporary path might contain spaces (e.g. "Documents and Settings")
args += " -F " + Quote(tempFile.Name);
}
else
{
args += " -m " + Quote(comment);
}
}
else
{
args += " --allow-empty-message --no-edit -m \"\"";
}
git.Tag()
.SetMessage(comment)
.SetTagger(new PersonIdent(taggerName, taggerEmail, localTime, TimeZoneInfo.Local))
.SetName(name)
.Call();
}

private static string GetUtcTimeString(DateTime localTime)
private void SetConfig(string name, string value)
{
// convert local time to UTC based on whether DST was in effect at the time
var utcTime = TimeZoneInfo.ConvertTimeToUtc(localTime);

// format time according to ISO 8601 (avoiding locale-dependent month/day names)
return utcTime.ToString("yyyy'-'MM'-'dd HH':'mm':'ss +0000");
int pos = name.IndexOf('.');
string section = name.Substring(0, pos);
name = name.Substring(pos + 1);
git.GetRepository().GetConfig().SetString(section, null, name, value);
}

private static Regex lastCommitTimestampRegex = new Regex("^Date:\\s*(\\S+)", RegexOptions.Multiline);

public override DateTime? GetLastCommit()
{
if (Directory.Exists(Path.Combine(GetOutputDirectory(), gitMetaDir)) && FindExecutable())
if (git == null)
return null;

foreach (var commit in git.Log().SetMaxCount(1).Call())
{
try {
var startInfo = GetStartInfo("log -n 1 --date=raw");
string stdout, stderr;
int exitCode = Execute(startInfo, out stdout, out stderr);
if (exitCode == 0)
{
var m = lastCommitTimestampRegex.Match(stdout);
if (m.Success)
{
long unixTimeStamp = long.Parse(m.Groups[1].Value);
DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
dt = dt.AddSeconds(unixTimeStamp).ToLocalTime();
return dt;
}
}
} catch (Exception )
{
}
long unixTimeStamp = commit.CommitTime;
DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
return dt.AddSeconds(unixTimeStamp).ToLocalTime();
}

return null;
}

Expand Down
2 changes: 2 additions & 0 deletions Vss2Git/MainForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading