mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-25 14:19:58 +09:00
issueTracker의 SVN class에서 불필요했던 config-dir option을 제거 (files/cache/tmp 디렉토리 불필요)
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6584 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
69c9c5cb6c
commit
43fb484aaf
1 changed files with 6 additions and 15 deletions
|
|
@ -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)):'',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue