MTrack/SCM/Git/Repo.php

[web.mtrack] / MTrack / SCM / Git / Repo.php

diff --git a/MTrack/SCM/Git/Repo.php b/MTrack/SCM/Git/Repo.php
index 96b4a7c..cf800b0 100644 (file)
--- a/MTrack/SCM/Git/Repo.php
+++ b/MTrack/SCM/Git/Repo.php
@@ -8,6 +8,8 @@ class MTrack_SCM_Git_Repo extends MTrack_Repo
   protected $tags = null;
   public $gitdir = null;
 
+  public $debug = false;
+
   public function getSCMMetaData() {
     return array(
       'name' => 'Git',
@@ -214,11 +216,17 @@ HOOK;
      * 
      * @param  string path (can be empty - eg. '')
      * @param  {number|date} limit  how many to fetch
+     *
+     *      -- prefered args:
+     *          
      * @param  {string} object = eg. rev|tag|branch  (use 'rev' here and ident=HASH to retrieve a speific revision
      * @param  {string} ident = 
      *
      * Example:
      *   - fetch on revision?:  '.',1,'rev','xxxxxxxxxx'
+     *
+     *
+     * range... object ='rev' ident ='master..release'
      * 
      */
     public function history($path, $limit = null, $object = null, $ident = null)
@@ -234,15 +242,23 @@ HOOK;
         } else {
             $args[] = "master";
         }
-        
+       
     
         if ($limit !== null) {
             if (is_int($limit)) {
                 $args[] = "--max-count=$limit";
-            } else if (is_array($limit)) {
+            } else if (is_array($limit) && isset($limit[0]) && isset($limit[2])) {
                 
+                $args[] = "--skip={$limit[0]} --max-count={$limit[1]}";
+            } else if (is_object($limit) ) {
+                foreach($limit as $k=>$v) {
+                     
+                    $args[] = ($k = '-') ? $v : ('--'. $k .'='. $v);
+                    
+                }
                 $args[] = "--skip={$limit[0]} --max-count={$limit[1]}";
             } else {
+                    
                 $args[] = "--since=$limit";
             }
         }
@@ -256,7 +272,10 @@ HOOK;
         
         //echo '<PRE>';print_r($args);echo '</PRE>';
         $path = ltrim($path, '/');
-        //print_R(array($args, '--' ,$path));
+        
+        
+        
+        //   print_R(array($args, '--' ,$path));exit;
         $fp = $this->git('log', $args, '--', $path);
 
         $commits = array();
@@ -311,11 +330,11 @@ HOOK;
         return $this->git('diff', "$from^..$from", '--', $path);
       }
 
-  public function getWorkingCopy()
-  {
-    require_once 'MTrack/SCM/Git/WorkingCopy.php';
-    return new MTrack_SCM_Git_WorkingCopy($this);
-  }
+    public function getWorkingCopy()
+    {
+        require_once 'MTrack/SCM/Git/WorkingCopy.php';
+        return new MTrack_SCM_Git_WorkingCopy($this);
+    }
 
   public function getRelatedChanges($revision) // pretty nasty.. could end up with 1000's of changes..
   {
@@ -340,31 +359,34 @@ HOOK;
     return array($parents, $kids);
   }
 
-  function git()
-  {
-         $args = func_get_args();
-        $a = array(
-          "--git-dir=$this->gitdir"
-        );
-        
-        
-        
-        if ($this->gitdir != $this->repopath) {
-        //    print_r(array($this->gitdir , $this->repopath));
-            
-          //$a[] = "--work-tree=$this->repopath";
-        }
-        foreach ($args as $arg) {
-            if (is_array($arg)) {
-                $a = array_merge($a, $arg);
-                continue;
-            }
-            $a[] = $arg;
-        }
-        //var_dump('git ' . join (' ' , $a));
-        //print_r($a);
-        return MTrackSCM::run('git', 'read', $a);
-  }
+    function git()
+    {
+           $args = func_get_args();
+          $a = array(
+            "--git-dir=$this->gitdir"
+          );
+          
+          
+          
+          if ($this->gitdir != $this->repopath) {
+          //    print_r(array($this->gitdir , $this->repopath));
+              
+            //$a[] = "--work-tree=$this->repopath";
+          }
+          foreach ($args as $arg) {
+              if (is_array($arg)) {
+                  $a = array_merge($a, $arg);
+                  continue;
+              }
+              $a[] = $arg;
+          }
+          if ($this->debug) { 
+              var_dump('git ' . join (' ' , $a));
+            //  die("oops");
+          }
+         // echo "git " . implode(" " , $a) . "\n";
+          return MTrackSCM::run('git', 'read', $a);
+    }
   
    
     function commitLogToEvent($str) {