gitk: Use "gitk: repo-top-level-dir" as window title

Previously, when run in a subdirectory, gitk would show the name
of this subdirectory as title, which was misleading. When run with
GIT_DIR set, it would show the cwd, which is even more misleading.

In case of non-bare repos, the .git suffix in the path is skipped.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

diff --git a/gitk b/gitk
index 64ef3c401367c96236d81de3d88957a6459867cd..aa9b2e341debed2bf33b62c8d874c7128d25c7ce 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -14,6 +14,15 @@ proc hasworktree {} {
                  [exec git rev-parse --is-inside-git-dir] == "false"}]
 }
 
                  [exec git rev-parse --is-inside-git-dir] == "false"}]
 }
 

+proc reponame {} {
+    global gitdir
+    set n [file normalize $gitdir]
+    if {[string match "*/.git" $n]} {
+       set n [string range $n 0 end-5]
+    }
+    return [file tail $n]
+}
+

 # A simple scheduler for compute-intensive stuff.
 # The aim is to make sure that event handlers for GUI actions can
 # run at least every 50-100 ms.  Unfortunately fileevent handlers are
 # A simple scheduler for compute-intensive stuff.
 # The aim is to make sure that event handlers for GUI actions can
 # run at least every 50-100 ms.  Unfortunately fileevent handlers are


@@ -11607,6 +11616,8 @@ if {[package vcompare $git_version "1.6.6.2"] >= 0} {
     set show_notes "--show-notes"
 }
 
     set show_notes "--show-notes"
 }
 

+set appname "gitk"
+

 set runq {}
 set history {}
 set historyindex 0
 set runq {}
 set history {}
 set historyindex 0


@@ -11676,7 +11687,7 @@ catch {
 }
 # wait for the window to become visible
 tkwait visibility .
 }
 # wait for the window to become visible
 tkwait visibility .

-wm title . "[file tail $argv0]: [file tail [pwd]]"
+wm title . "$appname: [reponame]"

 update
 readrefs
 
 update
 readrefs