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

* Make sure each file with same ID is unique.

Browse Source
This commit is contained in:
dingguodong
2021-11-04 11:27:19 +08:00
parent af5636233f
commit 33368deaf4
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+13 -9
View File
@@ -482,19 +482,23 @@ class mrModel extends model
$repo->account = '';
$repo->encoding = $encoding;
$lines = array();
foreach ($diffVersions as $diffVersion)
$lines = array();
$commitsAdded = array();
foreach ($diffVersions as $diffVersion)
{
$singleDiff = $this->apiGetSingleDiffVersion($MR->gitlabID, $MR->targetProject, $MR->mriid, $diffVersion->id);
if ($singleDiff->state == 'empty') continue;
$diffs = $singleDiff->diffs;
foreach ($diffs as $diff)
$commits = $singleDiff->commits;
$diffs = $singleDiff->diffs;
foreach ($diffs as $index => $diff)
{
/* Here use $index to make sure $index is unique in $lines. */
$index = sprintf("index %s ... %s %s ", $singleDiff->head_commit_sha, $singleDiff->base_commit_sha, $diff->b_mode);
if(in_array($index, $lines)) continue;
/* Make sure every file with same commitID is unique in $lines. */
$shortID = $commits[$index]->short_id;
if(in_array($shortID, $commitsAdded)) continue;
$commitsAdded[] = $shortID;
$lines[] = sprintf("diff --git a/%s b/%s", $diff->old_path, $diff->new_path);
$lines[] = $index;
$lines[] = sprintf("index %s ... %s %s ", $singleDiff->head_commit_sha, $singleDiff->base_commit_sha, $diff->b_mode);
$lines[] = sprintf("--a/%s", $diff->old_path);
$lines[] = sprintf("--b/%s", $diff->new_path);
$diffLines = explode("\n", $diff->diff);
@@ -593,4 +597,4 @@ class mrModel extends model
$url = sprintf($this->gitlab->getApiRoot($gitlabID), "/projects/$projectID/merge_requests/$MRID/versions/$versionID");
return json_decode(commonModel::http($url));
}
}
}