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

* Optimize function getDiffs.

Browse Source
This commit is contained in:
dingguodong
2021-09-07 10:50:44 +08:00
parent 7b9cb9ed8e
commit 8e8875319f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+3 -5
View File
@@ -439,15 +439,13 @@ class mrModel extends model
public function getDiffs($MR)
{
$gitlab = $this->gitlab->getByID($MR->gitlabID);
$fromProject = $MR->sourceProject;
$toProject = $MR->targetProject;
$this->loadModel('repo');
$repo = new stdclass;
$repo->SCM = 'GitLab';
$repo->gitlab = $gitlab->id;
$repo->project = $toProject;
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $toProject);
$repo->project = $MR->targetProject;
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $MR->targetProject);
$repo->client = $gitlab->url;
$repo->password = $gitlab->token;
@@ -456,7 +454,7 @@ class mrModel extends model
$encoding = empty($encoding) ? $repo->encoding : $encoding;
$encoding = strtolower(str_replace('_', '-', $encoding));
return $scm->diff('', $fromProject, $toProject, $parse = true, $fromProject);
return $scm->diff('', $MR->sourceBranch, $MR->targetBranch, $parse = true, $MR->sourceProject);
}
/**