From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 21 Feb 2008 03:34:11 +0000 (-0500)
Subject: git-gui: Catch and display aspell startup failures to the user
X-Git-Tag: v1.5.5-rc0~3^2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de83f8cc4cd97c52a0b8a1b1ff4e949129e3a947;p=git.git

git-gui: Catch and display aspell startup failures to the user

If we feed a bad dictionary name to aspell on startup it may appear
to start (as Tcl found the executable in our $PATH) but it fails to
give us the version string.  In such a case the close of the pipe
will report the exit status of the process (failure) and that is
an error in Tcl.

We now trap the subprocess failure and display the stderr message
from it, letting the user know why the failure is happening.  We then
disable the spell checker, but keep our object instance so the user
can alter their preferred dictionary through the options dialog, and
possibly restart the spell checker.

I was also originally wrong to use "error" here for the display
of the problem to the user.  I meant to use "error_popup", which
will open a message box and show the failure in a GUI context,
rather than killing git-gui and showing the message on the console.

Noticed by Ilari on #git.

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

diff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl
index a37ff5f8f..15b929b1a 100644
--- a/lib/spellcheck.tcl
+++ b/lib/spellcheck.tcl
@@ -35,12 +35,25 @@ method _connect {pipe_fd} {
 		-translation lf
 
 	if {[gets $pipe_fd s_version] <= 0} {
-		close $pipe_fd
-		error [mc "Spell checker sliently failed on startup"]
+		if {[catch {close $pipe_fd} err]} {
+			regsub -nocase {^Error: } $err {} err
+			if {$s_fd eq {}} {
+				error_popup [strcat [mc "Spell checking is unavailable"] ":\n\n$err"]
+			} else {
+				error_popup [strcat \
+					[mc "Invalid spell checking configuration"] \
+					":\n\n$err\n\n" \
+					[mc "Reverting dictionary to %s." $s_lang]]
+			}
+		} else {
+			error_popup [mc "Spell checker sliently failed on startup"]
+		}
+		return
 	}
 	if {{@(#) } ne [string range $s_version 0 4]} {
-		close $pipe_fd
-		error [strcat [mc "Unrecognized spell checker"] ": $s_version"]
+		catch {close $pipe_fd}
+		error_popup [strcat [mc "Unrecognized spell checker"] ":\n\n$s_version"]
+		return
 	}
 	set s_version [string range $s_version 5 end]