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

Add some todo's

Browse source
This commit is contained in:
Hylke Bons 2010-04-27 17:26:42 +01:00
parent 8bbff43f71
commit 1204c9b561
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SparklePony.cs
View file

@ -304,7 +304,6 @@ public class Repository {
} }
public void Fetch (object o, ElapsedEventArgs args) { public void Fetch (object o, ElapsedEventArgs args) {
Timer.Stop ();
Console.WriteLine ("Fetching changes..."); Console.WriteLine ("Fetching changes...");
Process.StartInfo.FileName = "git"; Process.StartInfo.FileName = "git";
Process.StartInfo.Arguments = "fetch"; Process.StartInfo.Arguments = "fetch";
@ -313,12 +312,14 @@ public class Repository {
} }
public void Merge () { public void Merge () {
Timer.Stop ();
Watcher.EnableRaisingEvents = false; Watcher.EnableRaisingEvents = false;
Console.WriteLine ("Merging fetched changes..."); Console.WriteLine ("Merging fetched changes...");
Process.StartInfo.FileName = "git"; Process.StartInfo.FileName = "git";
Process.StartInfo.Arguments = "merge origin/master"; Process.StartInfo.Arguments = "merge origin/master";
Process.Start(); Process.Start();
Process.WaitForExit (); Process.WaitForExit ();
// TODO: Notify user with the last fetched commit
Watcher.EnableRaisingEvents = true; Watcher.EnableRaisingEvents = true;
Timer.Start (); Timer.Start ();
} }
@ -398,10 +399,11 @@ public class SparklePonyWindow : Window {
Process.StartInfo.RedirectStandardOutput = true; Process.StartInfo.RedirectStandardOutput = true;
Process.StartInfo.UseShellExecute = false; Process.StartInfo.UseShellExecute = false;
// TODO: fix hard coding, system independant
Process.StartInfo.WorkingDirectory = "/home/hbons/Collaboration/Deal"; Process.StartInfo.WorkingDirectory = "/home/hbons/Collaboration/Deal";
Process.StartInfo.FileName = "git"; Process.StartInfo.FileName = "git";
Process.StartInfo.Arguments = "log --pretty=oneline -25"; Process.StartInfo.Arguments = "log --pretty=oneline -20";
Process.Start(); Process.Start();
string Output = Process.StandardOutput.ReadToEnd().Trim (); string Output = Process.StandardOutput.ReadToEnd().Trim ();
@ -428,6 +430,8 @@ public class SparklePonyWindow : Window {
VBox LayoutVerticalRight = new VBox (); VBox LayoutVerticalRight = new VBox ();
// TODO: Fix this, it's hardcoded
Label Label1 = new Label ("Remote URL:"); Label Label1 = new Label ("Remote URL:");
Label1.UseMarkup = true; Label1.UseMarkup = true;
Label1.SetAlignment (0, 0); Label1.SetAlignment (0, 0);