NewBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 904a22f..6f84765 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -21,6 +21,7 @@ public class MergeBranch : Object
     public Xcls_name name;
 
         // my vars (def)
+    public GitRepo repo;
     public RooTicket? ticket;
     public bool running;
 
@@ -85,12 +86,20 @@ public class MergeBranch : Object
             }
                */
                
-               GitRepo.doMerges(
-                       _this.actionsel.selectedAction(), 
-                       _this.ticketsel.selectedTicketId(),
-                       _this.name.el.get_text()
-               );
+               if (this.repo != null) {
+                       repo.doMerge(
+                               _this.actionsel.selectedAction(), 
+                               _this.ticketsel.selectedTicketId(),
+                               _this.name.el.get_text()
+                       );
                
+               } else {
+                       GitRepo.doMerges(
+                               _this.actionsel.selectedAction(), 
+                               _this.ticketsel.selectedTicketId(),
+                               _this.name.el.get_text()
+                       );
+               }
                this.running = false; 
         
                 
@@ -491,7 +500,7 @@ public class MergeBranch : Object
         // user defined functions
         public void loadTickets () {
         
-            RooTicket.singleton().loadTickets();
+            RooTicket.singleton().loadTickets("",RooTicket.NotMe.FALSE, RooTicket.Closed.FALSE);
             
             _this.ticketsel.loading = true;