Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'liyuchun_59432' into 'master'

Browse Source 
* Finish task #59432.

See merge request easycorp/zentaopms!4418
This commit is contained in:
孙广明
2022-07-08 01:04:54 +00:00
parent a9a21cd6b8 18c28227bb
commit 47011a1823
2 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/subversion.class.php
+68 -68
View File
@@ -11,13 +11,13 @@ class Subversion
public $svnVersion;
/**
* Construct
*
* @param string $client
* @param string $root
* @param string $account
* @param string $password
* @param string $encoding
* Construct
*
* @param string $client
* @param string $root
* @param string $account
* @param string $password
* @param string $encoding
* @access public
* @return void
*/
@@ -37,10 +37,10 @@ class Subversion
}
/**
* List files.
*
* @param string $path
* @param string $revision
* List files.
*
* @param string $path
* @param string $revision
* @access public
* @return array
*/
@@ -91,10 +91,10 @@ class Subversion
/**
* Get tags.
*
* @param string $path
* @param string $revision
* @param bool $onlyDir
*
* @param string $path
* @param string $revision
* @param bool $onlyDir
* @access public
* @return array
*/
@@ -129,7 +129,7 @@ class Subversion
/**
* Get branch.
*
*
* @access public
* @return array
*/
@@ -140,9 +140,9 @@ class Subversion
/**
* Get last log.
*
* @param string $path
* @param int $count
*
* @param string $path
* @param int $count
* @access public
* @return array
*/
@@ -170,8 +170,8 @@ class Subversion
foreach($parsedComments->logentry as $entry)
{
$log = new stdclass();
$log->committer = (string)$entry->author;
$log->revision = (int)$entry['revision'];
$log->committer = (string)$entry->author;
$log->revision = (int)$entry['revision'];
$log->comment = trim((string)$entry->msg);
$log->time = date('Y-m-d H:i:s', strtotime($entry->date));
$log->change = array();
@@ -188,12 +188,12 @@ class Subversion
/**
* Get log.
*
* @param string $path
* @param int $fromRevision
* @param string $toRevision
* @param int $count
* @param bool $quiet
*
* @param string $path
* @param int $fromRevision
* @param string $toRevision
* @param int $count
* @param bool $quiet
* @access public
* @return array
*/
@@ -229,17 +229,17 @@ class Subversion
foreach($parsedComments->logentry as $entry)
{
$log = new stdclass();
$log->committer = (string)$entry->author;
$log->revision = (int)$entry['revision'];
$log->committer = (string)$entry->author;
$log->revision = (int)$entry['revision'];
$log->comment = trim((string)$entry->msg);
$log->time = date('Y-m-d H:i:s', strtotime($entry->date));
$log->change = array();
if(!empty($entry->paths))
{
foreach($entry->paths->path as $path)
foreach($entry->paths->path as $path)
{
$pathInfo = array();
foreach($path->attributes() as $attr => $value) $pathInfo[$attr] = (string)$value;
foreach($path->attributes() as $attr => $value) $pathInfo[$attr] = (string)$value;
$log->change[(string)$path] = $pathInfo;
}
}
@@ -257,9 +257,9 @@ class Subversion
/**
* Blame file.
*
* @param string $path
* @param int $revision
*
* @param string $path
* @param int $revision
* @access public
* @return array
*/
@@ -298,7 +298,7 @@ class Subversion
{
foreach($parsedResult->target->entry as $line)
{
if($line->commit['revision'] != $revision)
if($line->commit['revision'] != $revision)
{
$blame = array();
$blame['revision'] = (int)$line->commit['revision'];
@@ -327,10 +327,10 @@ class Subversion
/**
* Diff file.
*
* @param string $path
* @param int $fromRevision
* @param int $toRevision
*
* @param string $path
* @param int $fromRevision
* @param int $toRevision
* @access public
* @return array
*/
@@ -355,9 +355,9 @@ class Subversion
/**
* Cat file.
*
* @param string $entry
* @param string $revision
*
* @param string $entry
* @param string $revision
* @access public
* @return string
*/
@@ -380,9 +380,9 @@ class Subversion
/**
* Get info.
*
* @param string $entry
* @param string $revision
*
* @param string $entry
* @param string $revision
* @access public
* @return object
*/
@@ -421,8 +421,8 @@ class Subversion
/**
* Exec svn cmd.
*
* @param string $cmd
*
* @param string $cmd
* @access public
* @return array
*/
@@ -434,8 +434,8 @@ class Subversion
/**
* Parse diff.
*
* @param array $lines
*
* @param array $lines
* @access public
* @return array
*/
@@ -514,9 +514,9 @@ class Subversion
/**
* Get commit count.
*
* @param int $commits
* @param int $lastVersion
*
* @param int $commits
* @param int $lastVersion
* @access public
* @return int
*/
@@ -547,7 +547,7 @@ class Subversion
/**
* Get first revision.
*
*
* @access public
* @return int
*/
@@ -561,7 +561,7 @@ class Subversion
/**
* Get latest revision.
*
*
* @access public
* @return int
*/
@@ -573,9 +573,9 @@ class Subversion
/**
* Get commits.
*
* @param string $version
* @param int $count
*
* @param string $version
* @param int $count
* @access public
* @return array
*/
@@ -608,8 +608,8 @@ class Subversion
foreach($parsedComments->logentry as $entry)
{
$parsedLog = new stdClass();
$parsedLog->committer = (string)$entry->author;
$parsedLog->revision = (int)$entry['revision'];
$parsedLog->committer = (string)$entry->author;
$parsedLog->revision = (int)$entry['revision'];
$parsedLog->comment = trim((string)$entry->msg);
$parsedLog->time = date('Y-m-d H:i:s', strtotime($entry->date));
$logs['commits'][$parsedLog->revision] = $parsedLog;
@@ -632,8 +632,8 @@ class Subversion
/**
* Replace svn auth.
*
* @param string $cmd
*
* @param string $cmd
* @access public
* @return string
*/
@@ -643,11 +643,11 @@ class Subversion
}
/**
* Build command.
*
* @param string $path
* @param string $action
* @param string $param
* Build command.
*
* @param string $path
* @param string $action
* @param string $param
* @access public
* @return string
*/
@@ -668,8 +668,8 @@ class Subversion
/**
* Get SVN version.
*
* @param string $client
*
* @param string $client
* @access public
* @return string
*/
module/repo/control.php
+9 -2
View File
@@ -1321,9 +1321,16 @@ class repo extends control
}
elseif($repo->SCM == 'Git')
{
$gitDir = scandir($repo->path);
$files = '';
foreach($gitDir as $path)
{
if(!in_array($path, array('.', '..', '.git'))) $files .= $repo->path . DS . "$path,";
}
$this->app->loadClass('pclzip', true);
$zip = new pclzip($fileName);
if($zip->create($repo->path, PCLZIP_OPT_REMOVE_PATH, $repo->path) === 0) return print(js::alert($zip->errorInfo()) . js::close());
if($zip->create($files, PCLZIP_OPT_REMOVE_PATH, $repo->path) === 0) return print(js::alert($zip->errorInfo()) . js::close());
$url = DS . 'data' . DS . 'repo' . DS . $repo->name . '.zip';
}
@@ -1333,7 +1340,7 @@ class repo extends control
chdir($savePath);
$this->scm = $this->app->loadClass('scm');
$this->scm->setEngine($repo);
$this->scm->exec('checkout ' . $repo->path);
$this->scm->exec('export ' . $repo->path);
/* Get repo name. */
$pathList = explode('/', trim($repo->path, '/'));