git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows

diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index 1e55aec90a369a74623362239b79ded058a0335b..2bac50e1493ad2b0b05b3dc0a740467dfa778ebb 100644 (file)
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -84,6 +84,8 @@ constructor pick {} {
                        -command [cb _next new] \
                        -accelerator $M1T-N \
                        -label [mc "New..."]
+               bind $top <$M1B-n> [cb _next new]
+               bind $top <$M1B-N> [cb _next new]
        }
 
        $opts tag conf link_clone -foreground blue -underline 1
@@ -95,6 +97,8 @@ constructor pick {} {
                        -command [cb _next clone] \
                        -accelerator $M1T-C \
                        -label [mc "Clone..."]
+               bind $top <$M1B-c> [cb _next clone]
+               bind $top <$M1B-C> [cb _next clone]
        }
 
        $opts tag conf link_open -foreground blue -underline 1
@@ -106,6 +110,8 @@ constructor pick {} {
                        -command [cb _next open] \
                        -accelerator $M1T-O \
                        -label [mc "Open..."]
+               bind $top <$M1B-o> [cb _next open]
+               bind $top <$M1B-O> [cb _next open]
        }
 
        $opts conf -state disabled
@@ -134,12 +140,16 @@ constructor pick {} {
                $w_recentlist tag conf link \
                        -foreground blue \
                        -underline 1
-               set home "[file normalize $::env(HOME)][file separator]"
+               set home $::env(HOME)
+               if {[is_Cygwin]} {
+                       set home [exec cygpath --windows --absolute $home]
+               }
+               set home "[file normalize $home]/"
                set hlen [string length $home]
                foreach p $sorted_recent {
                        set path $p
                        if {[string equal -length $hlen $home $p]} {
-                               set p "~[file separator][string range $p $hlen end]"
+                               set p "~/[string range $p $hlen end]"
                        }
                        regsub -all "\n" $p "\\n" p
                        $w_recentlist insert end $p link
@@ -318,9 +328,42 @@ proc _is_git {path} {
         && [file exists [file join $path config]]} {
                return 1
        }
+       if {[is_Cygwin]} {
+               if {[file exists [file join $path HEAD]]
+                && [file exists [file join $path objects.lnk]]
+                && [file exists [file join $path config.lnk]]} {
+                       return 1
+               }
+       }
        return 0
 }
 
+proc _objdir {path} {
+       set objdir [file join $path .git objects]
+       if {[file isdirectory $objdir]} {
+               return $objdir
+       }
+
+       set objdir [file join $path objects]
+       if {[file isdirectory $objdir]} {
+               return $objdir
+       }
+
+       if {[is_Cygwin]} {
+               set objdir [file join $path .git objects.lnk]
+               if {[file isfile $objdir]} {
+                       return [win32_read_lnk $objdir]
+               }
+
+               set objdir [file join $path objects.lnk]
+               if {[file isfile $objdir]} {
+                       return [win32_read_lnk $objdir]
+               }
+       }
+
+       return {}
+}
+
 ######################################################################
 ##
 ## Create New Repository
@@ -549,13 +592,10 @@ method _do_clone2 {} {
        }
 
        if {$clone_type eq {hardlink} || $clone_type eq {shared}} {
-               set objdir [file join $origin_url .git objects]
-               if {![file isdirectory $objdir]} {
-                       set objdir [file join $origin_url objects]
-                       if {![file isdirectory $objdir]} {
-                               error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
-                               return
-                       }
+               set objdir [_objdir $origin_url]
+               if {$objdir eq {}} {
+                       error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
+                       return
                }
        }