X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitMonitor.vala;h=1b11558f03dba3a900904694d23f1078d44e3f51;hp=864e04620de18bef0652134534174f35924531ab;hb=62bcbeee7e77f9f8774f13569dc9fb5cc25666d6;hpb=90a8811292c4a2d78b55edf043d0c2cd844c0608

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 864e0462..1b11558f 100644
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -54,13 +54,21 @@ public class GitMonitor : Monitor
 			if (this.queue.size < 1  || this.queueRunning) {
 				return true;
 			}
+			var first = this.queue.get(0);
+			var delay = true;
+			
+			// eg. on master.... and is_auto branch
+			if (first.repo.is_master_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 +258,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_master_branch() && q.repo.is_auto_branch()) {
 				var oldq = this.queue;
 				this.queue =  new Gee.ArrayList<GitMonitorQueue>(); 
 				NewBranch.singleton().show(q.repo, oldq);
@@ -262,7 +270,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 +307,7 @@ public class GitMonitor : Monitor
 			var gitpath = cmd.gitpath; 
 			
 			var repo = GitRepo.get( gitpath );
-			if ( !repo.is_wip_branch()) {
+			if ( repo.is_master_branch() && repo.is_auto_branch()) {
 				leave_queued.add(cmd);
 				continue;
 			}
@@ -595,9 +603,7 @@ public class GitMonitor : Monitor
 		cmd.action = "commit";
 		cmd.message = cmd.vname;
 		this.queue.add(cmd);
-		
-		
-		  
+ 
 		 
 	}
 	public override  void onDeleted(MonitorNamePathDir src) 
@@ -623,9 +629,6 @@ public class GitMonitor : Monitor
 		cmd.commit_all = true;
 
 		this.queue.add(cmd);
-		
-		 
-		
  
 	}
 	public override  void onCreated(MonitorNamePathDir src) {
@@ -682,8 +685,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)  
@@ -716,12 +717,9 @@ public class GitMonitor : Monitor
 		if (cmd_d.shouldIgnore()) {
 			
 			this.onDeleted(src);
- 
-
 			return;
 		}
-		
-		
+		 
 		GLib.debug("RM: %s", cmd_s.vname);
 		cmd_s.action = "rm";
 		this.queue.add(cmd_s);
@@ -740,14 +738,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...
-        
-        
-        
+
+
 		 
 	}