summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-28 17:11:56 +0200
committerShawn O. Pearce <spearce@spearce.org>2007-05-28 23:50:41 +0200
commit26ae37d6fc9eeec27a0edf98c820b8a0b98e96f3 (patch)
treef414203b83dbed3cfd1837de3fe885c1808c9df5
parentgit-gui: GUI support for running 'git remote prune <name>' (diff)
downloadgit-26ae37d6fc9eeec27a0edf98c820b8a0b98e96f3.tar.xz
git-26ae37d6fc9eeec27a0edf98c820b8a0b98e96f3.zip
git-gui: Show the git-gui library path in 'About git-gui'
Because we now try to automatically guess the library directory in certain installations users may wonder where git-gui is getting its supporting files from. We now display this location in our About dialog, and we also include the location we are getting our Git executables from. Unfortunately users cannot use this 'About git-gui' dialog to troubleshoot library loading problems; the dialog is defined by code that exists in the library directory, creating a catch-22. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh2
-rw-r--r--lib/option.tcl15
2 files changed, 15 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh
index d238d45238..c1a6b84fa4 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -59,7 +59,7 @@ if {$idx ne {}} {
} else {
set auto_path [concat [list $oguilib] $auto_path]
}
-unset -nocomplain oguilib oguirel idx fd
+unset -nocomplain oguirel idx fd
if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
unset _verbose
diff --git a/lib/option.tcl b/lib/option.tcl
index e06aca59f3..9f76f0294e 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -52,7 +52,7 @@ proc save_config {} {
}
proc do_about {} {
- global appvers copyright
+ global appvers copyright oguilib
global tcl_patchLevel tk_patchLevel
set w .about_dialog
@@ -91,6 +91,10 @@ $copyright" \
append v ", Tk version $tk_patchLevel"
}
+ set d {}
+ append d "git exec dir: [gitexec]\n"
+ append d "git-gui lib: $oguilib"
+
label $w.vers \
-text $v \
-padx 5 -pady 5 \
@@ -100,6 +104,15 @@ $copyright" \
-relief solid
pack $w.vers -side top -fill x -padx 5 -pady 5
+ label $w.dirs \
+ -text $d \
+ -padx 5 -pady 5 \
+ -justify left \
+ -anchor w \
+ -borderwidth 1 \
+ -relief solid
+ pack $w.dirs -side top -fill x -padx 5 -pady 5
+
menu $w.ctxm -tearoff 0
$w.ctxm add command \
-label {Copy} \