add todo
This commit is contained in:
parent
bf6e381281
commit
8a303ba102
|
@ -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... ");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue