diff --git a/modules/issuetracker/classes/svn.class.php b/modules/issuetracker/classes/svn.class.php index 25e75cb81..7cacf7068 100644 --- a/modules/issuetracker/classes/svn.class.php +++ b/modules/issuetracker/classes/svn.class.php @@ -9,7 +9,6 @@ var $url = null; var $svn_cmd = null; - var $diff_cmd = null; var $tmp_dir = '/tmp'; @@ -17,13 +16,12 @@ var $userid = null; var $passwd = null; - function Svn($url, $svn_cmd='/usr/bin/svn', $diff_cmd='/usr/bin/diff', $userid=null, $passwd=null) { + function Svn($url, $svn_cmd='/usr/bin/svn', $userid=null, $passwd=null) { if(substr($url,-1)!='/') $url .= '/'; $this->url = $url; if(strstr($svn_cmd, " ") != FALSE) $this->svn_cmd = '"'.$svn_cmd.'"' ; else $this->svn_cmd = $svn_cmd; - $this->diff_cmd = $diff_cmd; $this->tmp_dir = _XE_PATH_.'files/cache/tmp'; if(!is_dir($this->tmp_dir)) FileHandler::makeDir($this->tmp_dir); @@ -134,67 +132,6 @@ return $output; } - function getDiff($path, $brev = null, $erev = null) { - $eContent = $this->getFileContent($path, $erev); - $bContent = $this->getFileContent($path, $brev); - if(!$eContent||!$bContent) return; - - $eFile = sprintf('%s/tmp.%s',$this->tmp_dir, md5($eContent->revision."\n".$eContent->content)); - $bFile = sprintf('%s/tmp.%s',$this->tmp_dir, md5($bContent->revision."\n".$bContent->content)); - - $f = fopen($eFile,'w'); - fwrite($f, $eContent->content); - fclose($f); - - $f = fopen($bFile,'w'); - fwrite($f, $bContent->content); - fclose($f); - - $command = sprintf('%s %s %s', $this->diff_cmd, $bFile, $eFile); - $output = $this->execCmd($command, $error); - - $list = explode("\n", $output); - $cnt = count($list); - - $output = array(); - $obj = null; - for($i=0;$i<$cnt;$i++) { - $line = $list[$i]; - if(preg_match('/^([0-9,]+)(d|c|a)([0-9,]+)$/',$line, $mat)) { - if($obj!==null) $output[] = $obj; - $obj = null; - $before = $mat[1]; - switch($mat[2]) { - case 'c' : $type = 'modified'; break; - case 'd' : $type = 'deleted'; break; - case 'a' : $type = 'added'; break; - } - - $t = explode(',',$after); - $after = $mat[3]; - - $obj->before_line = $before; - $obj->after_line = $after; - $obj->diff_type = $type; - $obj->before_code = ''; - $obj->after_code = ''; - } - - if($obj!==null&&preg_match('/^',$line)) { - $str = substr($line,1); - $obj->before_code .= $str."\n"; - } - - if($obj!==null&&preg_match('/^>/',$line)) { - $str = substr($line,1); - $obj->after_code .= $str."\n"; - } - } - if($obj!==null) $output[] = $obj; - - return $output; - } - function parseComp(&$list) { $cnt = count($list); diff --git a/modules/issuetracker/issuetracker.controller.php b/modules/issuetracker/issuetracker.controller.php index fd7f12cb6..e1d8ee582 100644 --- a/modules/issuetracker/issuetracker.controller.php +++ b/modules/issuetracker/issuetracker.controller.php @@ -427,7 +427,7 @@ { if(!$module_info->svn_url || !$module_info->svn_cmd) return; require_once($this->module_path.'classes/svn.class.php'); - $oSvn = new Svn($module_info->svn_url, $module_info->svn_cmd, $module_info->diff_cmd, $module_info->svn_userid, $module_info->svn_passwd); + $oSvn = new Svn($module_info->svn_url, $module_info->svn_cmd, $module_info->svn_userid, $module_info->svn_passwd); $oModel = &getModel('issuetracker'); $status = $oSvn->getStatus(); if(!$status || !$status->revision) return; diff --git a/modules/issuetracker/issuetracker.view.php b/modules/issuetracker/issuetracker.view.php index 6584232ae..2e4e1f012 100644 --- a/modules/issuetracker/issuetracker.view.php +++ b/modules/issuetracker/issuetracker.view.php @@ -170,7 +170,7 @@ $erev = Context::get('erev'); $brev = Context::get('brev'); - $oSvn = new Svn($this->module_info->svn_url, $this->module_info->svn_cmd, $this->module_info->diff_cmd); + $oSvn = new Svn($this->module_info->svn_url, $this->module_info->svn_cmd); $current = $oSvn->getStatus($path); Context::set('current', $current); diff --git a/modules/issuetracker/skins/xe_issuetracker/source_diff.html b/modules/issuetracker/skins/xe_issuetracker/source_diff.html deleted file mode 100644 index 77f4daa04..000000000 --- a/modules/issuetracker/skins/xe_issuetracker/source_diff.html +++ /dev/null @@ -1,40 +0,0 @@ - - -
| Status | -Rev. {$brev} | -Rev. {$erev} | -
|---|---|---|
| {$item->diff_type} | -line {$item->before_line} | -line {$item->after_line} | -
| {nl2br(htmlspecialchars($item->before_code))} | -{nl2br(htmlspecialchars($item->after_code))} | -
{$lang->about_svn_cmd}
-{$lang->about_diff_cmd}
-