Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 7ef8bf7..5d4d6ac 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
 
 
 
@@ -155,20 +155,50 @@ namespace  GitLive {
                        
                        diff.print(Ggit.DiffFormatType.PATCH, ( delta,  hunk,  line) => {
                                GLib.debug("%d: %s, %s", line.get_new_lineno(), line.get_origin().to_string(), line.get_text());
-                               return 1;
+                               return 0;
                        });
+                       // let's try a merge..
+                       var mo = new Ggit.MergeOptions();
+                       mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
+                       var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
                        
-//                     noid = a.next()
-       //              while (noid != null) {
-                               
-                               
-       //                      noid = a.next();
-       //              }
+                       if (ix.has_conflicts()) {
+                               GLib.debug("merge has conflicts");
+                               return;
+                       }
+                        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 void mergeMasterIntoHead()
+               {
+                       // assumes head is not master...
+                       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);
+               
+               
                }
                
+               
                /*
                public bool doMergeClose(string commit_message)
                {