X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitRepo.vala;h=5c866c32b48740e04b659978a804b55cac19abb0;hb=a395b6b09677f19eb25a27479d7591d65353d744;hp=f75b4df411fcf1c531ed3bc0da0f82700b1baf6a;hpb=33a57ba5841339535fb3c3189e68a1d96678eb32;p=gitlive

diff --git a/GitRepo.vala b/GitRepo.vala
index f75b4df4..5c866c32 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -19,6 +19,7 @@ public class GitRepo : Object
     public string git_working_dir;
     public bool debug = false;
     public bool has_local_changes = false;
+    public string host = "";
     public string git_status;    
     public string git_diff;        
     public string ahead_or_behind = "";
@@ -171,6 +172,12 @@ public class GitRepo : Object
 		if ( !cache.has_key(path) ) {
 			cache.set( path, this);
     	}
+    	
+    	var r = this.git({ "remote" , "get-url" , "--push" , "origin"});
+    	var uri = new Soup.URI(r);    	
+    	this.host = uri.get_host();
+		this.init_config();
+    	
     	this.loadBranches();
     	this.loadActiveTicket();
     	this.loadStatus();
@@ -178,86 +185,84 @@ public class GitRepo : Object
     
     public bool is_master_branch()
     {
-    	return this.currentBranch.name == "master";
+    	// special branches that do not allow autopushing now...
+    	return this.currentBranch.name == "master" || this.currentBranch.name == "roojs";
     		
     }
-    
-    public bool is_managed()
+    public void init_config()
     {
-    	// is it a roojs origin?
-    	var r = this.git({ "remote" , "get-url" , "--push" , "origin"});
-    	var uri = new Soup.URI(r);
-    	if (uri.get_host() != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
-	    	return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS);
+    	// managed = 
+    	if (this.get_config("managed") == "") {
+    		this.set_config("managed", this.host == "git.roojs.com" ? "1" : "0");
+		}
+    	if (this.get_config("autocommit") == "") {
+    		this.set_config("autocommit", this.host == "git.roojs.com" ? "1" : "0");
+		}
+    	if (this.get_config("autopush") == "") {
+    		this.set_config("autopush", this.host == "git.roojs.com" ? "1" : "0");
+		}
+    }
+    
+    
+    
+    public string get_config(string key) {
+    	try {
+	    	return  this.git({ "config" , "gitlive." + key });
+    	} catch (Error e) {
+    		return ""; // happens when there is nothing set...
     	}
-    	// otherwise see if unmanaged is set to disable it..
-    	return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);  
 
+	}
+    public void set_config(string key, string value) {
+    	this.git({ "config" , "gitlive." + key, value });
+	}
+    
+    public bool is_managed()
+    {
+    	return this.get_config("managed") == "1";
     }
     
     
     public bool is_autocommit ()
-    {
-    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
+    {    	
+    	return this.get_config("autocommit") == "1";    	
     }
+    
     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" ); 
-		}
+ 		this.set_config("autocommit", val ? "1" : "0");
     
     }
     
     public bool is_auto_branch ()
     {
-    	return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
+    	if (this.name == "gitlog") {
+    		return false;
+		}
+		// check remote...
+    	if (this.is_managed()) {
+    		return true;
+		}
+    	return false;
+    	
+ 
     }
     
     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" ); 
+		if (this.name == "gitlog") {
+    		return;
 		}
+		this.set_config("managed", val ? "1" : "0");
     
     }
     public bool is_autopush ()
     {
-    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
+    	return this.get_config("autopush") == "1";
     }
     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" ); 
-		}
-    
+		this.set_config("autopush", val ? "1" : "0");
     }
     
     
@@ -410,11 +415,8 @@ public class GitRepo : Object
     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);  
+		var ticket_id = this.get_config("ticket");
+    	
     	if (ticket_id.length < 1) {
     		return;
 		}
@@ -427,14 +429,11 @@ public class GitRepo : Object
     
     public bool setActiveTicket(RooTicket? ticket, string branchname)
     {
+    	this.set_config("ticket", "");
     	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.set_config("ticket", ticket == null ? "": ticket.id);
     	this.activeTicket = ticket;
     	return true;
     }
@@ -778,6 +777,8 @@ public class GitRepo : Object
        // may throw error...
         var sp = new Spawn(cfg);
       
+	     //GLib.debug( "GOT result: %d" , sp.result);
+      
       	// diff output is a bit big..
 		if (args_in[0] != "diff") {
 	        GLib.debug( "GOT: %s" , sp.output);
@@ -879,7 +880,9 @@ public class GitRepo : Object
     	repo.loadStatus();
     	
     	update_all_total--;
+		GLib.debug("calls remaining = %d", update_all_total);    	
     	if (update_all_total > 0 ) {
+
     		return;
 		}
 		switch (update_all_after) {