GitRepo.vala

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 3465ed8..5ff250b 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -19,7 +19,7 @@ public class GitRepo : Object
     /**
     * index of.. matching gitpath..
     */
-     public static int indexOfAdd( Array<GitRepo> repos, string gitpath) {
+     public static int indexOf( Array<GitRepo> repos, string gitpath) {
         for(var i =0; i < repos.length; i++) {
             if (repos.index(i).gitdir == gitpath) {
                 return i;
@@ -57,12 +57,12 @@ public class GitRepo : Object
      *
      * @argument {Array} files the files to add.
      */
-    public string add ( Array<GitMonitorQueue> files )
+    public string add ( Array<GitMonitorQueue> files ) throws Error, SpawnError
     {
         // should really find out if these are untracked files each..
         // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
         // not sure if that is how git works.. but just be certian.
-        return = "";
+        var ret = "";
         for (var i = 0; i < files.length;i++) {
             var f = files.index(i).vname;
             try {
@@ -82,7 +82,7 @@ public class GitRepo : Object
      *
      * @argument {Array} files the files to add.
      */
-    public string remove  ( Array<GitMonitorQueue> files )
+    public string remove  ( Array<GitMonitorQueue> files ) throws Error, SpawnError
     {
         // this may fail if files do not exist..
         // should really find out if these are untracked files each..
@@ -118,7 +118,7 @@ public class GitRepo : Object
      * 
      */
      
-    public string commit ( string message, Array<GitMonitorQueue> files  )
+    public string commit ( string message, Array<GitMonitorQueue> files  ) throws Error, SpawnError
     {
         
 
@@ -140,7 +140,7 @@ public class GitRepo : Object
             
         }
         */
-        string[] args = { "commit", "-m", };
+        string[] args = { "commit", "-m" };
         args +=  (message.length > 0  ? message : "Changed" );
         for (var i = 0; i< files.length ; i++ ) {
             args += files.index(i).vname; // full path?
@@ -157,7 +157,7 @@ public class GitRepo : Object
      * -- maybe later it will have a few options and do more stuff..
      *
      */
-    public string pull ()
+    public string pull () throws Error, SpawnError
     {
         // should probably hand error conditions better... 
         string[] cmd = { "pull" };
@@ -174,7 +174,7 @@ public class GitRepo : Object
      * -- maybe later it will have a few options and do more stuff..
      *
      */
-    public string push ()
+    public string push () throws Error, SpawnError
     {
         // should 
         return this.git({ "push" });
@@ -187,7 +187,7 @@ public class GitRepo : Object
      *
      */
     
-    public string git(string[] args_in, ?string[] env) throws Error, SpawnError
+    public string git(string[] args_in ) throws Error, SpawnError
     {
         // convert arguments.
         
@@ -197,9 +197,9 @@ public class GitRepo : Object
         args +=  this.gitdir;
         args +=  "--no-pager";
 
-        if (env == null) {
-            env = {};
-        }
+         
+
+        
 
         //if (this.gitdir != this.repopath) {
         //    args +=   "--work-tree";
@@ -214,6 +214,7 @@ public class GitRepo : Object
          
             print(  string.joinv (", ", args)); 
         }
+        string[]   env = {};
         string  home = "HOME=" + Environment.get_home_dir() ;
         env +=  home ;
         // do not need to set gitpath..