Re: [PATCH] gitk: Rename 'tagcontents' to 'cached_tagcontent'

2012-09-12 Thread Paul Mackerras 
On Wed, Sep 12, 2012 at 02:25:28AM -0700, Junio C Hamano wrote:
> Junio C Hamano  writes:
> 
> > I've applied these two, on top of Paul's master branch at
> >
> > git://ozlabs.org/~paulus/gitk.git
> >
> > and tentatively queued in 'pu', but I would prefer to see it
> > eyeballed by and queued in his tree first.
> >
> > Thanks.
> 
> Pinging Paul...
> 
> The following changes since commit a135f214e371311f13807da637d492fd9642a2e3:
> 
>   gitk: Avoid Meta1-F5 (2012-04-25 13:44:31 +1000)
> 
> are available in the git repository at:
> 
>   git://github.com/gitster/git da/gitk-reload-tag-contents
> 
> for you to fetch changes up to 587277fea3bf3bfc4302480178bd88a277a69f05:
> 
>   gitk: Rename 'tagcontents' to 'cached_tagcontent' (2012-09-08 20:25:09 
> -0700)

Thanks, pulled and pushed out.  I had one other commit queued up, so
if you pull from git://ozlabs.org/~paulus/gitk.git you will get that
plus a merge.

Paul.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] gitk: Rename 'tagcontents' to 'cached_tagcontent'

2012-09-12 Thread Junio C Hamano 
Junio C Hamano  writes:

> I've applied these two, on top of Paul's master branch at
>
> git://ozlabs.org/~paulus/gitk.git
>
> and tentatively queued in 'pu', but I would prefer to see it
> eyeballed by and queued in his tree first.
>
> Thanks.

Pinging Paul...

The following changes since commit a135f214e371311f13807da637d492fd9642a2e3:

  gitk: Avoid Meta1-F5 (2012-04-25 13:44:31 +1000)

are available in the git repository at:

  git://github.com/gitster/git da/gitk-reload-tag-contents

for you to fetch changes up to 587277fea3bf3bfc4302480178bd88a277a69f05:

  gitk: Rename 'tagcontents' to 'cached_tagcontent' (2012-09-08 20:25:09 -0700)


David Aguilar (2):
  gitk: Teach "Reread references" to reload tags
  gitk: Rename 'tagcontents' to 'cached_tagcontent'

 gitk | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] gitk: Rename 'tagcontents' to 'cached_tagcontent'

2012-09-08 Thread Junio C Hamano 
I've applied these two, on top of Paul's master branch at

git://ozlabs.org/~paulus/gitk.git

and tentatively queued in 'pu', but I would prefer to see it
eyeballed by and queued in his tree first.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] gitk: Rename 'tagcontents' to 'cached_tagcontent'

2012-09-08 Thread David Aguilar 
Name the 'tagcontents' variable similarly to the rest of the
variables cleared in the changedrefs() function.

This makes the naming consistent and provides a hint that it
should be cleared when reloading gitk's cache.

Suggested-by: Junio C Hamano 
Signed-off-by: David Aguilar 
---

Follow-up to 'gitk: Teach "Reread references" to reload tags'

 gitk |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gitk b/gitk
index a124822..6f24f53 100755
--- a/gitk
+++ b/gitk
@@ -10599,7 +10599,7 @@ proc movedhead {hid head} {
 }
 
 proc changedrefs {} {
-global cached_dheads cached_dtags cached_atags tagcontents
+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,7 +10611,7 @@ proc changedrefs {} {
}
}
 }
-catch {unset tagcontents}
+catch {unset cached_tagcontent}
 catch {unset cached_dtags}
 catch {unset cached_atags}
 catch {unset cached_dheads}
@@ -10664,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
@@ -10673,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)"
 }
-- 
1.7.7.2.448.gee6df

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html