Indefero Commit Details

Date:

2008-08-02 02:38:06 (16 years 4 months ago)

Author:

Loic d'Anterroches

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3, svn

Commit:

4c5bd8d2be673c9d86d8b6b5108d551982491d5c

Parents:

fd6031d7f50085b2e42bb539a886fc9175f6fe27

Message:

Fixed bug when looking at a commit which is a merge.

When you merge you do not get always a diff of files. This fix correct
that for the case of commit 9a2b8e249acad9f844.

Changes:

File differences

-46
47 47
48 48
49
49 50
50 51
51 52
+        $current_chunk = 0;␊
        $lline = 0;␊
        $rline = 0;␊
        $files = array();␊
        foreach ($this->lines as $line) {␊
            if (0 === strpos($line, 'diff --git a')) {␊
                $current_file = self::getFile($line);␊
         $current_chunk = 0;␊
         $lline = 0;␊
         $rline = 0;␊
+        $files = array();␊
         foreach ($this->lines as $line) {␊
             if (0 === strpos($line, 'diff --git a')) {␊
                 $current_file = self::getFile($line);␊

-17
18 18
19 19
20
20 21
21 22
22 23
... ...
26 27
27 28
28 29
30
29 31
32
30 33
31 34
32 35
33 
36
34 37
35 38
36 39
+<tr>␊
<th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $project}{if isset($cobject.full_message)}<br /><br />{issuetext $cobject.full_message, $project}{/if}</td>␊
</tr>␊
{if count($diff.files)}␊
<tr>␊
<th><strong>{trans 'Files:'}</strong></th>␊
<td>␊

{/foreach}␊
</td>␊
</tr>␊
{/if}␊
</table>␊
{if count($diff.files)}␊
<h2>{trans 'Change Details'}</h2>␊
␊
{$diff.as_html()|safe}␊
␊
{/if}␊
{/block}␊
{block context}␊
<p><strong>{trans 'Branches:'}</strong><br />␊
 ...
 <tr>␊
 <th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $project}{if isset($cobject.full_message)}<br /><br />{issuetext $cobject.full_message, $project}{/if}</td>␊
 </tr>␊
+{if count($diff.files)}␊
 <tr>␊
 <th><strong>{trans 'Files:'}</strong></th>␊
 <td>␊
 {/foreach}␊
 </td>␊
 </tr>␊
+{/if}␊
 </table>␊
+{if count($diff.files)}␊
 <h2>{trans 'Change Details'}</h2>␊
 ␊
 {$diff.as_html()|safe}␊
-␊
+{/if}␊
 {/block}␊
 {block context}␊
 <p><strong>{trans 'Branches:'}</strong><br />␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags