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

Merge branch 'master' of https://github.com/kristi/SparkleShare into integration

Browse source
This commit is contained in:
Hylke Bons 2011-02-05 16:35:47 +00:00
parent e28aed5223 c16b62263d
commit 4c72883e28
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SparkleLib/SparkleRepo.cs
View file

@ -270,7 +270,12 @@ namespace SparkleLib {
UserName = Config ["user.name"];
UserEmail = Config ["user.email"];
_CurrentHash = Head.CurrentCommit.Hash;
if (Head.CurrentCommit == null)
_CurrentHash = null;
else
_CurrentHash = Head.CurrentCommit.Hash;
_IsSyncing = false;
_IsBuffering = false;
_IsPolling = true;
@ -435,7 +440,6 @@ namespace SparkleLib {
process.StartInfo.UseShellExecute = false;
process.StartInfo.WorkingDirectory = LocalPath;
process.StartInfo.Arguments = "ls-remote origin master";
process.Start ();
process.Exited += delegate {
@ -454,6 +458,8 @@ namespace SparkleLib {
};
process.Start ();
/* FIXME: LsRemoteCommand is not yet implemented by GitSharp
LsRemoteCommand ls_remote = new LsRemoteCommand () {
@ -678,9 +684,6 @@ namespace SparkleLib {
process.StartInfo.Arguments = "fetch -v origin master";
process.Start ();
process.WaitForExit ();
process.Exited += delegate {
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.WaitForExit ();
Process.Start ();
Process.Exited += delegate {
@ -876,6 +881,7 @@ namespace SparkleLib {
}
};
Process.Start ();
}

2
SparkleShare/SparkleIntro.cs
View file

@ -589,7 +589,7 @@ namespace SparkleShare {
open_folder_button.Clicked += delegate {
SparkleShare.Controller.OpenSparkleShareFolder (folder_name);
SparkleShare.Controller.OpenSparkleShareFolder (System.IO.Path.GetFileNameWithoutExtension(folder_name));
};