Skip to content

Commit

Permalink
gitk: Simplify file filtering
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Paul Mackerras committed May 11, 2013
1 parent 685316c commit 2c8cd90
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -7618,9 +7618,13 @@ proc diffcmd {ids flags} {
}

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 treediff {}
Expand Down Expand Up @@ -7664,17 +7668,7 @@ proc gettreediffline {gdtf ids} {
return [expr {$nr >= $max? 2: 1}]
}
close $gdtf
if {$limitdiffs && $vfilelimit($curview) ne {}} {
set flist {}
foreach f $treediff {
if {[path_filter $vfilelimit($curview) $f]} {
lappend flist $f
}
}
set treediffs($ids) $flist
} else {
set treediffs($ids) $treediff
}
set treediffs($ids) $treediff
unset treepending
if {$cmitmode eq "tree" && [llength $diffids] == 1} {
gettree $diffids
Expand Down

0 comments on commit 2c8cd90

Please sign in to comment.