natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added the display of the merge history in a commit view.

Browse Source
This commit is contained in:
Loïc d'Anterroches
2011-01-20 10:25:41 +01:00
parent b0bebb44e6
commit a489cb15b5
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/IDF/Scm/Git.php
View File

@@ -27,7 +27,7 @@
*/
class IDF_Scm_Git extends IDF_Scm
{
public $mediumtree_fmt = 'commit %H%nAuthor: %an <%ae>%nTree: %T%nDate: %ai%n%n%s%n%n%b';
public $mediumtree_fmt = 'commit %H%nAuthor: %an <%ae>%nTree: %T%nParents: %P%nDate: %ai%n%n%s%n%n%b';
/* ============================================== *
* *
@@ -518,6 +518,9 @@ class IDF_Scm_Git extends IDF_Scm
$c['full_message'] = trim($c['full_message']);
$c['full_message'] = IDF_Commit::toUTF8($c['full_message']);
$c['title'] = IDF_Commit::toUTF8($c['title']);
if (isset($c['parents'])) {
$c['parents'] = explode(' ', trim($c['parents']));
}
$res[] = (object) $c;
}
$c = array();
@@ -553,6 +556,9 @@ class IDF_Scm_Git extends IDF_Scm
$c['full_message'] = !empty($c['full_message']) ? trim($c['full_message']) : '';
$c['full_message'] = IDF_Commit::toUTF8($c['full_message']);
$c['title'] = IDF_Commit::toUTF8($c['title']);
if (isset($c['parents'])) {
$c['parents'] = explode(' ', trim($c['parents']));
}
$res[] = (object) $c;
return $res;
}