Merge branch 'master' of https://github.com/kristi/SparkleShare into integration
This commit is contained in:
commit
4c72883e28
|
@ -270,7 +270,12 @@ namespace SparkleLib {
|
||||||
|
|
||||||
UserName = Config ["user.name"];
|
UserName = Config ["user.name"];
|
||||||
UserEmail = Config ["user.email"];
|
UserEmail = Config ["user.email"];
|
||||||
_CurrentHash = Head.CurrentCommit.Hash;
|
|
||||||
|
if (Head.CurrentCommit == null)
|
||||||
|
_CurrentHash = null;
|
||||||
|
else
|
||||||
|
_CurrentHash = Head.CurrentCommit.Hash;
|
||||||
|
|
||||||
_IsSyncing = false;
|
_IsSyncing = false;
|
||||||
_IsBuffering = false;
|
_IsBuffering = false;
|
||||||
_IsPolling = true;
|
_IsPolling = true;
|
||||||
|
@ -435,7 +440,6 @@ namespace SparkleLib {
|
||||||
process.StartInfo.UseShellExecute = false;
|
process.StartInfo.UseShellExecute = false;
|
||||||
process.StartInfo.WorkingDirectory = LocalPath;
|
process.StartInfo.WorkingDirectory = LocalPath;
|
||||||
process.StartInfo.Arguments = "ls-remote origin master";
|
process.StartInfo.Arguments = "ls-remote origin master";
|
||||||
process.Start ();
|
|
||||||
|
|
||||||
process.Exited += delegate {
|
process.Exited += delegate {
|
||||||
|
|
||||||
|
@ -454,6 +458,8 @@ namespace SparkleLib {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
process.Start ();
|
||||||
|
|
||||||
/* FIXME: LsRemoteCommand is not yet implemented by GitSharp
|
/* FIXME: LsRemoteCommand is not yet implemented by GitSharp
|
||||||
|
|
||||||
LsRemoteCommand ls_remote = new LsRemoteCommand () {
|
LsRemoteCommand ls_remote = new LsRemoteCommand () {
|
||||||
|
@ -678,9 +684,6 @@ namespace SparkleLib {
|
||||||
|
|
||||||
process.StartInfo.Arguments = "fetch -v origin master";
|
process.StartInfo.Arguments = "fetch -v origin master";
|
||||||
|
|
||||||
process.Start ();
|
|
||||||
process.WaitForExit ();
|
|
||||||
|
|
||||||
process.Exited += delegate {
|
process.Exited += delegate {
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes fetched.");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes fetched.");
|
||||||
|
@ -713,6 +716,9 @@ namespace SparkleLib {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
process.Start ();
|
||||||
|
process.WaitForExit ();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -832,7 +838,6 @@ namespace SparkleLib {
|
||||||
Process.StartInfo.Arguments = "push origin master";
|
Process.StartInfo.Arguments = "push origin master";
|
||||||
|
|
||||||
Process.WaitForExit ();
|
Process.WaitForExit ();
|
||||||
Process.Start ();
|
|
||||||
|
|
||||||
Process.Exited += delegate {
|
Process.Exited += delegate {
|
||||||
|
|
||||||
|
@ -876,6 +881,7 @@ namespace SparkleLib {
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Process.Start ();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -589,7 +589,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
open_folder_button.Clicked += delegate {
|
open_folder_button.Clicked += delegate {
|
||||||
|
|
||||||
SparkleShare.Controller.OpenSparkleShareFolder (folder_name);
|
SparkleShare.Controller.OpenSparkleShareFolder (System.IO.Path.GetFileNameWithoutExtension(folder_name));
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue