beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[repo] Fix NewCommit event not being fired

Browse source
This commit is contained in:
Hylke Bons 2011-03-01 23:42:00 +00:00
parent bb5229d4d3
commit a1ba6f1b36
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SparkleLib/SparkleRepo.cs
View file

@ -713,9 +713,9 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes..."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");
SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD"); SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
git.Exited += delegate { git.Exited += delegate {
Console.WriteLine ("EXITED");
if (Status.MergeConflict.Count > 0) { if (Status.MergeConflict.Count > 0) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected..."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected...");
@ -755,19 +755,18 @@ namespace SparkleLib {
Push (); Push ();
} }
_CurrentHash = Head.CurrentCommit.Hash;
if (NewCommit != null)
NewCommit (GetCommits (1) [0], LocalPath);
}; };
git.Start (); git.Start ();
git.WaitForExit (); git.WaitForExit ();
_CurrentHash = Head.CurrentCommit.Hash;
if (NewCommit != null)
NewCommit (GetCommits (2) [0], LocalPath); // FIXME: GetCommits doesn't like 1
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes rebased."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes rebased.");
Watcher.EnableRaisingEvents = true; Watcher.EnableRaisingEvents = true;
@ -967,7 +966,7 @@ namespace SparkleLib {
foreach (string log_entry in entries) { foreach (string log_entry in entries) {
Regex regex = new Regex (@"^commit ([a-z0-9]+)\n" + Regex regex = new Regex (@"commit ([a-z0-9]+)\n" +
"Author: (.+) <(.+)>\n" + "Author: (.+) <(.+)>\n" +
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " + "Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" + "([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +