handling of old branches

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 823696e..77a56f2 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -255,38 +255,39 @@ public class GitRepo : Object
     {
        // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
        // also need to decide which branch we will merge into?
-       var ret = "";
-       if (action == "CLOSE" || action == "LEAVE") {
-                       
+                  var ret = "";
+                  if (action == "CLOSE" || action == "LEAVE") {
+                                  
  
-                       try {
-                               var oldbranch = this.currentBranch.name;
-                               this.setActiveTicket(null, "master");
-                       string [] cmd = { "merge",   "--squash",  oldbranch };
-                       this.git( cmd );
-                        cmd = { "commit",   "--m",  commit_message };
-                       this.git( cmd );
-                       this.loadBranches(); // updates lastrev..
-                       
-                       var notification = new Notify.Notification(
-                                       "Merged branch %s to master".printf(oldbranch),
-                                       "",
-                                        "dialog-information"
-                                       
-                               );
-       
-                               notification.set_timeout(5);
-                               notification.show();   
-                       
-                       // close ticket..
-                       return true; 
-                       
-                   } catch (Error e) {
+               try {
+                       var oldbranch = this.currentBranch.name;
+                       this.setActiveTicket(null, "master");
+               string [] cmd = { "merge",   "--squash",  oldbranch };
+               this.git( cmd );
+                cmd = { "commit",   "--m",  commit_message };
+               this.git( cmd );
+               this.push();
+               this.loadBranches(); // updates lastrev..
+               
+               var notification = new Notify.Notification(
+                               "Merged branch %s to master".printf(oldbranch),
+                               "",
+                                "dialog-information"
+                               
+                       );
 
-                       GitMonitor.gitmonitor.pauseError(e.message);
-                       return false;
-                   }
-                   // error~?? -- show the error dialog...
+                       notification.set_timeout(5);
+                       notification.show();   
+               
+               // close ticket..
+               return true; 
+               
+           } catch (Error e) {
+
+               GitMonitor.gitmonitor.pauseError(e.message);
+               return false;
+           }
+           // error~?? -- show the error dialog...
                    return false;
        }
        if (action == "MASTER") {
@@ -336,24 +337,89 @@ public class GitRepo : Object
     }
     
     
-   public void setActiveTicket(RooTicket ticket, string branchname)
+    public bool setActiveTicket(RooTicket ticket, string branchname)
     {
-       this.createBranchNamed(branchname);
+       if (!this.createBranchNamed(branchname)) {
+               return false;
+               }
        FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
        this.activeTicket = ticket;
+       return true;
     }
     
-    public void createBranchNamed(string branchname)
-    {
-         if (this.branches.has_key(branchname)) {
-                string[] cmd = { "checkout", branchname  };
-                this.git(cmd);         
-       } else {
-                string[] cmd = { "checkout", "-b" , branchname  };
-                this.git(cmd);
-        }
+    public bool createBranchNamed(string branchname)
+    {  
+               
+                       var stash = false;
+                    if (this.branches.has_key(branchname)) {
+                       // this is where it get's tricky...
+                               try {                   
+                                               string[] cmd = { "ls-files" ,  "-m" };                   // list the modified files..
+                                           var ret = this.git(cmd);
+                                           stash = ret.length> 1 ;
+                                           
+                                               
+                                           cmd = { "stash" };                  
+                                           if (stash) { this.git(cmd); }
+                                           
+                                           cmd = { "checkout", branchname  };
+                                           this.git(cmd);
+                                 } catch(Error e) {
+                                               GitMonitor.gitmonitor.pauseError(e.message);
+                                               return false;           
+                               
+                                 }
+                                 try {
+                                    string[] cmd = { "merge", "master"  };
+                                           this.git(cmd);
+                                  } catch(Error e) {
+                                               try {
+                                                   string[] cmd = { "mergetool" };
+                                                       this.git(cmd);
+                                                   cmd = { "commit",  "-m" , "Fix merge conflicts from master" };
+                                                       this.git(cmd);
+                                               } catch(Error ee) {
+                                                       GitMonitor.gitmonitor.pauseError(ee.message);
+                                                       return false;           
+                                               }
+                                       }
+                                 try {                                 
+                                          string[]  cmd = { "stash", "pop"  };
+                                           if (stash) { this.git(cmd); }
+                                       } catch(Error ee) {
+                                               GitMonitor.gitmonitor.pauseError(ee.message);
+                                               return false;           
+                                       }
+                   this.push();
+                   
+                   } else {
+                                   try {                                       
+                                          
+                                       string[] cmd = { "checkout", "-b" , branchname  };
+                                       this.git(cmd);
+                                       
+                       this.push();                                    
+                                       } catch(Error ee) {
+                                               GitMonitor.gitmonitor.pauseError(ee.message);
+                                               return false;           
+                                       }
+                           
+                   }
+                      var notification = new Notify.Notification(
+                       "Changed to branch %s".printf(branchname),
+                       "",
+                        "dialog-information"
+                       
+               );
+
+               notification.set_timeout(5);
+               notification.show();   
+       
+                   
+           
         this.loadBranches(); // update branch list...
         GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
+        return true;
     }
     
     
@@ -516,7 +582,7 @@ public class GitRepo : Object
     public string push () throws Error, SpawnError
     {
         // should 
-        return this.git({ "push", "origin", "HEAD" });
+        return this.git({ "push", "--all" });
         
     }