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

add todo

Browse source
This commit is contained in:
Hylke Bons 2010-05-17 00:53:23 +01:00
parent 0e5583f7f1
commit 8aec24471c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleShare/SparkleRepo.cs
View file

@ -223,7 +223,7 @@ namespace SparkleShare {
FetchTimer.Stop (); FetchTimer.Stop ();
// SparkleUI.NotificationIcon.SetSyncingState (); // SparkleUI.NotificationIcon.SetSyncingState ();
Console.WriteLine ("[Git][" + Name + "] Fetching changes... "); Console.WriteLine ("[Git][" + Name + "] Fetching changes... ");
Process.StartInfo.Arguments = "fetch"; Process.StartInfo.Arguments = "fetch -v"; // TODO: Only call merge when there are changes
Process.Start(); Process.Start();
Process.WaitForExit (); Process.WaitForExit ();
Console.WriteLine ("[Git][" + Name + "] Changes fetched."); Console.WriteLine ("[Git][" + Name + "] Changes fetched.");
@ -234,7 +234,7 @@ namespace SparkleShare {
// Merges the fetched changes // Merges the fetched changes
public void Merge () { public void Merge () {
Watcher.EnableRaisingEvents = false; // Watcher.EnableRaisingEvents = false;
Console.WriteLine ("[Git][" + Name + "] Merging fetched changes... "); Console.WriteLine ("[Git][" + Name + "] Merging fetched changes... ");
Process.StartInfo.Arguments = "merge origin/master"; Process.StartInfo.Arguments = "merge origin/master";
Process.Start(); Process.Start();
@ -265,7 +265,7 @@ namespace SparkleShare {
} }
Watcher.EnableRaisingEvents = true; // Watcher.EnableRaisingEvents = true;
Console.WriteLine ("[Git][" + Name + "] Nothing going on... "); Console.WriteLine ("[Git][" + Name + "] Nothing going on... ");
} }