X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Git.vala;h=63c03c7e722fb7056c41c7034c56a5ba1f2c1347;hb=128c96fc9db69baca7ba185e8a3def8fddff5f27;hp=957eff7e9766c8e8cf1c7300f928489b9f210fe8;hpb=cfba30023402339612a0e6717fa2d43128c2f17d;p=gitlive

diff --git a/Git.vala b/Git.vala
index 957eff7e..63c03c7e 100644
--- a/Git.vala
+++ b/Git.vala
@@ -1,7 +1,6 @@
 
 // valac -o /tmp/ggit Git.vala --pkg libgit2-glib-1.0 --pkg libsoup-2.4 --pkg gee-0.8 -g
-
-
+ 
 
 void main()
 {
@@ -17,17 +16,36 @@ void main()
             }
          ); 
 
+	
 	Ggit.init();
+	var a = new GitLive.Repo("/home/alan/gitlive/web.Texon");
+	a.fetchAll();
+	return;
+	/*
+	GLib.Timeout.add (1, () => {
+      GLib.debug("Meanwhile");
+      return true;
+    }, GLib.Priority.HIGH);
 	
-	var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
-	a.mergeMasterIntoHead();
+	var loop = new MainLoop();
+	 
+	var a = new GitLive.Repo("/home/alan/gitlive/web.coba");
+      GLib.debug("Starting");	
+	a.loadRemoteHeads.begin(true, (obj,res) => {
+		a.loadRemoteHeads.end(res);
+		 GLib.debug("got results");
+		a.loadLocalBranches();
+		loop.quit();
+	});
+	loop.run();
+	//a.mergeMasterIntoHead();
 	//a.walkDiff();
-	return;
-	a.is_managed();
-	a.is_autocommit();
-	a.loadLocalBranches();
-	a.loadRemoteHeads();
-	a.fetchAll();
+	//return;
+	//a.is_managed();
+	//a.is_autocommit();
+	
+
+	//a.fetchAll();
 	//
 	/*
 	var a = new GitLive.Repo("/home/alan/git/test1-clone");
@@ -56,7 +74,7 @@ void main()
 	//string[] spawn_env = Environ.get ();
 //	Process.spawn_sync ("/home/alan/git/test1-clone", spawn_args, spawn_env, SpawnFlags.SEARCH_PATH, null);
  
-	a.pushAll();
+	//a.pushAll();
 }
  
 
@@ -88,17 +106,29 @@ namespace  GitLive {
 			var r = this.repo.enumerate_branches(Ggit.BranchType.LOCAL);
 			while (r.next()) {
 				var br = r.get() as Ggit.Branch;
+				if (br == null) {
+					continue;
+				}
+				if (br.is_tag()) {
+					continue;
+				}
+				
 				//var head = this.repo.revparse("refs/heads/" + br.get_name() ).get_id();
 				//var rhead = this.repo.revparse(br.get_upstream().get_name() ).get_id();
-				//GLib.debug("got branch: name = %s upstream = %s oid = %s ", 
-				//		br.get_name(), br.get_upstream().get_name(), 
-				//		head.to_string());
-				this.branches.add(br);
-				if (br.is_head()) {
-					GLib.debug("HEAD= %s", br.get_name());
-					this.head = br;
+				try {
+					GLib.debug("got branch: N=%s", br.get_name() );
+					GLib.debug("is_head %s", br.is_head() ? "Y" : "n");
+
+					GLib.debug("upstream = %s", br.get_upstream() == null ? "??" : br.get_upstream().get_name().substring(20));
+					GLib.debug("oid = %s",br.get_target().to_string());
+					this.branches.add(br);
+					if (br.is_head()) {
+						GLib.debug("HEAD= %s", br.get_name());
+						this.head = br;
+					}
+				} catch (Error e) {
+					GLib.debug("Skip branch");
 				}
-				
 			}
 			
 			
@@ -186,9 +216,7 @@ namespace  GitLive {
 			
 			
 			this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
-	
-			
-			
+	 
 			
 			
 		}
@@ -219,9 +247,12 @@ namespace  GitLive {
 			var commits =   new Ggit.AnnotatedCommit[] { ac };
 			
 			this.repo.merge(commits, mo, co);
+			
+			var cfg = this.repo.get_config().snapshot();
+			
 		    var sig = new Ggit.Signature.now(
-					this.repo.get_config().get_string("user.name"),
-					this.repo.get_config().get_string("user.email")
+					cfg.get_string("user.name"),
+					cfg.get_string("user.email")
 			);
 			var new_head = this.repo.get_head();
 			var oid = new_head.get_target();
@@ -232,9 +263,12 @@ namespace  GitLive {
 			var treeoid = ix.write_tree();
 
 			var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
-			this.repo.create_commit(this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
+			
+			var parent = new_head.lookup() as Ggit.Commit;
+			Ggit.Commit[] parents =  new Ggit.Commit[] { parent };
+			
+			this.repo.create_commit("refs/heads/" + this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
 	 
-		
 		}
 		
 		
@@ -280,19 +314,41 @@ namespace  GitLive {
 	 
 		}
 		
-		public void loadRemoteHeads(bool force = false)
+		public async void loadRemoteHeads(bool force = false)
 		{
+		    SourceFunc callback = loadRemoteHeads.callback;
 			
-			if (!force && this.remote_heads != null) {
-				return;
-			}
-			var r = this.repo.lookup_remote("origin");
-			r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
-			this.remote_heads = r.list();
-		
+			ThreadFunc<bool> run = () => {
+				
+				if (!force && this.remote_heads != null) {
+					return true;;
+				}
+				var r = this.repo.lookup_remote("origin");
+				r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
+				yield;
+				this.remote_heads = r.list();
+				
+				foreach(var br in this.remote_heads) {
+					if (!br.get_name().has_prefix("refs/heads/")) {
+						continue;
+					}
+					
+					GLib.debug("Remote: name=%s  oid=%s local_oid=%s is_local=%s",
+						br.get_name(),
+						br.get_oid().to_string(),
+						br.get_local_oid().to_string(),
+						br.is_local() ? "Y" : "n"
+						);
+				}
+				Idle.add((owned) callback);
+				return true;;
+			};
+			new Thread<bool>("loadRemoteHeads-" , run);
+			yield;
+			
+
 		}
-		
-		
+		 
 		
 		Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
 		{
@@ -356,7 +412,10 @@ namespace  GitLive {
 						br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
 					);
 					*/
-					var loc_oid = this.repo.revparse(br.get_name() ).get_id();
+					//var loc_oid = this.repo.revparse(br.get_name() ).get_id();
+					
+					var loc_oid = br.get_target();
+					
 					size_t ahead, behind;
 					this.repo.get_ahead_behind(
 						loc_oid,