git-gui: Reworded 'Include' to 'Add' to match core Git.

diff --git a/git-gui b/git-gui
index f52dd522c100101cd57f8f5b79a3a5f90712b12b..1891215a646b8715ac08dfb408e9ea31a12b1d74 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -499,8 +499,8 @@ proc rescan_done {fd buf after} {
                set pathList [list]
                foreach path [array names file_states] {
                        switch -- [lindex $file_states($path) 0] {
-                       AM -
-                       MM {lappend pathList $path}
+                       A? -
+                       M? {lappend pathList $path}
                        }
                }
                if {$pathList ne {}} {
@@ -1502,10 +1502,13 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
                switch -glob -- [lindex $file_states($path) 0] {
                AD -
                MD -
+               UD -
                _D {set new DD}
 
                _M -
                MM -
+               UM -
+               U_ -
                M_ {set new M_}
 
                _O -
@@ -1643,10 +1646,59 @@ proc populate_branch_menu {m} {
        }
 }
 
-proc switch_branch {b} {
+proc do_create_branch {} {
+       error "NOT IMPLEMENTED"
+}
+
+proc do_delete_branch {} {
        error "NOT IMPLEMENTED"
 }
 
+proc switch_branch {b} {
+       global HEAD commit_type file_states current_branch
+       global selected_commit_type ui_comm
+
+       if {![lock_index switch]} return
+
+       # -- Backup the selected branch (repository_state resets it)
+       #
+       set new_branch $current_branch
+
+       # -- Our in memory state should match the repository.
+       #
+       repository_state curType curHEAD curMERGE_HEAD
+       if {[string match amend* $commit_type]
+               && $curType eq {normal}
+               && $curHEAD eq $HEAD} {
+       } elseif {$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 the current branch can be changed.
+
+The rescan will be automatically started now.
+}
+               unlock_index
+               rescan {set ui_status_value {Ready.}}
+               return
+       }
+
+       # -- Toss the message buffer if we are in amend mode.
+       #
+       if {[string match amend* $curType]} {
+               $ui_comm delete 0.0 end
+               $ui_comm edit reset
+               $ui_comm edit modified false
+       }
+
+       set selected_commit_type new
+       set current_branch $new_branch
+
+       unlock_index
+       error "NOT FINISHED"
+}
+
 ######################################################################
 ##
 ## remote management
@@ -2338,6 +2390,7 @@ proc do_include_all {} {
 }
 
 proc revert_helper {txt paths} {
+       global gitdir appname
        global file_states current_diff
 
        if {![lock_index begin-update]} return
@@ -2370,13 +2423,17 @@ proc revert_helper {txt paths} {
                set s "these $n files"
        }
 
+       set reponame [lindex [file split \
+               [file normalize [file dirname $gitdir]]] \
+               end]
+
        set reply [tk_dialog \
                .confirm_revert \
-               "title" \
+               "$appname ($reponame)" \
                "Revert unincluded changes in $s?
 
 Any unincluded changes will be permanently lost by the revert." \
-               questhead \
+               question \
                1 \
                {Do Nothing} \
                {Revert Changes} \
@@ -3086,13 +3143,13 @@ lappend disable_on_lock \
 lappend disable_on_lock \
        [list .mbar.commit entryconf [.mbar.commit index last] -state]
 
-.mbar.commit add command -label {Include In Commit} \
+.mbar.commit add command -label {Add To Commit} \
        -command do_include_selection \
        -font font_ui
 lappend disable_on_lock \
        [list .mbar.commit entryconf [.mbar.commit index last] -state]
 
-.mbar.commit add command -label {Include All In Commit} \
+.mbar.commit add command -label {Add All To Commit} \
        -command do_include_all \
        -accelerator $M1T-I \
        -font font_ui
@@ -3260,7 +3317,7 @@ pack .vpane.lower.commarea.buttons.rescan -side top -fill x
 lappend disable_on_lock \
        {.vpane.lower.commarea.buttons.rescan conf -state}
 
-button .vpane.lower.commarea.buttons.incall -text {Include All} \
+button .vpane.lower.commarea.buttons.incall -text {Add All} \
        -command do_include_all \
        -font font_ui
 pack .vpane.lower.commarea.buttons.incall -side top -fill x