mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Fix display of diff lines beginning with --- or +++

Browse Source 
Lines in a diff beginning with --- or +++ were not being displayed
at all.  Thanks to Robert Fitzsimons for pointing out the obvious
fix, that lines beginning with --- or +++ are only to be suppressed
in the diff header.  I also took the opportunity to replace a regexp
call with a couple of string compare calls, which should be faster.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2006-03-08 09:15:32 +11:00
parent 9f841cf1fb
commit b06bc2a078
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitk
View File

@ -2615,7 +2615,9 @@ proc getblobdiffline {bdf ids} {
set pad [string range "----------------------------------------" 1 $l] set pad [string range "----------------------------------------" 1 $l]
$ctext insert end "$pad $header $pad\n" filesep $ctext insert end "$pad $header $pad\n" filesep
set diffinhdr 1 set diffinhdr 1
} elseif {[regexp {^(---|\+\+\+)} $line]} { } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
# do nothing
} elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
set diffinhdr 0 set diffinhdr 0
} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \ } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} { $line match f1l f1c f2l f2c rest]} {