GitRepo.vala

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 3c73398..41e9259 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -274,12 +274,12 @@ public class GitRepo : Object
         
     }
     
+    public delegate void GitAsyncCallback (string str);
+    public string pull_async(GitAsyncCallback cb) 
+    {
     
-    async public string pull_async(Callback_pull cb) {
-    
-        //var e = yield dir.enumerate_children_async(
-        //    FileAttribute.STANDARD_NAME, 0, Priority.DEFAULT, null);
-        
+        string[] cmd = { "pull" , "--no-edit" };
+        return this.git_async( cmd , cb);
     
     }
     
@@ -351,5 +351,52 @@ public class GitRepo : Object
         // parse output for some commands ?
         return sp.output;
     }
+       
+       
+       public string git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
+    {
+        // convert arguments.
+        
+        string[]  args = { "git" };
+        //args +=  "--git-dir";
+        //args +=  this.gitdir;
+        args +=  "--no-pager";
+ 
+ 
+        //if (this.gitdir != this.repopath) {
+        //    args +=   "--work-tree";
+         //   args += this.repopath; 
+        //}
+        for (var i = 0; i < args_in.length;i++) {
+            args += args_in[i];
+        }            
 
+        //this.lastCmd = args.join(" ");
+        //if(this.debug) {
+            stdout.printf( "CWD=%s\n",  this.git_working_dir ); 
+            print( "cmd: %s\n", string.joinv (" ", args)); 
+        //}
+
+        string[]   env = {};
+        string  home = "HOME=" + Environment.get_home_dir() ;
+        env +=  home ;
+        // do not need to set gitpath..
+        //if (File.exists(this.repo + '/.git/config')) {
+            //env.push("GITPATH=" + this.repo );
+        //}
+        
+
+        var cfg = new SpawnConfig(this.git_working_dir , args , env);
+        cfg.async = true;
+       
+
+       // may throw error...
+        var sp = new Spawn(cfg);
+        cfg.onFinish((err) {
+               cb(sp.output);
+        });
+        stdout.printf( "GOT: %s\n" , sp.output);
+        // parse output for some commands ?
+        return sp.output;
+    }
 }