Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 2bac50e1493ad2b0b05b3dc0a740467dfa778ebb..0adcf9d958b76b5a52386effe6afbca95f0abaf9 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
@@ -290,11 +291,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] \
@@ -390,6 +386,7 @@ method _do_new {} {
        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
@@ -417,41 +414,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
@@ -492,6 +484,7 @@ method _do_clone {} {
                -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 +600,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]