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

Merge pull request #481 from mikedld/diff-lines

Browse Source 
Correct new line numbers in diff viewer
This commit is contained in:
Klaus Silveira
2014-11-14 11:05:45 -02:00
parent 27257bf6e5 62ae6e938d
commit e13fe8ef03
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]) { switch ($log[0]) {
case "@": case "@":
// Set the line numbers // Set the line numbers
preg_match('/@@ -([0-9]+)/', $log, $matches); preg_match('/@@ -([0-9]+)(?:,[0-9]+)? \+([0-9]+)/', $log, $matches);
$lineNumOld = $matches[1] - 1; $lineNumOld = $matches[1] - 1;
$lineNumNew = $matches[1] - 1; $lineNumNew = $matches[2] - 1;
break; break;
case "-": case "-":
$lineNumOld++; $lineNumOld++;

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

@@ -52,7 +52,7 @@
<td class="lineNo"> <td class="lineNo">
{% if line.getType != 'chunk' %} {% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}R{{ line.getNumOld }}"></a> <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 %} {% endif %}
{{ line.getNumOld }} {{ line.getNumOld }}
{% if line.getType != 'chunk' %} {% if line.getType != 'chunk' %}

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

@@ -51,7 +51,7 @@
<td class="lineNo"> <td class="lineNo">
{% if line.getType != 'chunk' %} {% if line.getType != 'chunk' %}
<a name="L{{ loop.index }}R{{ line.getNumOld }}"></a> <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 %} {% endif %}
{{ line.getNumOld }} {{ line.getNumOld }}
{% if line.getType != 'chunk' %} {% if line.getType != 'chunk' %}