X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitRepo.vala;h=989a32b578ed769439db547bc0a07033032dbc0a;hb=48b3d2b4281bfa78ae11b4dfb5f91d5475aefd90;hp=4c1185fef66258e7370a5b05105e531c78c3a325;hpb=a3f138eb624031e06f385eebeb974a1f78ab88bf;p=gitlive

diff --git a/GitRepo.vala b/GitRepo.vala
index 4c1185fe..989a32b5 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -18,6 +18,7 @@ public class GitRepo : Object
     public bool debug = false;
     
     public Gee.HashMap<string,bool> ignore_files;
+    public GitBranch currentBranch;
 
     /**
     * index of.. matching gitpath..
@@ -140,12 +141,51 @@ public class GitRepo : Object
     
     public bool is_autocommit ()
     {
-    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.IS_DIR);
+    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
     }
     public bool is_autopush ()
     {
-    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.IS_DIR);
-    }    
+    	return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
+    }
+    
+    Gee.HashMap<string,GitBranch> branches;
+    
+    public void loadBranches()
+    {
+     	this.branches = new Gee.HashMap<string,GitBranch>();
+     	
+     	string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
+        var res = this.git( cmd );
+        var lines = res.split("\n");
+        for (var i = 0; i < lines.length ; i++) {
+        	var br = new GitBranch(this);
+        	if (!br.parseBranchListItem(lines[i])) {
+	        	continue;
+        	}
+        	GLib.debug("add branch %s", br.realName());
+        	 
+        	branches.set(br.realName(), br);
+        	if (br.active) {
+        		this.currentBranch = br;
+    		}
+        }
+    
+    }
+    public string branchesToString()
+    {
+    	var ret = "";
+		foreach( var br in this.branches.values) {
+			if (br.name == "") {
+				continue; 
+			}
+			ret += ret.length > 0 ? ","  : "";
+			ret += br.name;
+		
+		}
+		return ret;
+    	
+    }
+    
     /**
      * add:
      * add files to track.