summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Alexander Gavrilov <angavrilov@gmail.com>2008-11-09 18:51:16 +0300
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-11-11 09:29:36 -0800
commite29c0d10a201a4ce0c71ddb65faadff533ed2a98 (patch)
treeecd7e712c4b21c7e55da2b953f1fb9141f7a6e57
parentgit-gui: Fix focus transition in the blame viewer. (diff)
downloadtgif-e29c0d10a201a4ce0c71ddb65faadff533ed2a98.tar.xz
git-gui: Add the Show SSH Key item to the clone dialog.
The user might need to see the key before cloning a repository. This patch makes the relevant menu item available in the Select Repository/Clone dialog. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh20
-rw-r--r--lib/choose_repository.tcl6
2 files changed, 17 insertions, 9 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 12b496bec9..cf9ef6ee07 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -999,6 +999,17 @@ citool {
######################################################################
##
+## execution environment
+
+set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
+
+# Suggest our implementation of askpass, if none is set
+if {![info exists env(SSH_ASKPASS)]} {
+ set env(SSH_ASKPASS) [gitexec git-gui--askpass]
+}
+
+######################################################################
+##
## repository setup
set picked 0
@@ -1073,15 +1084,6 @@ set selected_commit_type new
set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001"
-set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
-
-######################################################################
-
-# Suggest our implementation of askpass, if none is set
-if {![info exists env(SSH_ASKPASS)]} {
- set env(SSH_ASKPASS) [gitexec git-gui--askpass]
-}
-
######################################################################
##
## task management
diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index 909131689e..f9ff62a3b2 100644
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -43,12 +43,18 @@ constructor pick {} {
$w.mbar.apple add command \
-label [mc "About %s" [appname]] \
-command do_about
+ $w.mbar.apple add command \
+ -label [mc "Show SSH Key"] \
+ -command do_ssh_key
} else {
$w.mbar add cascade -label [mc Help] -menu $w.mbar.help
menu $w.mbar.help
$w.mbar.help add command \
-label [mc "About %s" [appname]] \
-command do_about
+ $w.mbar.help add command \
+ -label [mc "Show SSH Key"] \
+ -command do_ssh_key
}
wm protocol $top WM_DELETE_WINDOW exit