summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 16:32:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-12 16:32:04 (GMT)
commitc528586a0cf0afc6aa18fbd060fa544e7e189c82 (patch)
treebe2b93ddde1cd2186baafaa7596d7d5f883c8d88 /gitk-git/gitk
parent53284de77712b2234c739afa3aa5f024fc89fc83 (diff)
parent587277fea3bf3bfc4302480178bd88a277a69f05 (diff)
downloadgit-c528586a0cf0afc6aa18fbd060fa544e7e189c82.zip
git-c528586a0cf0afc6aa18fbd060fa544e7e189c82.tar.gz
git-c528586a0cf0afc6aa18fbd060fa544e7e189c82.tar.bz2
Merge branch 'da/gitk-reload-tag-contents'
After overwriting a tag with a new tag, "Reread references" action in "gitk" correctly moved the marker in the display, but it failed to discard a cached contents of the tag (even "Reload" didn't). * da/gitk-reload-tag-contents: gitk: Rename 'tagcontents' to 'cached_tagcontent' gitk: Teach "Reread references" to reload tags gitk: Avoid Meta1-F5
Diffstat (limited to 'gitk-git/gitk')
-rwxr-xr-xgitk-git/gitk17
1 files changed, 9 insertions, 8 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 22270ce..6f24f53 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2038,7 +2038,7 @@ proc makewindow {} {
set file {
mc "File" cascade {
{mc "Update" command updatecommits -accelerator F5}
- {mc "Reload" command reloadcommits -accelerator Meta1-F5}
+ {mc "Reload" command reloadcommits -accelerator Shift-F5}
{mc "Reread references" command rereadrefs}
{mc "List references" command showrefs -accelerator F2}
{xx "" separator}
@@ -2495,7 +2495,7 @@ proc makewindow {} {
bindkey ? {dofind -1 1}
bindkey f nextfile
bind . <F5> updatecommits
- bind . <$M1B-F5> reloadcommits
+ bind . <Shift-F5> reloadcommits
bind . <F2> showrefs
bind . <Shift-F4> {newview 0}
catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} }
@@ -10599,7 +10599,7 @@ proc movedhead {hid head} {
}
proc changedrefs {} {
- global cached_dheads cached_dtags cached_atags
+ global cached_dheads cached_dtags cached_atags cached_tagcontent
global arctags archeads arcnos arcout idheads idtags
foreach id [concat [array names idheads] [array names idtags]] {
@@ -10611,6 +10611,7 @@ proc changedrefs {} {
}
}
}
+ catch {unset cached_tagcontent}
catch {unset cached_dtags}
catch {unset cached_atags}
catch {unset cached_dheads}
@@ -10663,7 +10664,7 @@ proc listrefs {id} {
}
proc showtag {tag isnew} {
- global ctext tagcontents tagids linknum tagobjid
+ global ctext cached_tagcontent tagids linknum tagobjid
if {$isnew} {
addtohistory [list showtag $tag 0] savectextpos
@@ -10672,13 +10673,13 @@ proc showtag {tag isnew} {
clear_ctext
settabs 0
set linknum 0
- if {![info exists tagcontents($tag)]} {
+ if {![info exists cached_tagcontent($tag)]} {
catch {
- set tagcontents($tag) [exec git cat-file tag $tag]
+ set cached_tagcontent($tag) [exec git cat-file tag $tag]
}
}
- if {[info exists tagcontents($tag)]} {
- set text $tagcontents($tag)
+ if {[info exists cached_tagcontent($tag)]} {
+ set text $cached_tagcontent($tag)
} else {
set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
}