Merge branch 'mv/remote-rename'

[git.git] / git-gui / lib / choose_repository.tcl

diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 2bac50e1493ad2b0b05b3dc0a740467dfa778ebb..f9ff62a3b22fcc481c88dc35268d06d2fc4a5795 100644 (file)
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -11,6 +11,7 @@ field w_quit      ; # Quit button
 field o_cons      ; # Console object (if active)
 field w_types     ; # List of type buttons in clone
 field w_recentlist ; # Listbox containing recent repositories
+field w_localpath  ; # Entry widget bound to local_path
 
 field done              0 ; # Finished picking the repository?
 field local_path       {} ; # Where this repository is locally
@@ -37,17 +38,23 @@ constructor pick {} {
                menu $m_repo
 
                if {[is_MacOSX]} {
-                       $w.mbar add cascade -label [mc Apple] -menu .mbar.apple
+                       $w.mbar add cascade -label Apple -menu .mbar.apple
                        menu $w.mbar.apple
                        $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
@@ -290,11 +297,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] \
@@ -385,15 +387,15 @@ method _do_new {} {
        label $w_body.where.l -text [mc "Directory:"]
        entry $w_body.where.t \
                -textvariable @local_path \
-               -font font_diff \
+               -borderwidth 1 \
+               -relief sunken \
                -width 50
        button $w_body.where.b \
                -text [mc "Browse"] \
                -command [cb _new_local_path]
+       set w_localpath $w_body.where.t
 
-       pack $w_body.where.b -side right
-       pack $w_body.where.l -side left
-       pack $w_body.where.t -fill x
+       grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
        trace add variable @local_path write [cb _write_local_path]
@@ -417,41 +419,36 @@ 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
+       $w_localpath icursor end
 }
 
 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
@@ -473,25 +470,28 @@ method _do_clone {} {
        frame $w_body.args
        pack $args -fill both
 
-       label $args.origin_l -text [mc "URL:"]
+       label $args.origin_l -text [mc "Source Location:"]
        entry $args.origin_t \
                -textvariable @origin_url \
-               -font font_diff \
+               -borderwidth 1 \
+               -relief sunken \
                -width 50
        button $args.origin_b \
                -text [mc "Browse"] \
                -command [cb _open_origin]
        grid $args.origin_l $args.origin_t $args.origin_b -sticky ew
 
-       label $args.where_l -text [mc "Directory:"]
+       label $args.where_l -text [mc "Target Directory:"]
        entry $args.where_t \
                -textvariable @local_path \
-               -font font_diff \
+               -borderwidth 1 \
+               -relief sunken \
                -width 50
        button $args.where_b \
                -text [mc "Browse"] \
                -command [cb _new_local_path]
        grid $args.where_l $args.where_t $args.where_b -sticky ew
+       set w_localpath $args.where_t
 
        label $args.type_l -text [mc "Clone Type:"]
        frame $args.type_f
@@ -607,6 +607,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]
 
@@ -983,15 +988,14 @@ method _do_open {} {
        label $w_body.where.l -text [mc "Repository:"]
        entry $w_body.where.t \
                -textvariable @local_path \
-               -font font_diff \
+               -borderwidth 1 \
+               -relief sunken \
                -width 50
        button $w_body.where.b \
                -text [mc "Browse"] \
                -command [cb _open_local_path]
 
-       pack $w_body.where.b -side right
-       pack $w_body.where.l -side left
-       pack $w_body.where.t -fill x
+       grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
        trace add variable @local_path write [cb _write_local_path]