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

Merge branch 'master' into notes

Browse source 
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
This commit is contained in:
Hylke 2011-06-24 19:13:02 +01:00
parent 7fc565629d a9455c0608
commit ef292b34cc
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -564,16 +564,6 @@ namespace SparkleLib {
}
public override void CreateInitialChangeSet ()
{
base.CreateInitialChangeSet ();
Add ();
string message = FormatCommitMessage ();
Commit (message);
}
public override void AddNote (string revision, string note)
{
int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds;

9
SparkleLib/SparkleRepoBase.cs
View file

@ -86,12 +86,11 @@ namespace SparkleLib {
this.status = status;
};
if (CurrentRevision == null) {
CreateInitialChangeSet ();
HasUnsyncedChanges = true;
}
CreateWatcher ();
if (CurrentRevision == null)
CreateInitialChangeSet ();
CreateListener ();
this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) {

3
SparkleShare/SparkleController.cs
View file

@ -899,6 +899,9 @@ namespace SparkleShare {
public void FetchFolder (string server, string remote_folder)
{
server = server.Trim ();
remote_folder = remote_folder.Trim ();
if (!Directory.Exists (SparklePaths.SparkleTmpPath))
Directory.CreateDirectory (SparklePaths.SparkleTmpPath);