Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-17 19:20:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct new line numbers in diff viewer

Browse Source 
With each new hunk, starting new line number was the same as starting old
line number. Parse diff line a bit further to get real new line number.

Fix HREFs for old line number links in both bootstrap3 and default themes
so that thay work.
This commit is contained in:
Mike Gelfand
2014-07-13 12:10:27 +03:00
parent 6c99ffee4c
commit 3cba2eb82c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GitList/Git/Repository.php
View File

@@ -169,9 +169,9 @@ class Repository extends BaseRepository
switch ($log[0]) {
case "@":
// Set the line numbers
preg_match('/@@ -([0-9]+)/', $log, $matches);
preg_match('/@@ -([0-9]+),[0-9]+ \+([0-9]+)/', $log, $matches);
$lineNumOld = $matches[1] - 1;
$lineNumNew = $matches[1] - 1;
$lineNumNew = $matches[2] - 1;
break;
case "-":
$lineNumOld++;

2
themes/bootstrap3/twig/commit.twig
View File

@@ -46,7 +46,7 @@
<td class="lineNo">
{% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}R{{ line.getNumOld }}"></a>
<a href="#L{{ loop.index }}L{{ line.getNumOld }}">
<a href="#L{{ loop.index }}R{{ line.getNumOld }}">
{% endif %}
{{ line.getNumOld }}
{% if line.getType != 'chunk' %}

2
themes/default/twig/commit.twig
View File

@@ -45,7 +45,7 @@
<td class="lineNo">
{% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}R{{ line.getNumOld }}"></a>
<a href="#L{{ loop.index }}L{{ line.getNumOld }}">
<a href="#L{{ loop.index }}R{{ line.getNumOld }}">
{% endif %}
{{ line.getNumOld }}
{% if line.getType != 'chunk' %}