fix warnings

[web.mtrack] / MTrackWeb / Hook / git.php

diff --git a/MTrackWeb/Hook/git.php b/MTrackWeb/Hook/git.php
index 4c9ef44..8ffbb00 100755 (executable)
--- a/MTrackWeb/Hook/git.php
+++ b/MTrackWeb/Hook/git.php
@@ -7,6 +7,18 @@
  *  #repo/hooks/post-receive
  *  /usr/bin/php {PATH TO APPLICATION}/index.php Hook/git post  >> /tmp/githooklog
  *
+ *
+ *
+ *
+ * to run this on old commits:
+ *
+ 
+  git rev-list --since="last month"    --pretty=format:"%H %P" refs/heads/master \
+        | grep -v commit  \
+        | awk -v q='"' '{ print "echo " q $NF " " $1 " refs/heads/master" q " | /usr/bin/php /home/gitlive/web.mtrack/roo.php Hook/git post " } '                  \
+        | sh
+
+ 
  *
  *
  */
@@ -39,7 +51,7 @@ class MTrackWeb_Hook_git extends MTrackWeb
     
     
      
-    function get($action)
+    function get($action='')
     {
         try {
             $repo = DB_DataObject::factory('mtrack_repos');
@@ -61,7 +73,7 @@ class MTrackWeb_Hook_git extends MTrackWeb
             
             $who = $revs[0]->changebyToEmail();
             
-            $this->authUser = DB_DataObject::factory('Person');
+            $this->authUser = DB_DataObject::factory('core_person');
             $this->authUser->get('email', $who); 
             
             $cfg = HTML_FlexyFramework::get()->MTrackWeb;
@@ -77,7 +89,6 @@ class MTrackWeb_Hook_git extends MTrackWeb
                     'authUser' => $this->authUser,
             ));
              
-             
             switch ($action) {
                 
                 case 'pre':
@@ -89,16 +100,26 @@ class MTrackWeb_Hook_git extends MTrackWeb
                     
                     // at this point we have
                     // checker->no_ticket (contains commits without tickets
+                    // print_r($checker);exit;
                     
+                    //DB_DataObject::DebugLevel(1);
                     foreach($checker->no_ticket as $change_event) {
                         $cg = DB_DataObject::factory('mtrack_change');
-                        $cg->createFromCommit($change_event, $checker);
-                        
+                        $res= $cg->createFromCommit($change_event, $checker);
+                        if (!$res) {
+                            echo "Skip - commit already exists\n";
+                        }
                     }
+                    
+                    // in our system this happens when we merge normally.
                     foreach($checker->deferred as $ticket=> $info) {
                         foreach($info['changes'] as $ev) {
                             $cg = DB_DataObject::factory('mtrack_change');
-                            $cg->createFromCommit($ev, $checker, $info['ticket']);
+                            $res=  $cg->createFromCommit($ev, $checker, $info['ticket']);
+                            if (!$res) {
+                                echo "Skip - commit already exists\n";
+                            }
+                            
                         }