From 43fb484aaf198c37e068d8f8bde27a4afed6026e Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 18 Jun 2009 05:08:19 +0000 Subject: [PATCH] =?UTF-8?q?issueTracker=EC=9D=98=20SVN=20class=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=B6=88=ED=95=84=EC=9A=94=ED=96=88=EB=8D=98=20con?= =?UTF-8?q?fig-dir=20option=EC=9D=84=20=EC=A0=9C=EA=B1=B0=20(files/cache/t?= =?UTF-8?q?mp=20=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6584 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/issuetracker/classes/svn.class.php | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/modules/issuetracker/classes/svn.class.php b/modules/issuetracker/classes/svn.class.php index 7cacf7068..ed24280a7 100644 --- a/modules/issuetracker/classes/svn.class.php +++ b/modules/issuetracker/classes/svn.class.php @@ -10,8 +10,6 @@ var $svn_cmd = null; - var $tmp_dir = '/tmp'; - var $oXml = null; var $userid = null; var $passwd = null; @@ -23,9 +21,6 @@ if(strstr($svn_cmd, " ") != FALSE) $this->svn_cmd = '"'.$svn_cmd.'"' ; else $this->svn_cmd = $svn_cmd; - $this->tmp_dir = _XE_PATH_.'files/cache/tmp'; - if(!is_dir($this->tmp_dir)) FileHandler::makeDir($this->tmp_dir); - $this->userid = $userid; $this->passwd = $passwd; @@ -48,7 +43,7 @@ if(substr($path,0,1)=='/') $path = substr($path,1); if(strpos($path,'..')!==false) return; - $command = sprintf("%s --non-interactive --config-dir %s log --xml --limit 1 %s %s%s", $this->svn_cmd, $this->tmp_dir, $this->_getAuthInfo(), $this->url, $path); + $command = sprintf("%s --non-interactive log --xml --limit 1 %s %s%s", $this->svn_cmd, $this->_getAuthInfo(), $this->url, $path); $buff = $this->execCmd($command, $error); $xmlDoc = $this->oXml->parse($buff); @@ -68,10 +63,9 @@ if(strpos($path,'..')!==false) return; $command = sprintf( - '%s --non-interactive %s --config-dir %s list %s%s%s', + '%s --non-interactive %s list %s%s%s', $this->svn_cmd, $this->_getAuthInfo(), - $this->tmp_dir, $this->url, $path, $revs?'@'.(int)$revs:null @@ -110,10 +104,9 @@ if(strpos($path,'..')!==false) return; $command = sprintf( - '%s --non-interactive %s --config-dir %s cat %s%s%s', + '%s --non-interactive %s cat %s%s%s', $this->svn_cmd, $this->_getAuthInfo(), - $this->tmp_dir, $this->url, $path, $revs?'@'.$revs:null @@ -204,17 +197,16 @@ function getComp($path, $brev, $erev) { if(!$brev) { - $command = sprintf('%s --non-interactive %s --config-dir %s log --xml --limit 2 %s%s@%d', $this->svn_cmd, $this->_getAuthInfo(), $this->tmp_dir, $this->url, $path, $erev); + $command = sprintf('%s --non-interactive %s log --xml --limit 2 %s%s@%d', $this->svn_cmd, $this->_getAuthInfo(), $this->url, $path, $erev); $buff = $this->execCmd($command, $error); $xmlDoc = $this->oXml->parse($buff); $brev = $xmlDoc->log->logentry[1]->attrs->revision; if(!$brev) return; } - $command = sprintf('%s --non-interactive %s --config-dir %s diff %s%s@%d %s%s@%d', + $command = sprintf('%s --non-interactive %s diff %s%s@%d %s%s@%d', $this->svn_cmd, $this->_getAuthInfo(), - $this->tmp_dir, $this->url, $path, $brev, @@ -233,10 +225,9 @@ if(strpos($path,'..')!==false) return; $command = sprintf( - '%s --non-interactive %s --config-dir %s log --xml %s %s %s %s%s', + '%s --non-interactive %s log --xml %s %s %s %s%s', $this->svn_cmd, $this->_getAuthInfo(), - $this->tmp_dir, $quiet?'--quiet':'--verbose', $limit?'--limit '.$limit:'', $erev>0?(sprintf('-r%d:%d',(int)$erev, (int)$brev)):'',