git-gui: Refactor console success/failure handling.

[git.git] / git-gui.sh

diff --git a/git-gui.sh b/git-gui.sh
index de4cec20aa7b0fbc9cab85d5276010ce26745b05..d2645580769c02d285314551842e0aed6fd4f824 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1269,87 +1269,25 @@ proc commit_committree {fd_wt curHEAD msg} {
 
 ######################################################################
 ##
-## fetch pull push
+## fetch push
 
 proc fetch_from {remote} {
-       set w [new_console "fetch $remote" \
+       set w [new_console \
+               "fetch $remote" \
                "Fetching new changes from $remote"]
        set cmd [list git fetch]
        lappend cmd $remote
-       console_exec $w $cmd
-}
-
-proc pull_remote {remote branch} {
-       global HEAD commit_type file_states repo_config
-
-       if {![lock_index update]} return
-
-       # -- Our in memory state should match the repository.
-       #
-       repository_state curType curHEAD curMERGE_HEAD
-       if {$commit_type ne $curType || $HEAD ne $curHEAD} {
-               info_popup {Last scanned state does not match repository state.
-
-Another Git program has modified this repository
-since the last scan.  A rescan must be performed
-before a pull operation can be started.
-
-The rescan will be automatically started now.
-}
-               unlock_index
-               rescan {set ui_status_value {Ready.}}
-               return
-       }
-
-       # -- No differences should exist before a pull.
-       #
-       if {[array size file_states] != 0} {
-               error_popup {Uncommitted but modified files are present.
-
-You should not perform a pull with unmodified
-files in your working directory as Git will be
-unable to recover from an incorrect merge.
-
-You should commit or revert all changes before
-starting a pull operation.
-}
-               unlock_index
-               return
-       }
-
-       set w [new_console "pull $remote $branch" \
-               "Pulling new changes from branch $branch in $remote"]
-       set cmd [list git pull]
-       if {$repo_config(gui.pullsummary) eq {false}} {
-               lappend cmd --no-summary
-       }
-       lappend cmd $remote
-       lappend cmd $branch
-       console_exec $w $cmd [list post_pull_remote $remote $branch]
-}
-
-proc post_pull_remote {remote branch success} {
-       global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
-       global ui_status_value
-
-       unlock_index
-       if {$success} {
-               repository_state commit_type HEAD MERGE_HEAD
-               set PARENT $HEAD
-               set selected_commit_type new
-               set ui_status_value "Pulling $branch from $remote complete."
-       } else {
-               rescan [list set ui_status_value \
-                       "Conflicts detected while pulling $branch from $remote."]
-       }
+       console_exec $w $cmd console_done
 }
 
 proc push_to {remote} {
-       set w [new_console "push $remote" \
+       set w [new_console \
+               "push $remote" \
                "Pushing changes to $remote"]
        set cmd [list git push]
+       lappend cmd -v
        lappend cmd $remote
-       console_exec $w $cmd
+       console_exec $w $cmd console_done
 }
 
 ######################################################################
@@ -2538,7 +2476,7 @@ proc start_push_anywhere_action {w} {
        }
 
        set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
-       console_exec $cons $cmd
+       console_exec $cons $cmd console_done
        destroy $w
 }
 
@@ -2916,7 +2854,7 @@ proc console_init {w} {
        return $w
 }
 
-proc console_exec {w cmd {after {}}} {
+proc console_exec {w cmd after} {
        # -- Windows tosses the enviroment when we exec our child.
        #    But most users need that so we have to relogin. :-(
        #
@@ -2935,7 +2873,7 @@ proc console_exec {w cmd {after {}}} {
 }
 
 proc console_read {w fd after} {
-       global console_cr console_data
+       global console_cr
 
        set buf [read $fd]
        if {$buf ne {}} {
@@ -2969,25 +2907,36 @@ proc console_read {w fd after} {
        fconfigure $fd -blocking 1
        if {[eof $fd]} {
                if {[catch {close $fd}]} {
-                       if {![winfo exists $w]} {console_init $w}
-                       $w.m.s conf -background red -text {Error: Command Failed}
-                       $w.ok conf -state normal
                        set ok 0
-               } elseif {[winfo exists $w]} {
-                       $w.m.s conf -background green -text {Success}
-                       $w.ok conf -state normal
+               } else {
                        set ok 1
                }
-               array unset console_cr $w
-               array unset console_data $w
-               if {$after ne {}} {
-                       uplevel #0 $after $ok
-               }
+               uplevel #0 $after $w $ok
                return
        }
        fconfigure $fd -blocking 0
 }
 
+proc console_done {w ok} {
+       global console_cr console_data
+
+       if {$ok} {
+               if {[winfo exists $w]} {
+                       $w.m.s conf -background green -text {Success}
+                       $w.ok conf -state normal
+               }
+       } else {
+               if {![winfo exists $w]} {
+                       console_init $w
+               }
+               $w.m.s conf -background red -text {Error: Command Failed}
+               $w.ok conf -state normal
+       }
+
+       array unset console_cr $w
+       array unset console_data $w
+}
+
 ######################################################################
 ##
 ## ui commands
@@ -3089,7 +3038,7 @@ proc do_stats {} {
 
 proc do_gc {} {
        set w [new_console {gc} {Compressing the object database}]
-       console_exec $w {git gc}
+       console_exec $w {git gc} console_done
 }
 
 proc do_fsck_objects {} {
@@ -3099,7 +3048,7 @@ proc do_fsck_objects {} {
        lappend cmd --full
        lappend cmd --cache
        lappend cmd --strict
-       console_exec $w $cmd
+       console_exec $w $cmd console_done
 }
 
 set is_quitting 0