X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitBranch.vala;h=e9964922c156b7a133061bdb9b643b1734dafc0f;hb=01af28a18150e1c30fd20ef32da736c7ceee80ef;hp=42b58df2c2ed073bab00a961b8d819887fe690b8;hpb=50e8f8d7063021f7a069a60ffba1d43fabcad4a6;p=gitlive

diff --git a/GitBranch.vala b/GitBranch.vala
index 42b58df2..e9964922 100644
--- a/GitBranch.vala
+++ b/GitBranch.vala
@@ -36,7 +36,8 @@ public class GitBranch : Object
 	public string remote = "";
 	public string remoterev = "";
 	public string age = "";
- 
+    public int ahead = 0;
+    public int behind = 0;    
 	
      
 	
@@ -67,9 +68,9 @@ public class GitBranch : Object
       	
       	//var branches =  new Gee.HashMap<string,GitBranch>();
        	//var local =  new Gee.HashMap<string,GitBranch>();
-       	var remotes  =  new Gee.HashMap<string,string>();
+       	var remotes  =  new Gee.HashMap<string,Ggit.OId>();
        	var remotes_used  =  new Gee.HashMap<string,bool>();
-       	var remotes_oid  =  new Gee.HashMap<string,Ggit.OId>();
+       	 
   
 		
 		var rem = repo.repo.lookup_remote("origin");
@@ -81,48 +82,96 @@ public class GitBranch : Object
 			if (!rn.has_prefix("refs/heads/")) {
 				continue;
 			}
-			remotes.set(rn.substring(11), rh.get_oid().to_string());
+			remotes.set(rn.substring(11), rh.get_oid());
 			remotes_used.set(rn.substring(11), false);
-	  }
+
+	  } 
 		
 		 
 		var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
 		while (r.next()) {
+		
+
+		
 			var br = new GitBranch(repo);
 			var gbr = r.get() as Ggit.Branch;
-			repo.branches.set(gbr.get_name(), br);
+			if (!gbr.is_branch()) {
+				continue;
+			}
+			
 			br.active = gbr.is_head();
 			br.name = gbr.get_name();
 			br.lastrev = gbr.get_target().to_string();
-			var rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
+			string rname ;
+			try {
+				rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
+			} catch(Error e) {
+				GLib.debug("Skip branch = got error");
+				continue;
+			}
+			repo.branches.set(gbr.get_name(), br);			
 			if (rname.has_prefix("refs/remotes/origin/")) {
 				rname = rname.substring(20);
 				if (remotes.has_key(rname)) {
 					br.remote = rname;
-					br.remoterev = remotes.get(rname);
+					br.remoterev = remotes.get(rname).to_string();
 					remotes_used.set(rname,true);
+					size_t ahead, behind;
+					repo.repo.get_ahead_behind(
+						gbr.get_target(),
+						remotes.get(rname),
+						out ahead,
+						out behind
+					);
+					br.ahead = (int)ahead;
+					br.behind = (int) behind;
+
 				}
-				size_t ahead, behind;
-				repo.repo.get_ahead_behind(
-					gbr.get_target(),
-					rh.get_oid(),
-					out ahead,
-					out behind
-				);
-				repo.revparse(br.get_name() ).get_id();
+				 
 				
 				// age?
 				// behind or infront..
 			}
+			if (br.active) {
+				GLib.debug("repo: %s currentBranch = %s", repo.name, br.name);
+				repo.currentBranch = br;
+			}
 			
 		}
 		
 		// find unused remotes.. and track them...
+		foreach(var rn in remotes_used.keys) {
+			if (remotes_used.get(rn)) {
+				continue;
+			}
+			if (repo.branches.has_key(rn)) {
+				GLib.debug("skip tracking branch - same name exists?");
+				continue;
+			}
+			// not clear how to do this yet...
+			try {
+				repo.git(  { "branch" ,"--track" , rn,  "origin/" + rn} ); 
+			} catch (Error e) {
+				continue; // allow failure?
+			}
+			var br = new GitBranch(repo);
+			br.name = rn;
+			br.lastrev = ""; // it's behind
+			br.remoterev  =  remotes.get(rn).to_string();
+			br.remote = rn;
+			br.ahead = 0;
+			br.behind = 1;
+			// behind/ahead == 0...
+			repo.branches.set(rn, br);
+			
+		}
+		if (repo.currentBranch == null) {
+			GLib.error("could not find active Branch for %s", repo.name);
+		}
 		
+		         
 		
-		
-		
-       	
+       	/*
       //	 repo.git( { "fetch",  "-a" } ); == done async before...
        	
      	string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
@@ -193,7 +242,7 @@ public class GitBranch : Object
         	br.name  = newname;
         	local.set(br.name, br);
         }
-        
+        */
         /*
         this bit of the code tries to turn a local branch into a track of a remote one.
         -- that's probably not a good idea.
@@ -208,9 +257,9 @@ public class GitBranch : Object
         	name = name.replace("/", ".");
         	
         }
-        */
+       
         repo.branches = local;
-        
+         */
     
 	
 	}
@@ -242,10 +291,7 @@ public class GitBranch : Object
 		return this.is_remote ? this.remote : this.name;
 	}
 	
-	public void create()
-	{
-	
-	}
+//	public void create() { }
 	
 }