GitRepo.vala

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 9002546..b5e9ad0 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -18,6 +18,7 @@ public class GitRepo : Object
     public bool debug = false;
     
     public Gee.HashMap<string,bool> ignore_files;
+    public GitBranch currentBranch;
 
     /**
     * index of.. matching gitpath..
@@ -136,6 +137,69 @@ public class GitRepo : Object
         //Repo.superclass.constructor.call(this,cfg);
         
     } 
+    
+    
+    public bool is_autocommit ()
+    {
+       return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
+    }
+    public bool is_autopush ()
+    {
+       return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
+    }
+    
+    Gee.HashMap<string,GitBranch> branches;
+    
+    public void loadBranches()
+    {
+       this.branches = new Gee.HashMap<string,GitBranch>();
+       
+       string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
+        var res = this.git( cmd );
+        var lines = res.split("\n");
+        for (var i = 0; i < lines.length ; i++) {
+               var br = new GitBranch(this);
+               if (!br.parseBranchListItem(lines[i])) {
+                       continue;
+               }
+               GLib.debug("add branch %s", br.realName());
+                
+               branches.set(br.realName(), br);
+               if (br.active) {
+                       this.currentBranch = br;
+               }
+        }
+    
+    }
+    public string branchesToString()
+    {
+       var ret = "";
+               foreach( var br in this.branches.values) {
+                       if (br.name == "") {
+                               continue; 
+                       }
+                       ret += ret.length > 0 ? ","  : "";
+                       ret += br.name;
+               
+               }
+               return ret;
+       
+    }
+    
+    public void setActiveTicket(RooTicket ticket, string branchname)
+    {
+       
+    
+    }
+    
+    public void createBranchNamed(string branchname)
+    {
+        string[] cmd = { "checkout", "-b" , branchname  };
+        this.git(cmd);
+        this.loadBranches(); // update branch list...
+    }
+    
+    
     /**
      * add:
      * add files to track.
@@ -274,7 +338,7 @@ public class GitRepo : Object
         
     }
     
-    public delegate void GitAsyncCallback (GitRepo repo, string str);
+    public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
     public void pull_async(GitAsyncCallback cb) 
     {
     
@@ -401,8 +465,8 @@ public class GitRepo : Object
     
     void git_async_on_complete(int err, string output)
     {
-               GLib.debug("GOT %s", output);
-               this.git_async_on_callback(this, output);
+               GLib.debug("GOT %d : %s", err, output);
+               this.git_async_on_callback(this, err, output);
 //             this.unref();   
        //      sp.unref();