From 61f8440f57bda273568e8d6c16499d37be95c191 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Tue, 21 Apr 2015 15:01:24 +0000
Subject: [PATCH] changed the SubversionModel->getFile() to return less
 information on demand

---
 .../src/codepot/models/subversionmodel.php    | 69 ++++++++++---------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/codepot/src/codepot/models/subversionmodel.php b/codepot/src/codepot/models/subversionmodel.php
index 2f5c33e9..f32343bb 100644
--- a/codepot/src/codepot/models/subversionmodel.php
+++ b/codepot/src/codepot/models/subversionmodel.php
@@ -18,7 +18,7 @@ class SubversionModel extends Model
 		return $canonical;
 	}
 
-	function getFile ($projectid, $path, $rev = SVN_REVISION_HEAD, $no_file_content = FALSE)
+	function getFile ($projectid, $path, $rev = SVN_REVISION_HEAD, $type_and_name_only = FALSE)
 	{
 		//$url = 'file://'.CODEPOT_SVNREPO_DIR."/{$projectid}/{$path}";
 		$orgurl = 'file://'.$this->_canonical_path(CODEPOT_SVNREPO_DIR."/{$projectid}/{$path}");
@@ -55,34 +55,32 @@ class SubversionModel extends Model
 			if (array_key_exists ($info0['path'], $lsinfo) === FALSE) return FALSE;
 			$fileinfo = $lsinfo[$info0['path']];
 
-			if ($no_file_content)
+			if ($type_and_name_only)
 			{
 				$str = '';
+				$fileinfo['properties'] = NULL;
+				$fileinfo['logmsg'] = '';
 			}
 			else
 			{
 				$str = @svn_cat ($workurl, $rev);
 				if ($str === FALSE) return FALSE;
+
+				$log = @svn_log ($workurl, 
+					$fileinfo['created_rev'], 
+					$fileinfo['created_rev'],
+					1, SVN_DISCOVER_CHANGED_PATHS);
+				if ($log === FALSE) return FALSE;
+
+				$prop = @svn_proplist ($workurl, FALSE, $rev);
+				if ($prop === FALSE) return FALSE;
+
+				$fileinfo['properties'] = array_key_exists($orgurl, $prop)?  $prop[$orgurl]: NULL;
+				$fileinfo['logmsg'] = (count($log) > 0)? $log[0]['msg']: '';
 			}
 
-			$log = @svn_log ($workurl, 
-				$fileinfo['created_rev'], 
-				$fileinfo['created_rev'],
-				1, SVN_DISCOVER_CHANGED_PATHS);
-			if ($log === FALSE) return FALSE;
-
-			$prop = @svn_proplist ($workurl, FALSE, $rev);
-			if ($prop === FALSE) return FALSE;
-
-			if (array_key_exists ($orgurl, $prop))
-			{
-				$fileinfo['properties'] = $prop[$orgurl];
-			}
-			else $fileinfo['properties'] = NULL;
-
 			$fileinfo['fullpath'] = substr ($info0['url'], strlen($info0['repos']));
 			$fileinfo['content'] = $str;
-			$fileinfo['logmsg'] = (count($log) > 0)? $log[0]['msg']: '';
  
 			return $fileinfo;
 		}
@@ -93,26 +91,34 @@ class SubversionModel extends Model
 
 			$rev_key = 'last_changed_rev';
 			if (array_key_exists($rev_key, $info0) === FALSE) $rev_key = 'revision';
+			// assume either 'last_changed_rev' or 'revision' exists
 
-			if (array_key_exists($rev_key, $info0) === FALSE || $info0[$rev_key] <= 0) 
+			if ($type_and_name_only)
 			{
-				$log = array();
+				$fileinfo['properties'] = NULL;
+				$fileinfo['logmsg'] = '';
 			}
 			else
 			{
-				$log = @svn_log ($workurl, 
-					$info0[$rev_key], $info0[$rev_key],
-					1, SVN_DISCOVER_CHANGED_PATHS);
-				if ($log === FALSE) return FALSE;
+				if ($info0[$rev_key] <= 0) 
+				{
+					$log = array();
+				}
+				else
+				{
+					$log = @svn_log ($workurl, 
+						$info0[$rev_key], $info0[$rev_key],
+						1, SVN_DISCOVER_CHANGED_PATHS);
+					if ($log === FALSE) return FALSE;
+				}
+
+				$prop = @svn_proplist ($workurl, FALSE, $rev);
+				if ($prop === FALSE) return FALSE;
+
+				$fileinfo['properties'] = array_key_exists($orgurl, $prop)?  $prop[$orgurl]: NULL;
+				$fileinfo['logmsg'] = (count($log) > 0)? $log[0]['msg']: '';
 			}
 
-			$prop = @svn_proplist ($workurl, FALSE, $rev);
-			if ($prop === FALSE) return FALSE;
-
-			if (array_key_exists ($orgurl, $prop))
-				$fileinfo['properties'] = $prop[$orgurl];
-			else $fileinfo['properties'] = NULL;
-
 			$fileinfo['fullpath'] = substr ($info0['url'], strlen($info0['repos']));
 			$fileinfo['name'] =  $info0['path'];
 			$fileinfo['type'] = 'dir';
@@ -123,7 +129,6 @@ class SubversionModel extends Model
 			else
 				$fileinfo['last_author'] = $info0['last_changed_author'];
 			$fileinfo['content'] = $list;
-			$fileinfo['logmsg'] = (count($log) > 0)? $log[0]['msg']: '';
 			return $fileinfo;
 		}