* [PATCH] gitk: switch to patch mode when searching for line origin
@ 2014-04-05 20:38 Max Kirillov
2014-06-15 4:56 ` Paul Mackerras
0 siblings, 1 reply; 2+ messages in thread
From: Max Kirillov @ 2014-04-05 20:38 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
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.
---
gitk | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 90764e8..5a99350 100755
--- a/gitk
+++ b/gitk
@@ -3870,7 +3870,7 @@ proc read_line_source {fd inst} {
set id $nullid2
}
if {[commitinview $id $curview]} {
- selectline [rowofcommit $id] 1 [list $fname $lnum]
+ selectline [rowofcommit $id] 1 [list $fname $lnum] 1
} else {
error_popup [mc "That line comes from commit %s, \
which is not in this view" [shortids $id]]
@@ -7161,7 +7161,7 @@ proc make_idmark {id} {
$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 canvy0 linespc parents children curview
global currentid sha1entry
@@ -7187,6 +7187,10 @@ proc selectline {l isnew {desired_loc {}}} {
setcanvscroll
}
+ if {$cmitmode ne "patch" && $switch_to_patch} {
+ set cmitmode "patch"
+ }
+
set y [expr {$canvy0 + $l * $linespc}]
set ymax [lindex [$canv cget -scrollregion] 3]
set ytop [expr {$y - $linespc - 1}]
--
1.8.5.2.421.g4cdf8d0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gitk: switch to patch mode when searching for line origin
2014-04-05 20:38 [PATCH] gitk: switch to patch mode when searching for line origin Max Kirillov
@ 2014-06-15 4:56 ` Paul Mackerras
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mackerras @ 2014-06-15 4:56 UTC (permalink / raw)
To: Max Kirillov; +Cc: git
On Sat, Apr 05, 2014 at 11:38:50PM +0300, Max Kirillov wrote:
> 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.
Thanks, applied.
Paul.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-15 4:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-05 20:38 [PATCH] gitk: switch to patch mode when searching for line origin Max Kirillov
2014-06-15 4:56 ` Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).