git-gui: Ensure all spellchecker 'class' variables are initialized

diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index ab8e620c70bbaecd0397dd497c218f282da5ed92..86faf24cc8788701983f4ff49dc407ecce6d3148 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,8 +110,12 @@ 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
+
        set sorted_recent [_get_recentrepos]
        if {[llength $sorted_recent] > 0} {
                if {$m_repo ne {}} {
@@ -132,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
@@ -278,11 +290,6 @@ method _write_local_path {args} {
 }
 
 method _git_init {} {
-       if {[file exists $local_path]} {
-               error_popup [mc "Location %s already exists." $local_path]
-               return 0
-       }
-
        if {[catch {file mkdir $local_path} err]} {
                error_popup [strcat \
                        [mc "Failed to create repository %s:" $local_path] \
@@ -316,9 +323,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
@@ -372,41 +412,35 @@ method _new_local_path {} {
        if {$p eq {}} return
 
        set p [file normalize $p]
-       if {[file isdirectory $p]} {
-               foreach i [glob \
-                       -directory $p \
-                       -tails \
-                       -nocomplain \
-                       * .*] {
-                       switch -- $i {
-                        . continue
-                       .. continue
-                       default {
-                               error_popup [mc "Directory %s already exists." $p]
-                               return
-                       }
-                       }
-               }
-               if {[catch {file delete $p} err]} {
-                       error_popup [strcat \
-                               [mc "Directory %s already exists." $p] \
-                               "\n\n$err"]
-                       return
-               }
-       } elseif {[file exists $p]} {
-               error_popup [mc "File %s already exists." $p]
+       if {![_new_ok $p]} {
                return
        }
        set local_path $p
 }
 
 method _do_new2 {} {
+       if {![_new_ok $local_path]} {
+               return
+       }
        if {![_git_init $this]} {
                return
        }
        set done 1
 }
 
+proc _new_ok {p} {
+       if {[file isdirectory $p]} {
+               if {[_is_git [file join $p .git]]} {
+                       error_popup [mc "Directory %s already exists." $p]
+                       return 0
+               }
+       } elseif {[file exists $p]} {
+               error_popup [mc "File %s already exists." $p]
+               return 0
+       }
+       return 1
+}
+
 ######################################################################
 ##
 ## Clone Existing Repository
@@ -547,13 +581,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
                }
        }
 
@@ -565,6 +596,11 @@ method _do_clone2 {} {
                }
        }
 
+       if {[file exists $local_path]} {
+               error_popup [mc "Location %s already exists." $local_path]
+               return
+       }
+
        if {![_git_init $this]} return
        set local_path [pwd]