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

Merge branch 'devops_cyy' into 'master'

Browse Source 
修改代码对比默认值

See merge request easycorp/zentaopms!1875
This commit is contained in:
李玉春
2022-02-22 05:49:38 +00:00
parent 80b69c57b9 e7ec73e841
commit 7153e8f629
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+9 -4
View File
@@ -713,7 +713,7 @@ class repo extends control
* @access public
* @return void
*/
public function diff($repoID, $objectID = 0, $entry = '', $oldRevision = '0', $newRevision = 'HEAD', $showBug = 'false', $encoding = '', $isBranchOrTag = false)
public function diff($repoID, $objectID = 0, $entry = '', $oldRevision = '', $newRevision = '', $showBug = 'false', $encoding = '', $isBranchOrTag = false)
{
$this->commonAction($repoID, $objectID);
@@ -742,11 +742,16 @@ class repo extends control
$this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($entry) . "&oldrevision=$oldRevision&newRevision=$newRevision&showBug=&encoding=$encoding"));
}
$this->scm->setEngine($repo);
$info = new stdClass();
$diffs = array();
$encoding = empty($encoding) ? $repo->encoding : $encoding;
$encoding = strtolower(str_replace('_', '-', $encoding));
$info = $this->scm->info($entry, $newRevision);
$diffs = $this->scm->diff($entry, $oldRevision, $newRevision, 'yes', $isBranchOrTag ? 'isBranchOrTag': '');
if($oldRevision !== '')
{
$this->scm->setEngine($repo);
$info = $this->scm->info($entry, $newRevision);
$diffs = $this->scm->diff($entry, $oldRevision, $newRevision, 'yes', $isBranchOrTag ? 'isBranchOrTag': '');
}
foreach($diffs as $diff)
{
if($encoding != 'utf-8')