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

* Fix bug #37290.

Browse Source
This commit is contained in:
caoyanyi
2023-09-01 13:46:55 +08:00
parent 164217cf7d
commit bb3029a2ca
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitlab.class.php
+9 -8
View File
@@ -304,22 +304,23 @@ class gitlab
if(!scm::checkRevision($fromRevision) and $extra != 'isBranchOrTag') return array();
if(!scm::checkRevision($toRevision) and $extra != 'isBranchOrTag') return array();
$api = "compare";
$sameVersion = $fromRevision == $toRevision . '^';
$api = $sameVersion ? "commits/$toRevision/diff" : "compare";
$params = array('from' => $fromRevision, 'to' => $toRevision, 'straight' => true);
if($fromProject) $params['from_project_id'] = $fromProject;
if($toRevision == 'HEAD' and $this->branch) $params['to'] = $this->branch;
$results = $this->fetch($api, $params);
if(!isset($results->diffs)) return array();
$results = $this->fetch($api, $sameVersion ? array() : $params);
$diffs = isset($results->diffs) ? $results->diffs : array();
if($sameVersion && is_array($results)) $diffs = $results;
if(!$diffs) return array();
foreach($results->diffs as $key => $diff)
{
if($path != '' and strpos($diff->new_path, $path) === false) unset($results->diffs[$key]);
}
$diffs = $results->diffs;
$lines = array();
foreach($diffs as $diff)
{
if($path != '' && strpos($diff->new_path, $path) === false) continue;
$lines[] = sprintf("diff --git a/%s b/%s", $diff->old_path, $diff->new_path);
$lines[] = sprintf("index %s ... %s %s ", $fromRevision, $toRevision, $diff->b_mode);
$lines[] = sprintf("--a/%s", $diff->old_path);