From db24f003399a99c4ef03a7b234bc495f85245b63 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 15 Jan 2019 18:32:22 +0800
Subject: [PATCH] Fix #5661 - MTrack - daily email large and no branch

---
 DataObjects/Mtrack_change.php       |  2 +-
 DataObjects/Mtrack_repos.php        | 51 ++++++++++-------------------
 DataObjects/Mtrack_repos_branch.php |  1 -
 3 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/DataObjects/Mtrack_change.php b/DataObjects/Mtrack_change.php
index 35d52d8..d11c56a 100644
--- a/DataObjects/Mtrack_change.php
+++ b/DataObjects/Mtrack_change.php
@@ -346,7 +346,7 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
         if ($obj->tableName() == 'mtrack_ticket') {
             $obj = $obj->project();
         } else {
-            $obj = $obj->branchObject($this->branch);
+            $obj = empty($this->branch) ? $obj : $obj->branchObject($this->branch);
         }
         if ($obj) {
            
diff --git a/DataObjects/Mtrack_repos.php b/DataObjects/Mtrack_repos.php
index 60d01bf..f11da7d 100644
--- a/DataObjects/Mtrack_repos.php
+++ b/DataObjects/Mtrack_repos.php
@@ -853,40 +853,25 @@ class Pman_MTrack_DataObjects_Mtrack_repos extends DB_DataObject
         
         //$this->impl()->debug=1;
         //print_r(array('since'=> '{'.$start.'}' , 'before' => '{'.$end .'}'));
-        $res = $this->impl()->history('.', array('since'=> '{'.$start.'}' , 'before' => '{'.$end .'}'), 'rev', '--all');
-        
-        $branches = array();
-        foreach($res as $r) {
-            if (!preg_match('#^refs/heads/.*$#', $r->branch)) {
-                continue;
-            }
-            $br = preg_replace('#^refs/heads/.*$#', $r->branch, '');
-            $branches[$br] = 1;
-                
-        }
-        $objs = array();
-        foreach($branches as $branch=>$one) {
-            
-            
-            $res = $this->impl()->history('.', array('since'=> '{'.$start.'}' , 'before' => '{'.$end .'}'), $object, $branch);
-             
-            // find the last rev the day before...
-            
-            
-             
-            $obj = $this->historyToSummary($res, $notify->act_start);
-            if (!$obj) {
-               // echo "History returned nothing";
-                return true;
-            }
-            $obj->from_dt = $start;
-            $obj->to_dt = $end;
-            $obj->branch = $br;
-            //print_r($obj);exit; 
+    
          
-            $objs[] = $obj;
-        }
-        $ret =   $rcpt->buildMail('repo_daily_changes', array('branches' => $obj));
+         $res = $this->impl()->history('.', array('since'=> '{'.$start.'}' , 'before' => '{'.$end .'}'), $object, $branch);
+          
+         // find the last rev the day before...
+         
+         
+          
+         $obj = $this->historyToSummary($res, $notify->act_start);
+         if (!$obj) {
+            // echo "History returned nothing";
+             return true;
+         }
+         $obj->from_dt = $start;
+         $obj->to_dt = $end;
+         $obj->branch = $branch ? $branch : 'master';
+            //print_r($obj);exit; 
+          
+        $ret =   $rcpt->buildMail('repo_daily_changes', $obj);
         
         return $ret;
         
diff --git a/DataObjects/Mtrack_repos_branch.php b/DataObjects/Mtrack_repos_branch.php
index a2c593b..97058b0 100644
--- a/DataObjects/Mtrack_repos_branch.php
+++ b/DataObjects/Mtrack_repos_branch.php
@@ -35,7 +35,6 @@ class Pman_MTrack_DataObjects_Mtrack_repos_branch extends DB_DataObject
         $start = date('Y-m-d H:i:s', strtotime($notify->act_start . ' - 1 DAY'));
         $end = date('Y-m-d H:i:s', strtotime($notify->act_start));
         
-           
         $object = 'branch';
         $branch = $this->name;
     
-- 
2.39.2