[PATCH] gitk: allow goto heads

This patch allows you to enter a head name in the SHA1 id: field.

It also removes some unnecessary global declarations.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index 90afec92df5c67f0a8fec32569cbdb635c05dbbf..4bc7946aeef65f919f638cedcd0263874d8c11bd 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -2847,13 +2847,15 @@ proc sha1change {n1 n2 op} {
 }
 
 proc gotocommit {} {
 }
 
 proc gotocommit {} {

-    global sha1string currentid commitrow tagids
+    global sha1string currentid commitrow tagids headids

     global displayorder numcommits
 
     if {$sha1string == {}
        || ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
        set id $tagids($sha1string)
     global displayorder numcommits
 
     if {$sha1string == {}
        || ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
        set id $tagids($sha1string)

+    } elseif {[info exists headids($sha1string)]} {
+       set id $headids($sha1string)

     } else {
        set id [string tolower $sha1string]
        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
     } else {
        set id [string tolower $sha1string]
        if {[regexp {^[0-9a-f]{4,39}$} $id]} {


@@ -2879,7 +2881,7 @@ proc gotocommit {} {
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
        set type "SHA1 id"
     } else {
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
        set type "SHA1 id"
     } else {

-       set type "Tag"
+       set type "Tag/Head"

     }
     error_popup "$type $sha1string is not known"
 }
     }
     error_popup "$type $sha1string is not known"
 }


@@ -3370,7 +3372,6 @@ proc listrefs {id} {
 
 proc rereadrefs {} {
     global idtags idheads idotherrefs
 
 proc rereadrefs {} {
     global idtags idheads idotherrefs

-    global tagids headids otherrefids

 
     set refids [concat [array names idtags] \
                    [array names idheads] [array names idotherrefs]]
 
     set refids [concat [array names idtags] \
                    [array names idheads] [array names idotherrefs]]