development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gitk this->selected diffs

Browse source 
The change made in 8b7e5d76e8 to
accomodate dense revlists in single-commit diffs has broken computing
of diffs between arbitrary trees, which does need to consider two
commit ids.

This patch changes the two git-diff-tree calls to get the necessary
two ids in this case.  It does so by propagating a "singlecommit" flag
through all functions involved via an additional argument.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Yann Dirson 2005-11-27 23:29:30 +01:00 committed by Junio C Hamano
parent 56fc631939
commit 55d1eb047d
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gitk
View file

@ -2165,9 +2165,9 @@ proc selectline {l isnew} {
$cflist delete 0 end $cflist delete 0 end
$cflist insert end "Comments" $cflist insert end "Comments"
if {$nparents($id) == 1} { if {$nparents($id) == 1} {
startdiff [concat $id $parents($id)] startdiff [concat $id $parents($id)] 1
} elseif {$nparents($id) > 1} { } elseif {$nparents($id) > 1} {
mergediff $id mergediff $id 1
} }
} }
@ -2236,7 +2236,7 @@ proc goforw {} {
} }
} }
proc mergediff {id} { proc mergediff {id singlecommit} {
global parents diffmergeid diffmergegca mergefilelist diffpindex global parents diffmergeid diffmergegca mergefilelist diffpindex
set diffmergeid $id set diffmergeid $id
@ -2247,7 +2247,7 @@ proc mergediff {id} {
showmergediff showmergediff
} }
} else { } else {
contmergediff {} contmergediff {} $singlecommit
} }
} }
@ -2267,7 +2267,7 @@ proc findgca {ids} {
return $gca return $gca
} }
proc contmergediff {ids} { proc contmergediff {ids singlecommit} {
global diffmergeid diffpindex parents nparents diffmergegca global diffmergeid diffpindex parents nparents diffmergegca
global treediffs mergefilelist diffids treepending global treediffs mergefilelist diffids treepending
@ -2284,7 +2284,7 @@ proc contmergediff {ids} {
if {![info exists treediffs($ids)]} { if {![info exists treediffs($ids)]} {
set diffids $ids set diffids $ids
if {![info exists treepending]} { if {![info exists treepending]} {
gettreediffs $ids gettreediffs $ids $singlecommit
} }
return return
} }
@ -2762,39 +2762,45 @@ proc similarity {pnum l nlc f events} {
return [expr {200 * $same / (2 * $same + $diff)}] return [expr {200 * $same / (2 * $same + $diff)}]
} }
proc startdiff {ids} { proc startdiff {ids singlecommit} {
global treediffs diffids treepending diffmergeid global treediffs diffids treepending diffmergeid
set diffids $ids set diffids $ids
catch {unset diffmergeid} catch {unset diffmergeid}
if {![info exists treediffs($ids)]} { if {![info exists treediffs($ids)]} {
if {![info exists treepending]} { if {![info exists treepending]} {
gettreediffs $ids gettreediffs $ids $singlecommit
} }
} else { } else {
addtocflist $ids addtocflist $ids $singlecommit
} }
} }
proc addtocflist {ids} { proc addtocflist {ids singlecommit} {
global treediffs cflist global treediffs cflist
foreach f $treediffs($ids) { foreach f $treediffs($ids) {
$cflist insert end $f $cflist insert end $f
} }
getblobdiffs $ids getblobdiffs $ids $singlecommit
} }
proc gettreediffs {ids} { proc gettreediffs {ids singlecommit} {
global treediff parents treepending global treediff parents treepending
set treepending $ids set treepending $ids
set treediff {} set treediff {}
set id [lindex $ids 0] set id [lindex $ids 0]
if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $id" r]}] return if {$singlecommit == 1} {
set range "$id"
} else {
set p [lindex $ids 1]
set range "$p $id"
}
if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $range" r]}] return
fconfigure $gdtf -blocking 0 fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids] fileevent $gdtf readable [list gettreediffline $gdtf $ids $singlecommit]
} }
proc gettreediffline {gdtf ids} { proc gettreediffline {gdtf ids singlecommit} {
global treediff treediffs treepending diffids diffmergeid global treediff treediffs treepending diffids diffmergeid
set n [gets $gdtf line] set n [gets $gdtf line]
@ -2804,12 +2810,12 @@ proc gettreediffline {gdtf ids} {
set treediffs($ids) $treediff set treediffs($ids) $treediff
unset treepending unset treepending
if {$ids != $diffids} { if {$ids != $diffids} {
gettreediffs $diffids gettreediffs $diffids $singlecommit
} else { } else {
if {[info exists diffmergeid]} { if {[info exists diffmergeid]} {
contmergediff $ids contmergediff $ids $singlecommit
} else { } else {
addtocflist $ids addtocflist $ids $singlecommit
} }
} }
return return
@ -2818,13 +2824,18 @@ proc gettreediffline {gdtf ids} {
lappend treediff $file lappend treediff $file
} }
proc getblobdiffs {ids} { proc getblobdiffs {ids singlecommit} {
global diffopts blobdifffd diffids env curdifftag curtagstart global diffopts blobdifffd diffids env curdifftag curtagstart
global difffilestart nextupdate diffinhdr treediffs global difffilestart nextupdate diffinhdr treediffs
set id [lindex $ids 0] set id [lindex $ids 0]
set env(GIT_DIFF_OPTS) $diffopts set env(GIT_DIFF_OPTS) $diffopts
set cmd [list | git-diff-tree --no-commit-id -r -p -C $id] if {$singlecommit == 1} {
set cmd [list | git-diff-tree --no-commit-id -r -p -C $id]
} else {
set p [lindex $ids 1]
set cmd [list | git-diff-tree --no-commit-id -r -p -C $p $id]
}
if {[catch {set bdf [open $cmd r]} err]} { if {[catch {set bdf [open $cmd r]} err]} {
puts "error getting diffs: $err" puts "error getting diffs: $err"
return return
@ -3341,7 +3352,7 @@ proc doseldiff {oldid newid} {
$ctext conf -state disabled $ctext conf -state disabled
$ctext tag delete Comments $ctext tag delete Comments
$ctext tag remove found 1.0 end $ctext tag remove found 1.0 end
startdiff [list $newid $oldid] startdiff [list $newid $oldid] 0
} }
proc mkpatch {} { proc mkpatch {} {