From a489cb15b5348cb5d80d3851c584c81f7a13a55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20d=27Anterroches?= <titoo@users.sourceforge.net>
Date: Thu, 20 Jan 2011 10:25:41 +0100
Subject: [PATCH] Added the display of the merge history in a commit view.

---
 src/IDF/Scm/Git.php                      | 8 +++++++-
 src/IDF/templates/idf/source/commit.html | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/IDF/Scm/Git.php b/src/IDF/Scm/Git.php
index edc1aab..90954b8 100644
--- a/src/IDF/Scm/Git.php
+++ b/src/IDF/Scm/Git.php
@@ -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;
     }
diff --git a/src/IDF/templates/idf/source/commit.html b/src/IDF/templates/idf/source/commit.html
index 18b822f..4c5814e 100644
--- a/src/IDF/templates/idf/source/commit.html
+++ b/src/IDF/templates/idf/source/commit.html
@@ -15,6 +15,12 @@
 <tr>
 <th><strong>{trans 'Commit:'}</strong></th><td class="mono"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}" title="{trans 'View corresponding source tree'}">{$cobject.commit}</a></td>
 </tr>
+{if $cobject.parents}<tr>
+<th><strong>{trans 'Parents:'}</strong></th><td class="mono">{foreach $cobject.parents as $parent}
+<a href="{url 'IDF_Views_Source::commit', array($project.shortname, $parent)}" title="{trans 'View corresponding commit'}">{$parent}</a><br />
+{/foreach}
+</td>
+</tr>{/if}
 <tr>
 <th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br/><br/>{issuetext $cobject.full_message, $request, true, false, true, true, true}{/if}</td>
 </tr>{if count($changes)}