Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 8c7235c..706afd6 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -20,14 +20,14 @@ void main()
        Ggit.init();
        
        var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
-       a.mergeMasterIntoHead();
+       //a.mergeMasterIntoHead();
        //a.walkDiff();
-       return;
-       a.is_managed();
-       a.is_autocommit();
+       //return;
+       //a.is_managed();
+       //a.is_autocommit();
        a.loadLocalBranches();
        a.loadRemoteHeads();
-       a.fetchAll();
+       //a.fetchAll();
        //
        /*
        var a = new GitLive.Repo("/home/alan/git/test1-clone");
@@ -56,7 +56,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();
 }
  
 
@@ -90,9 +90,10 @@ namespace  GitLive {
                                var br = r.get() as Ggit.Branch;
                                //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());
+                                 GLib.debug("got branch: H=%s name = %s upstream = %s oid = %s ", 
+                                               br.is_head() ? "Y" : "n",
+                                               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());
@@ -182,11 +183,12 @@ namespace  GitLive {
                                        this.repo.get_config().get_string("user.name"),
                                        this.repo.get_config().get_string("user.email")
                        );
-                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
-       
                        
                        
                        
+                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
+        
+                       
                        
                }
                public void mergeMasterIntoHead()
@@ -216,46 +218,28 @@ namespace  GitLive {
                        var commits =   new Ggit.AnnotatedCommit[] { ac };
                        
                        this.repo.merge(commits, mo, co);
-                       /*
-                       if (ix.has_conflicts()) {
-                               GLib.debug("merge has conflicts");
-                               return;
-                       }
                        
                        var cfg = this.repo.get_config().snapshot();
-                       var sig = new Ggit.Signature.now(
+                       
+                   var sig = new Ggit.Signature.now(
                                        cfg.get_string("user.name"),
                                        cfg.get_string("user.email")
                        );
+                       var new_head = this.repo.get_head();
+                       var oid = new_head.get_target();
 
-                       var parents =   new Ggit.OId[] { anc_commit.get_id() };
-                       
-                       var treeoid = ix.write_tree_to(this.repo);
+                       var ix = this.repo.get_index();
  
-                       this.repo.create_commit_from_ids("HEAD", 
-                                sig, sig, null, "Test Merge", treeoid, parents);
-                       
-                       /*
-                       var master_tree = master_commit.get_tree();
-                       var head_tree = head_commit.get_tree();
-                       var mo = new Ggit.MergeOptions();
-                       mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
-                       var ix  = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
-                       
-                       // might be conflicts..
-                       this.repo.checkout_index(ix, new Ggit.CheckoutOptions());
-                        var treeoid = ix.write_tree();
-                        
-                         
-                       var parents =   new Ggit.Commit[] { master_commit };
-
+                       ix.write();
+                       var treeoid = ix.write_tree();
 
                        var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
                        
-                               );
-                       this.repo.create_commit("HEAD", 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);
+        
                }