Changeset fd09a48
- Timestamp:
- Dec 2, 2019, 2:21:21 AM (2 years ago)
- Branches:
- master
- Children:
- 5685409
- Parents:
- 0fb135d
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
build/deb/make_packet.php
r0fb135d rfd09a48 93 93 $xml->startElement('log'); 94 94 $logs = explode("\n", $log); 95 $revnum = $this->revision;95 $revnum = 1; 96 96 foreach ($logs as $line) { 97 97 $info = explode(":::", trim($line)); 98 98 $xml->startElement('logentry'); 99 $xml->writeAttribute(' number', $revnum);99 $xml->writeAttribute('revision', $revnum); 100 100 $xml->writeElement('author', $info[0]); 101 101 $xml->writeElement('date', $info[1]); 102 102 $xml->writeElement('msg', $info[2]); 103 103 $xml->endElement(); 104 $revnum --;104 $revnum++; 105 105 } 106 106 $xml->endElement(); … … 111 111 chdir($this->repoDir); 112 112 $this->revision = trim(`git rev-list {$this->repoBranch} --count`); 113 $log = `git log --pretty=format:"%an:::%ad:::%s" --date=short `;113 $log = `git log --pretty=format:"%an:::%ad:::%s" --date=short --reverse`; 114 114 echo $this->saveGitRevLog($log); 115 115 chdir($this->runDir); -
web/include/modules/service/changelog.php
r0fb135d rfd09a48 63 63 } 64 64 65 public function getLastChanges($count = 5) {65 public function getLastChanges($count = 10) { 66 66 $logdata = $this->logdata; 67 67 $ret = ''; 68 $lastmsg = ''; 68 69 while($count>0 && count($logdata)>0) { 69 70 $item = array_pop($logdata); 70 if($item['msg']=='' ) {71 if($item['msg']=='' || $item['msg'] === $lastmsg || strpos($item['msg'], 'Merge pull request')===0) { 71 72 continue; 72 73 } 74 $lastmsg = $item['msg']; 73 75 $ret .= "<p><b>".date("Y-m-d", $item['date']).", ".$item['author'].':</b><br>'; 74 76 $ret .= str_replace("\n", "<br>", $item['msg']);
Note: See TracChangeset
for help on using the changeset viewer.