X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitMonitor.vala;h=798971c49438b46d9935dca0bee8c2382c88848b;hp=864e04620de18bef0652134534174f35924531ab;hb=1ca3cefd12af4ec1e3cfa3469fbcfc1afc129723;hpb=90a8811292c4a2d78b55edf043d0c2cd844c0608 diff --git a/GitMonitor.vala b/GitMonitor.vala index 864e0462..798971c4 100644 --- a/GitMonitor.vala +++ b/GitMonitor.vala @@ -250,7 +250,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(); NewBranch.singleton().show(q.repo, oldq); @@ -262,7 +262,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 +299,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 +595,7 @@ public class GitMonitor : Monitor cmd.action = "commit"; cmd.message = cmd.vname; this.queue.add(cmd); - - - + } public override void onDeleted(MonitorNamePathDir src) @@ -623,9 +621,6 @@ public class GitMonitor : Monitor cmd.commit_all = true; this.queue.add(cmd); - - - } public override void onCreated(MonitorNamePathDir src) { @@ -682,8 +677,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 +709,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 +730,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... - - - + + }