undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Simplify file filtering

Browse Source 
git diff is perfectly able to do this with '-- files', no need for
manual filtering.  This makes gettreediffs consistent with getblobdiffs.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Felipe Contreras 2013-04-27 17:01:39 -05:00 committed by Paul Mackerras
parent 685316c419
commit 2c8cd905d1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gitk
View File

@ -7618,9 +7618,13 @@ proc diffcmd {ids flags} {
} }
proc gettreediffs {ids} { proc gettreediffs {ids} {
global treediff treepending global treediff treepending limitdiffs vfilelimit curview
if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return set cmd [diffcmd $ids {--no-commit-id}]
if {$limitdiffs && $vfilelimit($curview) ne {}} {
set cmd [concat $cmd -- $vfilelimit($curview)]
}
if {[catch {set gdtf [open $cmd r]}]} return
set treepending $ids set treepending $ids
set treediff {} set treediff {}
@ -7664,17 +7668,7 @@ proc gettreediffline {gdtf ids} {
return [expr {$nr >= $max? 2: 1}] return [expr {$nr >= $max? 2: 1}]
} }
close $gdtf close $gdtf
if {$limitdiffs && $vfilelimit($curview) ne {}} { set treediffs($ids) $treediff
set flist {}
foreach f $treediff {
if {[path_filter $vfilelimit($curview) $f]} {
lappend flist $f
}
}
set treediffs($ids) $flist
} else {
set treediffs($ids) $treediff
}
unset treepending unset treepending
if {$cmitmode eq "tree" && [llength $diffids] == 1} { if {$cmitmode eq "tree" && [llength $diffids] == 1} {
gettree $diffids gettree $diffids