Fixed to get the same method definition as the parent class.
This commit is contained in:
parent
1243a8f6ad
commit
1c8490be6b
@ -375,7 +375,6 @@ class IDF_Project extends Pluf_Model
|
|||||||
$conf = $this->getConf();
|
$conf = $this->getConf();
|
||||||
$scm = $conf->getVal('scm', 'git');
|
$scm = $conf->getVal('scm', 'git');
|
||||||
$scms = Pluf::f('allowed_scm');
|
$scms = Pluf::f('allowed_scm');
|
||||||
Pluf::loadClass($scms[$scm]);
|
|
||||||
return call_user_func(array($scms[$scm], 'getAuthAccessUrl'),
|
return call_user_func(array($scms[$scm], 'getAuthAccessUrl'),
|
||||||
$this, $user);
|
$this, $user);
|
||||||
}
|
}
|
||||||
|
@ -33,20 +33,16 @@
|
|||||||
*/
|
*/
|
||||||
class IDF_Scm_Svn extends IDF_Scm
|
class IDF_Scm_Svn extends IDF_Scm
|
||||||
{
|
{
|
||||||
public $repo = '';
|
|
||||||
public $username = '';
|
public $username = '';
|
||||||
public $password = '';
|
public $password = '';
|
||||||
private $assoc = array('dir' => 'tree',
|
private $assoc = array('dir' => 'tree',
|
||||||
'file' => 'blob');
|
'file' => 'blob');
|
||||||
|
|
||||||
private $commit=array();
|
public function __construct($repo, $project=null)
|
||||||
|
|
||||||
public function __construct($repo, $project=null, $username='', $password='')
|
|
||||||
{
|
{
|
||||||
$this->repo = $repo;
|
$this->repo = $repo;
|
||||||
$this->project = $project;
|
$this->project = $project;
|
||||||
$this->username = $username;
|
|
||||||
$this->password = $password;
|
|
||||||
$this->cache['commitmess'] = array();
|
$this->cache['commitmess'] = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,9 +112,9 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
if (false !== ($rep=$conf->getVal('svn_remote_url', false))
|
if (false !== ($rep=$conf->getVal('svn_remote_url', false))
|
||||||
&& !empty($rep)) {
|
&& !empty($rep)) {
|
||||||
// Remote repository
|
// Remote repository
|
||||||
return new IDF_Scm_Svn($rep, $project,
|
$scm = new IDF_Scm_Svn($rep, $project);
|
||||||
$conf->getVal('svn_username'),
|
$scm->username = $conf->getVal('svn_username');
|
||||||
$conf->getVal('svn_password'));
|
$scm->password = $conf->getVal('svn_password');
|
||||||
} else {
|
} else {
|
||||||
$rep = sprintf(Pluf::f('svn_repositories'), $project->shortname);
|
$rep = sprintf(Pluf::f('svn_repositories'), $project->shortname);
|
||||||
return new IDF_Scm_Svn($rep, $project);
|
return new IDF_Scm_Svn($rep, $project);
|
||||||
@ -181,7 +177,7 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
return 'commit';
|
return 'commit';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getTree($rev='HEAD', $folder='')
|
public function getTree($commit, $folder='/', $branch=null)
|
||||||
{
|
{
|
||||||
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --xml --username=%s --password=%s %s@%s',
|
$cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --xml --username=%s --password=%s %s@%s',
|
||||||
escapeshellarg($this->username),
|
escapeshellarg($this->username),
|
||||||
@ -236,20 +232,20 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
/**
|
/**
|
||||||
* FIXME: Need to check the case of an inexisting file.
|
* FIXME: Need to check the case of an inexisting file.
|
||||||
*/
|
*/
|
||||||
public function getPathInfo($totest, $rev='HEAD')
|
public function getPathInfo($file, $rev=null)
|
||||||
{
|
{
|
||||||
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --xml --username=%s --password=%s %s@%s',
|
$cmd = sprintf(Pluf::f('svn_path', 'svn').' info --xml --username=%s --password=%s %s@%s',
|
||||||
escapeshellarg($this->username),
|
escapeshellarg($this->username),
|
||||||
escapeshellarg($this->password),
|
escapeshellarg($this->password),
|
||||||
escapeshellarg($this->repo.'/'.$totest),
|
escapeshellarg($this->repo.'/'.$file),
|
||||||
escapeshellarg($rev));
|
escapeshellarg($rev));
|
||||||
$xml = simplexml_load_string(shell_exec($cmd));
|
$xml = simplexml_load_string(shell_exec($cmd));
|
||||||
$entry = $xml->entry;
|
$entry = $xml->entry;
|
||||||
$file = array();
|
$file = array();
|
||||||
$file['fullpath'] = $totest;
|
$file['fullpath'] = $file;
|
||||||
$file['hash'] = (string) $entry->repository->uuid;
|
$file['hash'] = (string) $entry->repository->uuid;
|
||||||
$file['type'] = $this->assoc[(string) $entry['kind']];
|
$file['type'] = $this->assoc[(string) $entry['kind']];
|
||||||
$file['file'] = $totest;
|
$file['file'] = $file;
|
||||||
$file['rev'] = $rev;
|
$file['rev'] = $rev;
|
||||||
$file['author'] = (string) $entry->author;
|
$file['author'] = (string) $entry->author;
|
||||||
$file['date'] = gmdate('Y-m-d H:i:s', strtotime((string) $entry->commit->date));
|
$file['date'] = gmdate('Y-m-d H:i:s', strtotime((string) $entry->commit->date));
|
||||||
@ -258,14 +254,14 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
return (object) $file;
|
return (object) $file;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getFile($def)
|
public function getFile($def, $cmd_only=false)
|
||||||
{
|
{
|
||||||
$cmd = sprintf(Pluf::f('svn_path', 'svn').' cat --username=%s --password=%s %s@%s',
|
$cmd = sprintf(Pluf::f('svn_path', 'svn').' cat --username=%s --password=%s %s@%s',
|
||||||
escapeshellarg($this->username),
|
escapeshellarg($this->username),
|
||||||
escapeshellarg($this->password),
|
escapeshellarg($this->password),
|
||||||
escapeshellarg($this->repo.'/'.$def->fullpath),
|
escapeshellarg($this->repo.'/'.$def->fullpath),
|
||||||
escapeshellarg($def->rev));
|
escapeshellarg($def->rev));
|
||||||
return shell_exec($cmd);
|
return ($cmd_only) ? $cmd : shell_exec($cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -324,11 +320,11 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
/**
|
/**
|
||||||
* Get commit details.
|
* Get commit details.
|
||||||
*
|
*
|
||||||
* @param string Commit ('HEAD')
|
* @param string Commit
|
||||||
* @param bool Get commit diff (false)
|
* @param bool Get commit diff (false)
|
||||||
* @return array Changes
|
* @return array Changes
|
||||||
*/
|
*/
|
||||||
public function getCommit($rev='HEAD', $getdiff=false)
|
public function getCommit($commit, $getdiff=false)
|
||||||
{
|
{
|
||||||
$res = array();
|
$res = array();
|
||||||
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --xml --limit 1 -v --username=%s --password=%s %s@%s',
|
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --xml --limit 1 -v --username=%s --password=%s %s@%s',
|
||||||
@ -389,11 +385,11 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
*
|
*
|
||||||
* @return array Changes.
|
* @return array Changes.
|
||||||
*/
|
*/
|
||||||
public function getChangeLog($rev='HEAD', $n=10)
|
public function getChangeLog($branch=null, $n=10)
|
||||||
{
|
{
|
||||||
if ($rev != 'HEAD' and !preg_match('/^\d+$/', $rev)) {
|
if ($branch != 'HEAD' and !preg_match('/^\d+$/', $branch)) {
|
||||||
// we accept only revisions or HEAD
|
// we accept only revisions or HEAD
|
||||||
$rev = 'HEAD';
|
$branch = 'HEAD';
|
||||||
}
|
}
|
||||||
$res = array();
|
$res = array();
|
||||||
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --xml -v --limit %s --username=%s --password=%s %s@%s',
|
$cmd = sprintf(Pluf::f('svn_path', 'svn').' log --xml -v --limit %s --username=%s --password=%s %s@%s',
|
||||||
@ -401,7 +397,7 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
escapeshellarg($this->username),
|
escapeshellarg($this->username),
|
||||||
escapeshellarg($this->password),
|
escapeshellarg($this->password),
|
||||||
escapeshellarg($this->repo),
|
escapeshellarg($this->repo),
|
||||||
escapeshellarg($rev));
|
escapeshellarg($branch));
|
||||||
$xmlRes = shell_exec($cmd);
|
$xmlRes = shell_exec($cmd);
|
||||||
$xml = simplexml_load_string($xmlRes);
|
$xml = simplexml_load_string($xmlRes);
|
||||||
foreach ($xml->logentry as $entry) {
|
foreach ($xml->logentry as $entry) {
|
||||||
|
Loading…
Reference in New Issue
Block a user