Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 22cb679..24efb6b 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -144,9 +144,9 @@ namespace  GitLive {
                        var parent = commit.get_parents();
                        GLib.debug("parent = %s", parent.get_id(0).to_string());
                        var master_rev =  parent.get_id(0);
-                       var master_commit  = this.repo.lookup(master_rev, typeof(Ggit.Commit)) as Ggit.Commit;
+                       var master_commit  = this.repo.lookup_commit(master_rev);;
                        
-                       var head_commit = this.repo.lookup(oid, typeof(Ggit.Commit)) as Ggit.Commit;
+                       var head_commit = this.repo.lookup_commit(oid);
                        
                        var master_tree = master_commit.get_tree();
                        var head_tree = head_commit.get_tree();
@@ -155,15 +155,33 @@ 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(null, master_tree, head_tree, mo);
+                       
+                       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(
+                                       Ggit.Config.get_string("user.name"),
+                                       Ggit.Config.get_string("user.email")
+                       );
+                       a.repo.create_commit("HEAD", sig, sig, null, "test commit " + str, new_tree, parents);
+       
                        
-//                     noid = a.next()
-       //              while (noid != null) {
-                               
-                               
-       //                      noid = a.next();
-       //              }