git-gui: Improve pull error dialogs.

Just like prior to a commit its only an informational message that
we refuse to perform a pull on a dirty working directory.  Therefore
we should not use an error icon.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui b/git-gui
index d1cc0ec2485d524c85d935a8e9a5df153350d197..8246037fac0644a84d7cfb10e00534e33b97b2d3 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -1122,11 +1122,13 @@ proc pull_remote {remote branch} {
        #
        repository_state curType curHEAD curMERGE_HEAD
        if {$commit_type ne $curType || $HEAD ne $curHEAD} {
        #
        repository_state curType curHEAD curMERGE_HEAD
        if {$commit_type ne $curType || $HEAD ne $curHEAD} {

-               error_popup {Last scanned state does not match repository state.
+               info_popup {Last scanned state does not match repository state.

 
 

-Its highly likely that another Git program modified the
-repository since our last scan.  A rescan is required
-before a pull can be started.
+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.}}
 }
                unlock_index
                rescan {set ui_status_value {Ready.}}


@@ -1138,10 +1140,12 @@ before a pull can be started.
        if {[array size file_states] != 0} {
                error_popup {Uncommitted but modified files are present.
 
        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 would be unable to recover from an incorrect merge.
+You should not perform a pull with unmodified
+files in your working directory as Git will be
+unable to recover from an incorrect merge.

 
 

-Commit or throw away all changes before starting a pull operation.
+You should commit or revert all changes before
+starting a pull operation.

 }
                unlock_index
                return
 }
                unlock_index
                return