Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 1e8752b..0755899 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -1,5 +1,5 @@
 
-// valac -o /tmp/ggit Git.vala --pkg libgit2-glib-1.0 --pkg libsoup-2.4 -pkg gee-0.8 -g
+// valac -o /tmp/ggit Git.vala --pkg libgit2-glib-1.0 --pkg libsoup-2.4 --pkg gee-0.8 -g
 
 
 
@@ -20,7 +20,8 @@ void main()
        Ggit.init();
        
        var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
-       a.walkDiff();
+       a.mergeMasterIntoHead();
+       //a.walkDiff();
        return;
        a.is_managed();
        a.is_autocommit();
@@ -125,6 +126,8 @@ namespace  GitLive {
                {
                        this.loadLocalBranches();
                        
+                       
+                       
                        var oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
                        var moid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
                        
@@ -160,7 +163,7 @@ namespace  GitLive {
                        // let's try a merge..
                        var mo = new Ggit.MergeOptions();
                        mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
-                       var ix = this.repo.merge_trees(null, master_tree, head_tree, mo);
+                       var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
                        
                        if (ix.has_conflicts()) {
                                GLib.debug("merge has conflicts");
@@ -179,13 +182,54 @@ 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 commit " + str, new_tree, parents);
+                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
        
                        
                        
                        
                        
                }
+               public void mergeMasterIntoHead()
+               {
+                       // assumes head is not master...
+                       this.loadLocalBranches();
+                       GLib.debug("head rev = %s", this.head.get_name());
+                       var head_oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
+                       var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
+
+                       var master_commit  = this.repo.lookup_commit(master_oid);;
+                       var head_commit = this.repo.lookup_commit(head_oid);
+                        
+               
+                       var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
+                       
+                       var anc_commit = this.repo.lookup_commit(anc_oid);
+                       var anc_tree = anc_commit.get_tree();
+                       
+                       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);
+                       ix.write();
+                        var treeoid = ix.write_tree();
+                        
+                        
+                         
+                       var parents =   new Ggit.Commit[] { master_commit };
+
+
+                       var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
+                       
+                       var sig = new Ggit.Signature.now(
+                                       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);
+       
+               
+               }
+               
                
                /*
                public bool doMergeClose(string commit_message)