[PATCH] git-gui: Help identify aspell version on Windows too

On windows, git gui fails to correctly extract the aspell version
(experienced with aspell version 0.50.3) due to scilent white space at
the end of the version string.  Trim the obtained version string to
work around this.

Signed-off-by: Gustaf Hendeby <redacted>
---
 lib/spellcheck.tcl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl
index 78f344f..c8cc030 100644
--- a/lib/spellcheck.tcl
+++ b/lib/spellcheck.tcl

@@ -80,7 +80,7 @@ method _connect {pipe_fd} {
 		error_popup [strcat [mc "Unrecognized spell checker"] ":\n\n$s_version"]
 		return
 	}
-	set s_version [string range $s_version 5 end]
+			set s_version [string range [string trim $s_version] 5 end]
 	regexp \
 		{International Ispell Version .* \(but really (Aspell .*?)\)$} \
 		$s_version _junk s_version

-- 
1.6.0.2.509.g4def

Gustaf Hendeby schrieb:

On windows, git gui fails to correctly extract the aspell version
(experienced with aspell version 0.50.3) due to scilent white space at
the end of the version string.  Trim the obtained version string to
work around this.

With this I've partial success here: Aspell 0.50.3 alpha (downloaded from
http://aspell.net/win32/) is recognized, but

- it only ever checks the first line of the commit message;

- after I change the catalog in the Options, I can't "Save" (it does
nothing), until I change to some other catalog. I haven't discovered the
pattern, yet, when the "Save" succeeds.

- At startup the correct catalog is used. But if I change the catalog
during a session (if I succeed, see above), then the second-last picked
catalog is used.

Any idea how to debug this?

A strange indentation you have here.

 	regexp \
 		{International Ispell Version .* \(but really (Aspell .*?)\)$} \
 		$s_version _junk s_version

-- Hannes

On 09/26/2008 08:29 AM, Johannes Sixt wrote:

Gustaf Hendeby schrieb:

quoted

On windows, git gui fails to correctly extract the aspell version
(experienced with aspell version 0.50.3) due to scilent white space at
the end of the version string.  Trim the obtained version string to
work around this.

With this I've partial success here: Aspell 0.50.3 alpha (downloaded from
http://aspell.net/win32/) is recognized, but

- it only ever checks the first line of the commit message;

Hmm, strange, I just had it mark my whole first like red, I think it
took an enter at the end of the line to get everything started though.
Does it check the rest of the lines for you?  I know spell checking is
disabled for too early versions of Aspell, due to some change in the
interface I think.

- after I change the catalog in the Options, I can't "Save" (it does
nothing), until I change to some other catalog. I haven't discovered the
pattern, yet, when the "Save" succeeds.

- At startup the correct catalog is used. But if I change the catalog
during a session (if I succeed, see above), then the second-last picked
catalog is used.

Any idea how to debug this?

I have experienced some saving related issues I think, but I'm not sure.
 Unfortunately I have very little understanding on what is going on in
the code, basically I don't know tcl/tk at all.  I was just lucky to
find a solution to my problem that seemed to work for me.

quoted

@@ -80,7 +80,7 @@ method _connect {pipe_fd} {
 		error_popup [strcat [mc "Unrecognized spell checker"] ":\n\n$s_version"]
 		return
 	}
-	set s_version [string range $s_version 5 end]
+			set s_version [string range [string trim $s_version] 5 end]

A strange indentation you have here.

Yep, sorry about that, seems I had a nonstandard tab-width setting.  Too
bad not all projects can decide on the same tab width. :(  Will resend
if there are no other comments to this, and at the same time fix the
spelling in the commit message...

/Gustaf

Gustaf Hendeby schrieb:

On 09/26/2008 08:29 AM, Johannes Sixt wrote:

quoted

Gustaf Hendeby schrieb:

quoted

On windows, git gui fails to correctly extract the aspell version
(experienced with aspell version 0.50.3) due to scilent white space at
the end of the version string.  Trim the obtained version string to
work around this.

With this I've partial success here: Aspell 0.50.3 alpha (downloaded from
http://aspell.net/win32/) is recognized, but

- it only ever checks the first line of the commit message;

Hmm, strange, I just had it mark my whole first like red, I think it
took an enter at the end of the line to get everything started though.
Does it check the rest of the lines for you?  I know spell checking is
disabled for too early versions of Aspell, due to some change in the
interface I think.

My situation is this: I fire up git-gui, and because I have some stale
.git/GITGUI_MSG file, the commit message box is not empty. Aspell begins
its work, and git-gui correctly marks spelling mistakes in the first line.
Even if I type new text, delete old text, or change the whole text by
clicking "Amend", no new spelling mistakes are marked for the whole session.

-- Hannes

Gustaf Hendeby [off-list ref] wrote:

quoted

quoted

 	}
-	set s_version [string range $s_version 5 end]
+			set s_version [string range [string trim $s_version] 5 end]

A strange indentation you have here.

Yep, sorry about that, seems I had a nonstandard tab-width setting.  Too
bad not all projects can decide on the same tab width. :(  Will resend
if there are no other comments to this, and at the same time fix the
spelling in the commit message...

I fixed the indentation, but didn't notice the spelling error in
the commit message.  Anyway, its too late, I have already pushed
this fix out to my maint and master branches in git-gui.  I'm not
going to rewind 'em.

-- 
Shawn.

Johannes Sixt [off-list ref] wrote:

My situation is this: I fire up git-gui, and because I have some stale
.git/GITGUI_MSG file, the commit message box is not empty. Aspell begins
its work, and git-gui correctly marks spelling mistakes in the first line.
Even if I type new text, delete old text, or change the whole text by
clicking "Amend", no new spelling mistakes are marked for the whole session.

Hmm.  Sounds to me like aspell crashes and dies after a while.

When aspell terminates on its own git-gui doesn't try to restart it.
I've never seen it abort on my Mac, or my Linux systems.  Or even
on Windows when I was using the Cygwin version of aspell.

-- 
Shawn.

Shawn O. Pearce schrieb:

Johannes Sixt [off-list ref] wrote:

quoted

My situation is this: I fire up git-gui, and because I have some stale
.git/GITGUI_MSG file, the commit message box is not empty. Aspell begins
its work, and git-gui correctly marks spelling mistakes in the first line.
Even if I type new text, delete old text, or change the whole text by
clicking "Amend", no new spelling mistakes are marked for the whole session.

Hmm.  Sounds to me like aspell crashes and dies after a while.

When aspell terminates on its own git-gui doesn't try to restart it.
I've never seen it abort on my Mac, or my Linux systems.  Or even
on Windows when I was using the Cygwin version of aspell.

No, it does not abort. It's still running, but sitting there idly.

-- Hannes