X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=cf962d637f6ceeb3463cd3cb5161439bff09ca7f;hp=823696ec8019c0c02665dd5f2b0dafed029d5e3c;hb=1f7e6b712f9ee99d621a3a67f1c0795c6106bde6;hpb=40bf1f4bee21b09eedf5d8e2596ee0b72b234c45

diff --git a/GitRepo.vala b/GitRepo.vala
index 823696ec..cf962d63 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -32,7 +32,7 @@ public class GitRepo : Object
         }
         return _GitRepo;
     }
-
+ 
     /**
     * index of.. matching gitpath..
     */
@@ -167,6 +167,7 @@ public class GitRepo : Object
 			cache.set( path, this);
     	}
     	this.loadBranches();
+    	this.loadActiveTicket();
     } 
     
     public bool is_wip_branch()
@@ -179,10 +180,67 @@ public class GitRepo : Object
     {
     	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
     }
+    public void set_autocommit(bool val)
+    {
+
+		var cur = this.is_autocommit();
+		GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF",  cur  ? "ON" : "OFF");
+		if (cur == val) {
+			return; // no change..
+		}
+		if (!val) {
+			FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
+		} else {
+			// it exists...
+			FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" ); 
+		}
+    
+    }
+    
+    public bool is_auto_branch ()
+    {
+    	return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
+    }
+    
+    public void set_auto_branch(bool val)
+    {
+
+		var cur = this.is_auto_branch();
+		GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF",  cur  ? "ON" : "OFF");
+		
+		if (cur == val) {
+			return; // no change..
+		}
+		if (val) {
+			FileUtils.set_contents(this.gitdir + "/.gitlive-enable-auto-branch" , "x");
+		} else {
+			// it exists...
+			FileUtils.remove(this.gitdir + "/.gitlive-enable-auto-branch" ); 
+		}
+    
+    }
     public bool is_autopush ()
     {
     	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
     }
+    public void set_autopush(bool val)
+    {
+
+		var cur = this.is_autopush();
+		GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF",  cur  ? "ON" : "OFF");
+		if (cur == val) {
+			return; // no change..
+		}
+		if (!val) {
+			FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
+		} else {
+			// it exists...
+			FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" ); 
+		}
+    
+    }
+    
+    
     
     Gee.HashMap<string,GitBranch> branches;
     
@@ -247,46 +305,44 @@ public class GitRepo : Object
        }
        GitMonitor.gitmonitor.start();
     }
-    
-
-
+     
 
     public bool doMerge(string action, string ticket_id, string commit_message)
     {
        // 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") {
-                       
- 
-                       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) {
+		   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",   "-a" , "-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") {
@@ -334,26 +390,118 @@ public class GitRepo : Object
        }
        return false;
     }
+        
+    public void loadActiveTicket()
+    {
+    	this.activeTicket = null;
+    	if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
+	    	return;
+    	}
+    	string ticket_id;
+    	FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);  
+    	if (ticket_id.length < 1) {
+    		return;
+		}
+		this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
+    	
+    	
+    }
     
     
-   public void setActiveTicket(RooTicket ticket, string branchname)
+    
+    public bool setActiveTicket(RooTicket? ticket, string branchname)
     {
-    	this.createBranchNamed(branchname);
-    	FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
+    	if (!this.createBranchNamed(branchname)) {
+    		return false;
+		}
+		if (ticket != null) {
+	    	FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
+    	} else {
+	    	FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
+    	}
     	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 {
+					   if (branchname != "master") {
+					       string[] cmd = { "merge", "master"  };
+						    this.git(cmd);
+						    this.push();
+			  		       //cmd = { "commit",   "-a" , "-m",  "merge master changes" };
+			               //git chethis.git( cmd );
+					    }
+					    
+				   } catch(Error e) {
+   				   	    string[] cmd = { "checkout", "master"  };
+					    this.git(cmd);
+				 		GitMonitor.gitmonitor.pauseError(
+				 			"Use\n\na) git checkout %s\nb) git mergetool\nc) git commit\nd) git push\n d) stash pop \ne) start gitlive again\n".printf(
+				 				branchname)
+			 				 + e.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);
+
+                       cmd = { "push", "-u" , "origin" ,"HEAD"  };
+				        this.git(cmd);
+                     
+				        } 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...
+    	 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
+    	 return true;
     }
     
     
@@ -516,7 +664,7 @@ public class GitRepo : Object
     public string push () throws Error, SpawnError
     {
         // should 
-        return this.git({ "push", "origin", "HEAD" });
+        return this.git({ "push"  });
         
     }