git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Paul Mackerras <paulus@samba.org>
Cc: Jean-Luc Herren <jlh@gmx.ch>, git@vger.kernel.org
Subject: [PATCH] gitk: make autoselect optional
Date: Thu, 6 Mar 2008 06:49:25 -0500	[thread overview]
Message-ID: <20080306114925.GA6942@sigill.intra.peff.net> (raw)
In-Reply-To: <18383.51382.866732.308234@cargo.ozlabs.ibm.com>

Whenever a commit is selected in the graph pane, its SHA1
is automatically put into the selection buffer for cut and
paste. However, some users may find this behavior annoying
since it can overwrite something they actually wanted to
keep in the buffer.

This patch makes the behavior optional under the name
"Auto-select SHA1", but continues to default to "on".

Signed-off-by: Jeff King <peff@peff.net>
---
On Thu, Mar 06, 2008 at 09:34:30PM +1100, Paul Mackerras wrote:

> Looks OK to me.  Care to re-send it with a Signed-off-by?  Oh, and
> put "sha1" in capitals, i.e. "SHA1".

Here it is, with both requested items and a slightly more coherent
commit message.

> (Tcl is actually a very simple language, and there are man pages for
> it; try "man Tcl" for a start. :)

Heh. My biggest concern was "did I get everywhere that options must be
mentioned" (which isn't a Tcl thing at all, of course). I tested that
the option works, and that it correctly saves the value in the .gitk
file and respects it on the next run.

 gitk-git/gitk |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index f1f21e9..36fdecd 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -1163,6 +1163,7 @@ proc savestuff {w} {
     global viewname viewfiles viewargs viewperm nextviewnum
     global cmitmode wrapcomment datetimeformat limitdiffs
     global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
+    global autoselect
 
     if {$stuffsaved} return
     if {![winfo viewable .]} return
@@ -1177,6 +1178,7 @@ proc savestuff {w} {
 	puts $f [list set maxwidth $maxwidth]
 	puts $f [list set cmitmode $cmitmode]
 	puts $f [list set wrapcomment $wrapcomment]
+	puts $f [list set autoselect $autoselect]
 	puts $f [list set showneartags $showneartags]
 	puts $f [list set showlocalchanges $showlocalchanges]
 	puts $f [list set datetimeformat $datetimeformat]
@@ -4650,6 +4652,7 @@ proc selectline {l isnew} {
     global commentend idtags linknum
     global mergemax numcommits pending_select
     global cmitmode showneartags allcommits
+    global autoselect
 
     catch {unset pending_select}
     $canv delete hover
@@ -4705,8 +4708,10 @@ proc selectline {l isnew} {
     set currentid $id
     $sha1entry delete 0 end
     $sha1entry insert 0 $id
-    $sha1entry selection from 0
-    $sha1entry selection to end
+    if {$autoselect} {
+	$sha1entry selection from 0
+	$sha1entry selection to end
+    }
     rhighlight_sel $id
 
     $ctext conf -state normal
@@ -7943,7 +7948,7 @@ proc doprefs {} {
     global maxwidth maxgraphpct
     global oldprefs prefstop showneartags showlocalchanges
     global bgcolor fgcolor ctext diffcolors selectbgcolor
-    global tabstop limitdiffs
+    global tabstop limitdiffs autoselect
 
     set top .gitkprefs
     set prefstop $top
@@ -7973,6 +7978,11 @@ proc doprefs {} {
     checkbutton $top.showlocal.b -variable showlocalchanges
     pack $top.showlocal.b $top.showlocal.l -side left
     grid x $top.showlocal -sticky w
+    frame $top.autoselect
+    label $top.autoselect.l -text [mc "Auto-select SHA1"] -font optionfont
+    checkbutton $top.autoselect.b -variable autoselect
+    pack $top.autoselect.b $top.autoselect.l -side left
+    grid x $top.autoselect -sticky w
 
     label $top.ddisp -text [mc "Diff display options"]
     grid $top.ddisp - -sticky w -pady 10
@@ -8463,6 +8473,7 @@ set maxlinelen 200
 set showlocalchanges 1
 set limitdiffs 1
 set datetimeformat "%Y-%m-%d %H:%M:%S"
+set autoselect 1
 
 set colors {green red blue magenta darkgrey brown orange}
 set bgcolor white
-- 
1.5.4.3.532.gf15a6


      reply	other threads:[~2008-03-06 11:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-04 15:39 How to make gitk not overwrite my selection? Jean-Luc Herren
2008-03-04 23:03 ` Jeff King
2008-03-05 22:44   ` Jean-Luc Herren
2008-03-05 23:00     ` Martin Langhoff
2008-03-06 10:34   ` Paul Mackerras
2008-03-06 11:49     ` Jeff King [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080306114925.GA6942@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=jlh@gmx.ch \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).