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

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 543ba589..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;
 			}
@@ -594,7 +602,7 @@ public class GitMonitor : Monitor
 		cmd = new GitMonitorQueue(src);
 		cmd.action = "commit";
 		cmd.message = cmd.vname;
-		this.queue.append_val(cmd);
+		this.queue.add(cmd);
  
 		 
 	}
@@ -620,7 +628,7 @@ public class GitMonitor : Monitor
 		cmd.message = cmd.vname;
 		cmd.commit_all = true;
 
-		this.queue.append_val(cmd);
+		this.queue.add(cmd);
  
 	}
 	public override  void onCreated(MonitorNamePathDir src) {
@@ -676,7 +684,7 @@ public class GitMonitor : Monitor
 		cmd = new GitMonitorQueue(src);
 		cmd.action = "commit";
 		cmd.message = "Attribute changed " + cmd.vname;
-		this.queue.append_val(cmd);
+		this.queue.add(cmd);
 	}
  
    public  override void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest)  
@@ -730,7 +738,7 @@ public class GitMonitor : Monitor
 			cmd.message = cmd_d.vname;
 		}
 		
-		this.queue.append_val(cmd);
+		this.queue.add(cmd);