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

check for changes before merging, but reading output doesn't work

Browse source
This commit is contained in:
Hylke Bons 2010-05-19 00:39:56 +01:00
parent 78dfda62e0
commit 9048474c02
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleShare/SparkleRepo.cs
View file

@ -223,11 +223,13 @@ namespace SparkleShare {
FetchTimer.Stop ();
// SparkleUI.NotificationIcon.SetSyncingState ();
Console.WriteLine ("[Git][" + Name + "] Fetching changes... ");
Process.StartInfo.Arguments = "fetch -v"; // TODO: Only call merge when there are changes
Process.StartInfo.Arguments = "fetch -v";
Process.Start();
string Output = Process.StandardOutput.ReadToEnd().Trim (); // TODO: This doesn't work :(
Process.WaitForExit ();
Console.WriteLine ("[Git][" + Name + "] Changes fetched.");
Merge ();
if (!Output.Contains ("up to date"))
Merge ();
// SparkleUI.NotificationIcon.SetIdleState ();
FetchTimer.Start ();
}