Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 4b7c70d..18da46e 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -19,14 +19,24 @@ void main()
 
        Ggit.init();
        
+       var loop = new MainLoop();
+       
        var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
+       
+       a.loadRemoteHeads.begin((obj,res) => {
+               a.loadRemoteHeads.end(res);
+               print("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();
        //
        /*
@@ -93,7 +103,7 @@ namespace  GitLive {
                            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().substring(29), 
+                                               br.get_upstream().get_name().substring(20), 
                                            br.get_target().to_string());
                                this.branches.add(br);
                                if (br.is_head()) {
@@ -286,7 +296,7 @@ namespace  GitLive {
         
                }
                
-               public void loadRemoteHeads(bool force = false)
+               public async  void loadRemoteHeads(bool force = false)
                {
                        
                        if (!force && this.remote_heads != null) {
@@ -374,7 +384,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,