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

Improve the calculation part and reuse the values we have from the diff hunks.

Browse Source
This commit is contained in:
Thomas Keller 2011-10-06 02:31:36 +02:00
parent f19f07ec59
commit b413b7ee89
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/IDF/Diff.php
View File

@ -178,7 +178,6 @@ class IDF_Diff
$cc = 1; $cc = 1;
$offsets = array(); $offsets = array();
$contents = array(); $contents = array();
$maxlinenum = 0;
foreach ($file['chunks'] as $chunk) { foreach ($file['chunks'] as $chunk) {
foreach ($chunk as $line) { foreach ($chunk as $line) {
@ -195,8 +194,6 @@ class IDF_Diff
$content = Pluf_esc($content); $content = Pluf_esc($content);
$content = self::makeNonPrintableCharsVisible($content); $content = self::makeNonPrintableCharsVisible($content);
$contents[] = sprintf('<td class="%s%s mono">%s</td>', $class, $pretty, $content); $contents[] = sprintf('<td class="%s%s mono">%s</td>', $class, $pretty, $content);
$maxlinenum = max($maxlinenum, max($left, $right));
} }
if (count($file['chunks']) > $cc) { if (count($file['chunks']) > $cc) {
$offsets[] = '<td class="next">...</td><td class="next">...</td>'; $offsets[] = '<td class="next">...</td><td class="next">...</td>';
@ -212,11 +209,23 @@ class IDF_Diff
'</table>' ."\n"; '</table>' ."\n";
$rows = count($offsets); $rows = count($offsets);
$colwidth = (ceil(log10($maxlinenum)) + 1) * 10;
list($added, $removed) = end($file['chunks_def']);
$added = $added[0] + $added[1];
$leftwidth = 1;
if ($added > 0)
$leftwidth = (ceil(log10($added)) + 1) * 10;
$removed = $removed[0] + $removed[1];
$rightwidth = 1;
if ($removed > 0)
$rightwidth = (ceil(log10($removed)) + 1) * 10;
$first = array_shift($offsets); $first = array_shift($offsets);
$out .= '<table class="diff" summary="">' ."\n". $out .= '<table class="diff" summary="">' ."\n".
'<colgroup><col width="'.$colwidth.'" /><col width="'.$colwidth.'" /><col width="*" /></colgroup>' ."\n". '<colgroup><col width="'.$leftwidth.'" /><col width="'.$rightwidth.'" /><col width="*" /></colgroup>' ."\n".
'<tr id="diff-'.md5($filename).'">'. '<tr id="diff-'.md5($filename).'">'.
'<th colspan="3">'.Pluf_esc($filename).'</th>'. '<th colspan="3">'.Pluf_esc($filename).'</th>'.
'</tr>' ."\n". '</tr>' ."\n".