X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitMonitor.vala;h=7e42154a36ed151ddd550430b44291e697db7edc;hp=7866310357719fe7236a34836f8363c16eeb4797;hb=9e641e366549656621a3e4fc4950b62c4b395650;hpb=ec124418d1155a2a952f2ca6db1b01e5ab0e1009

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 78663103..7e42154a 100644
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -54,13 +54,19 @@ public class GitMonitor : Monitor
 			if (this.queue.size < 1  || this.queueRunning) {
 				return true;
 			}
+			var first = this.queue.get(0);
+			var delay = true;
+			if (!first.repo.is_wip_branch() && first.repo.is_auto_branch()) {
+				delay = false;
+			}
+			
 			
 			var last = -1 * this.lastAdd.difference(new DateTime.now(new TimeZone.local()));
  
 			// stdout.printf("LAST RUN: %s (expect %s) \n" ,
 			//         last.to_string(),   (5 * TimeSpan.SECOND).to_string() );
  
-			if (last < 5 * TimeSpan.SECOND) { // wait 5 seconds before running. ????
+			if (delay && last < 5 * TimeSpan.SECOND) { // wait 5 seconds before running. ????
 				return true;
 			}
 			//_this.lastAdd = new Date();
@@ -250,7 +256,7 @@ public class GitMonitor : Monitor
 		}
 		
 		foreach(var q in this.queue) {
-			if (!q.shouldIgnore() && !q.repo.is_wip_branch()) {
+			if (!q.shouldIgnore() && !q.repo.is_wip_branch() && q.repo.is_auto_branch()) {
 				var oldq = this.queue;
 				this.queue =  new Gee.ArrayList<GitMonitorQueue>(); 
 				NewBranch.singleton().show(q.repo, oldq);
@@ -262,7 +268,7 @@ public class GitMonitor : Monitor
 		
 		 
 		
-		GLib.debug("GitMonitor.runQueue\n");
+		GLib.debug("GitMonitor.runQueue size =%d\n", this.queue.size);
 
 		this.queueRunning = true;
 
@@ -299,7 +305,7 @@ public class GitMonitor : Monitor
 			var gitpath = cmd.gitpath; 
 			
 			var repo = GitRepo.get( gitpath );
-			if ( !repo.is_wip_branch()) {
+			if ( !repo.is_wip_branch() && repo.is_auto_branch()) {
 				leave_queued.add(cmd);
 				continue;
 			}
@@ -595,9 +601,7 @@ public class GitMonitor : Monitor
 		cmd.action = "commit";
 		cmd.message = cmd.vname;
 		this.queue.add(cmd);
-		
-		
-		  
+ 
 		 
 	}
 	public override  void onDeleted(MonitorNamePathDir src) 
@@ -623,9 +627,6 @@ public class GitMonitor : Monitor
 		cmd.commit_all = true;
 
 		this.queue.add(cmd);
-		
-		 
-		
  
 	}
 	public override  void onCreated(MonitorNamePathDir src) {
@@ -682,8 +683,6 @@ public class GitMonitor : Monitor
 		cmd.action = "commit";
 		cmd.message = "Attribute changed " + cmd.vname;
 		this.queue.add(cmd);
-		
-	 
 	}
  
    public  override void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest)  
@@ -737,14 +736,9 @@ public class GitMonitor : Monitor
 			cmd.message = cmd_d.vname;
 		}
 		
-		
 		this.queue.add(cmd);
- 
-        // this is where it get's complicated...
-        // as we might be moving across repo's...
-        
-        
-        
+
+
 		 
 	}