From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Pat Thoyts <patthoyts@gmail.com>,
Pat Thoyts <patthoyts@googlemail.com>,
git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>
Subject: [PATCH] git-gui: Include version check and test for tearoff menu entry
Date: Mon, 14 Feb 2011 13:03:24 +0000 [thread overview]
Message-ID: <878vxilndt.fsf_-_@fox.patthoyts.tk> (raw)
In-Reply-To: <20110213135714.GE31986@book.hvoigt.net> (Heiko Voigt's message of "Sun, 13 Feb 2011 14:57:15 +0100")
The --all option for git fetch was added in v1.6.6 so ensure we have a usable version before adding
the menu items.
Sometimes people use tearoff menus and these offset the entry indices by one.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
Heiko Voigt <hvoigt@hvoigt.net> writes:
>It just came to my mind that I probably should implement a version check
>of the commandline to ensure that this option is available. Thats why I
>tagged only this patch with RFC.
>
>Cheers Heiko
The posted patch seems fine except that an error is reported if tearoff
menus are present. So this patch accommodates tearoff's. I looked up
when the --all option was added (1.6.6) and skip adding the menu entry
if we have an older version.
Seems to do the right thing.
lib/remote.tcl | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/lib/remote.tcl b/lib/remote.tcl
index 817ca1b..b88f6e5 100644
--- a/lib/remote.tcl
+++ b/lib/remote.tcl
@@ -233,6 +233,8 @@ proc make_sure_remote_submenues_exist {remote_m} {
proc update_all_remotes_menu_entry {} {
global all_remotes
+ if {[git-version < 1.6.6]} { return }
+
set have_remote 0
foreach r $all_remotes {
set have_remote 1
@@ -243,27 +245,29 @@ proc update_all_remotes_menu_entry {} {
set prune_m $remote_m.prune
if {$have_remote} {
make_sure_remote_submenues_exist $remote_m
- if {[$fetch_m entrycget 0 -label] ne "All"} {
+ set index [expr {[$fetch_m type 0] eq "tearoff" ? 1 : 0}]
+ if {[$fetch_m entrycget $index -label] ne "All"} {
- $fetch_m insert 0 separator
- $fetch_m insert 0 command \
+ $fetch_m insert $index separator
+ $fetch_m insert $index command \
-label "All" \
-command fetch_from_all
- $prune_m insert 0 separator
- $prune_m insert 0 command \
+ $prune_m insert $index separator
+ $prune_m insert $index command \
-label "All" \
-command prune_from_all
}
} else {
if {[winfo exists $fetch_m]} {
+ set index [expr {[$fetch_m type 0] eq "tearoff" ? 1 : 0}]
if {[$fetch_m type end] eq "separator"} {
- delete_from_menu $fetch_m 0
- delete_from_menu $fetch_m 0
+ delete_from_menu $fetch_m $index
+ delete_from_menu $fetch_m $index
- delete_from_menu $prune_m 0
- delete_from_menu $prune_m 0
+ delete_from_menu $prune_m $index
+ delete_from_menu $prune_m $index
}
}
}
--
1.7.4.47.gb308bf
next prev parent reply other threads:[~2011-02-14 14:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-12 16:43 [PATCH 1/2] git-gui: fix deleting item from all_remotes variable Heiko Voigt
2011-02-13 13:20 ` Pat Thoyts
2011-02-13 13:47 ` Heiko Voigt
2011-02-13 13:50 ` [PATCH 1/2] git-gui: refactor remote submenu creation into subroutine Heiko Voigt
2011-02-13 13:57 ` [RFC PATCH 2/2] git-gui: teach fetch/prune menu to do it for all remotes Heiko Voigt
2011-02-14 13:03 ` Pat Thoyts [this message]
2011-02-14 21:31 ` [PATCH] git-gui: Include version check and test for tearoff menu entry Heiko Voigt
2011-02-15 0:31 ` Pat Thoyts
2011-02-17 20:06 ` Heiko Voigt
2011-02-22 18:36 ` [RFC PATCH 2/2] git-gui: teach fetch/prune menu to do it for all remotes Jens Lehmann
2011-02-22 19:28 ` [PATCH 1/2] git-gui: fetch/prune all entry only for more than one entry Heiko Voigt
2011-02-24 0:02 ` Pat Thoyts
2011-02-22 19:30 ` [PATCH 2/2] git-gui: fetch/prune all entry appears last Heiko Voigt
2011-02-23 19:19 ` Jens Lehmann
2011-02-24 0:09 ` Pat Thoyts
2011-02-13 14:05 ` Re: [PATCH 1/2] git-gui: fix deleting item from all_remotes variable Heiko Voigt
2011-02-13 14:15 ` Heiko Voigt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878vxilndt.fsf_-_@fox.patthoyts.tk \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=jens.lehmann@web.de \
--cc=patthoyts@gmail.com \
--cc=patthoyts@googlemail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).