Merge remote-tracking branch 'upstream/master' into windows

NEWS

@@ -1,3 +1,12 @@
+0.2.5 for Linux and Mac (...):
+
+        Hylke: Reimplement notes to be less buggy and backend independent. Polish
+        about dialog and event log html. Fix a bug where large collections of files 
+        weren't being synced when adding them at the same time. The event log now
+        collapses huge change sets. Add a controller per UI component to make the
+        Windows verion easier to implement.
+
+
 0.2.4 for Linux and Mac (Wed Jun 29, 2011):
 
         Hylke: Fix crash when setting up with an empty Git repository.

SparkleLib/Git/SparkleRepoGit.cs

@@ -128,12 +128,11 @@ namespace SparkleLib {
         public override bool SyncUp ()
         {
             Add ();
-
-            string message = FormatCommitMessage ();
-            Commit (message);
+            Commit ("Changes made by SparkleShare");
 
             SparkleGit git = new SparkleGit (LocalPath, "push origin master");
             git.Start ();
+            git.StandardOutput.ReadToEnd ();
             git.WaitForExit ();
 
             if (git.ExitCode == 0)
@@ -228,11 +227,9 @@ namespace SparkleLib {
         // Commits the made changes
         private void Commit (string message)
         {
-            if (!AnyDifferences)
-                return;
-
             SparkleGit git = new SparkleGit (LocalPath, "commit -m \"" + message + "\"");
             git.Start ();
+            git.StandardOutput.ReadToEnd ();
             git.WaitForExit ();
 
             SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message);
@@ -268,7 +265,6 @@ namespace SparkleLib {
                     ResolveConflict ();
 
                 SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
-
                 OnConflictResolved ();
             }
 

SparkleLib/SparkleRepoBase.cs

@@ -276,6 +276,7 @@ namespace SparkleLib {
         {
             lock (this.change_lock) {
                 if (this.has_changed) {
+                    Console.WriteLine ("checking...");
                     if (this.sizebuffer.Count >= 4)
                         this.sizebuffer.RemoveAt (0);
                         
@@ -317,6 +318,10 @@ namespace SparkleLib {
             if (AnyDifferences) {
                 this.is_buffering = true;
 
+                // We want to disable wathcing temporarily, but
+                // not stop the local timer
+                this.watcher.EnableRaisingEvents = false;
+
                 // Only fire the event if the timer has been stopped.
                 // This prevents multiple events from being raised whilst "buffering".
                 if (!this.has_changed) {
@@ -326,7 +331,7 @@ namespace SparkleLib {
 
                 SparkleHelpers.DebugInfo ("Event", "[" + Name + "] " + wct.ToString () + " '" + args.Name + "'");
                 SparkleHelpers.DebugInfo ("Event", "[" + Name + "] Changes found, checking if settled.");
-                
+
                 this.remote_timer.Stop ();
 
                 lock (this.change_lock) {
@@ -436,9 +441,8 @@ namespace SparkleLib {
                 if (SyncStatusChanged != null)
                     SyncStatusChanged (SyncStatus.Idle);
 
-                SparkleChangeSet change_set = GetChangeSets (1) [0];    
-                if (NewChangeSet != null && change_set.Revision != CurrentRevision)
-                    NewChangeSet (change_set, LocalPath);
+                if (NewChangeSet != null)
+                    NewChangeSet (GetChangeSets (1) [0], LocalPath);
 
                 // There could be changes from a
                 // resolved conflict. Tries only once,

SparkleShare/Mac/SparkleShare.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>SparkleShare</RootNamespace>
     <AssemblyName>SparkleShare</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <ReleaseVersion>0.2.1</ReleaseVersion>
+    <ReleaseVersion>0.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

SparkleShare/Mac/SparkleShare.sln

@@ -16,6 +16,6 @@ Global
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = SparkleShare.csproj
-		version = 0.2.1
+		version = 0.2.5
 	EndGlobalSection
 EndGlobal

configure.ac

@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 m4_define([sparkleshare_version],
-	[0.2.4])
+	[0.2.5])
 
 m4_define([sparkleshare_asm_version],
-	[0.2.4])
+	[0.2.5])
 
 AC_PREREQ([2.54])
 AC_INIT([SparkleShare], sparkleshare_version)

data/html/event-log.html

@@ -144,7 +144,7 @@
                 margin-bottom: 24px;
                 padding-bottom: 24px;
                 border-bottom: 1px  <!-- $secondary-font-color --> solid;
-                width: 90%;
+                width: 95%;
                 margin-left: auto;
                 margin-right: auto;
                 padding-left: 72px;