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

gitk: Switch to patch mode when searching for line origin

Browse Source 
If the "Show origin of this line" is started from tree mode,
it still shows the result in tree mode, which I suppose not
what user expects to see.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Max Kirillov 2014-04-05 23:38:50 +03:00 committed by Paul Mackerras
parent ada2ea1695
commit 4135d36b0c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gitk
View File

@ -3871,7 +3871,7 @@ proc read_line_source {fd inst} {
set id $nullid2 set id $nullid2
} }
if {[commitinview $id $curview]} { if {[commitinview $id $curview]} {
selectline [rowofcommit $id] 1 [list $fname $lnum] selectline [rowofcommit $id] 1 [list $fname $lnum] 1
} else { } else {
error_popup [mc "That line comes from commit %s, \ error_popup [mc "That line comes from commit %s, \
which is not in this view" [shortids $id]] which is not in this view" [shortids $id]]
@ -7162,7 +7162,7 @@ proc make_idmark {id} {
$canv raise $t $canv raise $t
} }
proc selectline {l isnew {desired_loc {}}} { proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
global canv ctext commitinfo selectedline global canv ctext commitinfo selectedline
global canvy0 linespc parents children curview global canvy0 linespc parents children curview
global currentid sha1entry global currentid sha1entry
@ -7188,6 +7188,10 @@ proc selectline {l isnew {desired_loc {}}} {
setcanvscroll setcanvscroll
} }
if {$cmitmode ne "patch" && $switch_to_patch} {
set cmitmode "patch"
}
set y [expr {$canvy0 + $l * $linespc}] set y [expr {$canvy0 + $l * $linespc}]
set ymax [lindex [$canv cget -scrollregion] 3] set ymax [lindex [$canv cget -scrollregion] 3]
set ytop [expr {$y - $linespc - 1}] set ytop [expr {$y - $linespc - 1}]