AgeCommit message (Collapse)Author
2008-02-21git-gui: Shorten Aspell version strings to just Aspell version numberShawn O. Pearce
We really only support Aspell, so showing the compatibility line from ispell is of little value to end users. Signed-off-by: Shawn O. Pearce <>
2008-02-21git-gui: Gracefully display non-aspell version errors to usersShawn O. Pearce
If the user has somehow managed to make us execute ispell instead of aspell, even though our code is invoking aspell, and ispell is not recognizing the aspell command line options we use to invoke it then we don't want a giant usage message back from ispell. Instead we show the ispell version number, letting the user know we don't actually support that spell checker. Signed-off-by: Shawn O. Pearce <>
2008-02-21git-gui: Catch and display aspell startup failures to the userShawn O. Pearce
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 <>
2008-02-21git-gui: Only bind the spellcheck popup suggestion hook onceShawn O. Pearce
If we reconnect to the spellchecker there is no reason to resetup the binding for button 3 on our text widget to show the suggestion list (if available). Plus, by moving it out of _connect and into init we can now break out of _connect earlier if there is something wrong with the pipe, for example if the dictionary we were asked to load is not valid. Signed-off-by: Shawn O. Pearce <>
2008-02-21git-gui: Remove explicit references to 'aspell' in message stringsShawn O. Pearce
Users may or may not be using aspell here. About the only thing we are using that is aspell specific (and not supported by ispell or an ispell variant) is some command line options when we start up aspell, and a forced encoding of UTF-8. Both of these can be corrected and/or cleaned up by users through an aspell wrapper script, or through further improvements to git-gui. There is no reason to require our translated strings to reference a specific spell checker, especially if that spell checker implementation is not very suitable for the language being translated. Signed-off-by: Shawn O. Pearce <>
2008-02-21git-gui: Ensure all spellchecker 'class' variables are initializedShawn O. Pearce
If we somehow managed to get our spellchecker instance created but aspell wasn't startable we may not finish _connect and thus may find one or more of our fields was not initialized in the instance. If we have an instance but no version, there is no reason to show a version to the user in our about dialog. We effectively have no spellchecker available. Signed-off-by: Shawn O. Pearce <>
2008-02-21Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: Ensure error dialogs always appear over all other windows
2008-02-21git-gui: Ensure error dialogs always appear over all other windowsShawn O. Pearce
If we are opening an error dialog we want it to appear above all of the other windows, even those that we may have opened with a grab to make the window modal. Failure to do so may allow an error dialog to open up (and grab focus!) under an existing toplevel, making the user think git-gui has frozen up and is unresponsive, as they cannot get to the dialog. Signed-off-by: Shawn O. Pearce <>
2008-02-20Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: relax "dirty" version detection
2008-02-20git-gui: relax "dirty" version detectionWincent Colaiuta
"git gui" would complain at launch if the local version of Git was "". Loosen the regular expression to look for either "-dirty" or ".dirty", thus eliminating spurious warnings. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Shawn O. Pearce <>
2008-02-17git-gui: Update German translation.Christian Stimming
Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-02-17git-gui: (i18n) Add newly added translation strings to template.Christian Stimming
And markup one missing string for translation. Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-02-14git-gui: Correct size of dictionary name widget in options dialogShawn O. Pearce
We don't need to fill this entire horizontal cavity, it looks really bad on some platforms to stretch the widget out to fill the window. Signed-off-by: Shawn O. Pearce <>
2008-02-14git-gui: Paper bag fix bad string length call in spellcheckerShawn O. Pearce
We don't want the list length, we need the string length. Found due to a bad " character discovered in the text and Tcl throwing 'unmatched open quote in list'. Signed-off-by: Shawn O. Pearce <>
2008-02-12git-gui: Automatically spell check commit messages as the user typesShawn O. Pearce
Many user friendly tools like word processors, email editors and web browsers allow users to spell check the message they are writing as they type it, making it easy to identify a common misspelling of a word and correct it on the fly. We now open a bi-directional pipe to Aspell and feed the message text the user is editing off to the program about once every 300 milliseconds. This is frequent enough that the user sees the results almost immediately, but is not so frequent as to cause significant additional load on the system. If the user has modified the message text during the last 300 milliseconds we delay until the next period, ensuring that we avoid flooding the Aspell process with a lot of text while the user is actively typing their message. We wait to send the current message buffer to Aspell until the user is at a word boundary, thus ensuring that we are not likely to ask for misspelled word detection on a word that the user is actively typing, as most words are misspelled when only partially typed, even if the user has thus far typed it correctly. Misspelled words are highlighted in red and are given an underline, causing the word to stand out from the others in the buffer. This is a very common user interface idiom for displaying misspelled words, but differs from one platform to the next in slight variations. For example the Mac OS X system prefers using a dashed red underline, leaving the word in the original text color. Unfortunately the control that Tk gives us over text display is not powerful enough to handle such formatting so we have to work with the least common denominator. The top suggestions for a misspelling are saved in an array and offered to the user when they right-click (or on the Mac ctrl-click) a misspelled word. Selecting an entry from this menu will replace the misspelling with the correction shown. Replacement is integrated with the undo/redo stack so undoing a replacement will restore the misspelled original text. If Aspell could not be started during git-gui launch we silently eat the error and run without spell checking support. This way users who do not have Aspell in their $PATH can continue to use git-gui, although they will not get the advanced spelling functionality. If Aspell started successfully the version line and language are shown in git-gui's about box, below the Tcl/Tk versions. This way the user can verify the Aspell function has been activated. If Aspell crashes while we are running we inform the user with an error dialog and then disable Aspell entirely for the rest of this git-gui session. This prevents us from fork-bombing the system with Aspell instances that always crash when presented with the current message text, should there be a bug in either Aspell or in git-gui's output to it. We escape all input lines with ^, as recommended by the Aspell manual page, as this allows Aspell to properly ignore any input line that is otherwise looking like a command (e.g. ! to enable terse output). By using this escape however we need to correct all word offsets by -1 as Aspell is apparently considering the ^ escape to be part of the line's character count, but our Tk text widget obviously does not. Available dictionaries are offered in the Options dialog, allowing the user to select the language they want to spellcheck commit messages with for the current repository, as well as the global user setting that all repositories inherit. Special thanks to Adam Flott for suggesting connecting git-gui to Aspell for the purpose of spell checking the commit message, and to Wincent Colaiuta for the idea to wait for a word boundary before passing the message over for checking. Signed-off-by: Shawn O. Pearce <>
2008-02-12Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: support Git under OS X 10.5
2008-02-12git-gui: support Git under OS X 10.5Jay Soffian
The Tk Framework moved its location in 10.5 compared to 10.4 Signed-off-by: Jay Soffian <> Tested-by: Seth Falcon <> Signed-off-by: Shawn O. Pearce <>
2008-02-04git-gui: Update German translation.Christian Stimming
Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-02-04git-gui: (i18n) Fix a bunch of still untranslated strings.Christian Stimming
Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-01-23git-gui: Correctly cleanup msgfmt '1 message untranslated' outputgitgui-0.9.2Shawn O. Pearce
In the multiple message case we remove the word "messages" from the statistics output of msgfmt as it looks cleaner on the tty when you are watching the build process. However we failed to strip the word "message" when only 1 message was found to be untranslated or fuzzy, as msgfmt does not produce the 's' suffix. Signed-off-by: Shawn O. Pearce <>
2008-01-23git-gui: Make the statistics of po2msg match those of msgfmtShawn O. Pearce
The strings we were showing from po2msg didn't exactly match those of msgfmt's --statistics output so we didn't show quite the same results when building git-gui's message files. Now we're closer to what msgfmt shows (at least for an en_US locale) so the make output matches. I noticed that the fuzzy translation count is off by one for the current po/zh_cn.po file. Not sure why and I'm not going to try and debug it at this time as the po2msg is strictly a fallback, users building from source really should prefer msgfmt. Signed-off-by: Shawn O. Pearce <>
2008-01-23git-gui: Fallback to Tcl based if msgfmt isn't availableShawn O. Pearce
If msgfmt fails with exit code 127 that typically means the program is not found in the user's PATH and thus cannot be executed by make. In such a case we can try to fallback to the Tcl based po2msg program that we distributed with git-gui, as it does a "good enough" job. We still don't default to however as it does not perform a lot of the sanity checks that msgfmt does, and quite a few of those are too useful to give up. Signed-off-by: Shawn O. Pearce <>
2008-01-23git-gui: Work around random missing scrollbar in revision listShawn O. Pearce
If the horizontal scrollbar isn't currently visible (because it has not been needed) but we get an update to the scroll port we may find the scrollbar window exists but the Tcl command doesn't. Apparently it is possible for Tk to have partially destroyed the scrollbar by removing the Tcl procedure name but still leaving the widget name in the window registry. Signed-off-by: Shawn O. Pearce <>
2008-01-21git-gui: Correct encoding of glossary/fr.po to UTF-8Shawn O. Pearce
Junio noticed this was incorrectly added in ISO-8859-1 but it should be in UTF-8 (as the headers claim UTF-8, and our convention is to use only UTF-8). Signed-off-by: Shawn O. Pearce <>
2008-01-21git-gui: Consolidate hook execution code into a single functionShawn O. Pearce
The code we use to test if a hook is executable or not differs on Cygwin from the normal POSIX case. Rather then repeating that for all three hooks we call in our commit code path we can place the common logic into a global procedure and invoke it when necessary. This also lets us get rid of the ugly "|& cat" we were using before as we can now rely on the Tcl 8.4 feature of "2>@1" or fallback to the "|& cat" when necessary. The post-commit hook is now run through the same API, but its outcome does not influence the commit status. As a result we now show any of the errors from the post-commit hook in a dialog window, instead of on the user's tty that was used to launch git-gui. This resolves a long standing bug related to not getting errors out of the post-commit hook when launched under git-gui. Signed-off-by: Shawn O. Pearce <>
2008-01-21git-gui: Correct window title for hook failure dialogsShawn O. Pearce
During i18n translation work this message was partially broken by using "append" instead of "strcat" to join the two different parts of the message together. Signed-off-by: Shawn O. Pearce <>
2008-01-21git-gui: Honor the standard commit-msg hookShawn O. Pearce
Under core Git the git-commit tool will invoke the commit-msg hook if it exists and is executable to the user running git-commit. As a hook it has some limited value as it cannot alter the commit, but it can modify the message the user is attempting to commit. It is also able to examine the message to ensure it conforms to some local standards/conventions. Since the hook takes the name of a temporary file holding the message as its only parameter we need to move the code that creates the temp file up earlier in our commit code path, and then pass through that file name to the latest stage (where we call git-commit-tree). We let the hook alter the file as it sees fit and we don't bother to look at its content again until the commit succeeded and we need the subject for the reflog update. Signed-off-by: Shawn O. Pearce <>
2008-01-18git-gui: Makefile - Handle $DESTDIR on CygwinMark Levedahl
gg_libdir is converted to an absolute Windows path on Cygwin, but a later step attempts to prefix $DESTDIR to install to a staging directory. Explicitly separate the uses of gg_libdir for these two purposes so installation to $DESTDIR will work. Signed-off-by: Mark Levedahl <> Signed-off-by: Shawn O. Pearce <>
2008-01-18git-gui: add french glossary: glossary/fr.poChristian Couder
Signed-off-by: Christian Couder <> Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Refresh file status description after hunk applicationShawn O. Pearce
If we apply a hunk in either direction this may change the file's status. For example if a file is completely unstaged, and has at least two hunks in it and the user stages one hunk the file will change from "Modified, not staged" to "Portions staged for commit". Resetting the file path causes our trace on this variable to fire; that trace is used to update the file header in the diff viewer to the file's current status. Noticed by Johannes Sixt. Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Allow 'Create New Repository' on existing directoriesShawn O. Pearce
Often users setup a few source files and get a project rolling before they create a Git repository for it. In such cases the core Git tools allow users to initialize a new repository by simply running `git init` at the desired root level directory. We need to allow the same situation in git-gui; if the user is trying to make a new repository we should let them do that to any location they chose. If the directory already exists and already has files contained within it we still should allow the user to create a repository there. However we still need to disallow creating a repository on top of an existing repository. Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Initial french translationChristian Couder
Here are some of the choices made to translate Git Gui to french: - commit -> "commit" (noun) or "commiter" (verb) - stage (index) -> "pré-commit" (noun) or "pré-commiter" (verb) - (re)scan -> "(re)synchroniser" - reset -> "réinitialiser" - checkout -> "emprunt" (noun) or "emprunter" (verb) - revision expression -> "expression de révison" I am not completely happy with these, but it's a start... [sp: Inserted a missing LF in message on line 466] Signed-off-by: Christian Couder <> Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Improve German translation.Christian Stimming
Change translation of "clone" back to "klonen" because "kopieren" is a much broader term than this particular git action. Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Updated Swedish translation after mailing list review.Peter Karlsson
Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Fix broken revert confirmation.Christian Stimming
I broke this extremely cool feature in 1ac17950, but it is rather easy to fix this. Sorry for that. Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Update German translationChristian Stimming
"revert" translated as "verwerfen". "hunk" translated as "Kontext". Several menu items reworded to be shorter. Signed-off-by: Christian Stimming <> Signed-off-by: Shawn O. Pearce <>
2008-01-16git-gui: Update glossary: add term "hunk"Christian Stimming
Signed-off-by: Shawn O. Pearce <>
2007-12-30git-gui: Make commit log messages end with a newlinegitgui-0.9.1Bernt Hansen
Concatenating commit log messages from multiple commits works better when all of the commits end with a clean line break. Its good to be strict in what you create, and lenient in what you accept, and since we're creating here, we should always try to Do The Right Thing(tm). Signed-off-by: Bernt Hansen <> Signed-off-by: Shawn O. Pearce <>
2007-12-30Added Swedish translation.Peter Karlsson
2007-12-14git-gui: Unconditionally use absolute paths with CygwinMark Levedahl
The mapping of Windows vs Cygwin/Posix paths is arbitrary and not knowable from the Posix side, so logic to determine whether to use relative paths to locate the git-gui library just does not work on Cygwin. Fix this to unconditionally use absolute path on Cygwin. (This fixes a regression from 1.5.4). Signed-off-by: Mark Levedahl <> Signed-off-by: Shawn O. Pearce <>
2007-12-14git-gui: Handle file mode changes (644->755) in diff viewerShawn O. Pearce
Johannes Sixt pointed out the diff headers "old mode ..." and "new mode ..." were not being parsed properly by git-gui. We now include them in the diff viewer for a file. Signed-off-by: Shawn O. Pearce <>
2007-12-14git-gui: Move frequently used commands to the top of the context menu.Johannes Sixt
"Stage/Unstage Hunk" is probably the most frequently used command of the patch context menu *and* it is not available in some other form than the context menu. Therefore, it should go to the top. "Less Context" and "More Context" entries are also not easily available otherwise, and are therefore, moved second. The other entries are available via key strokes (Copy, Paste, Refresh) or rarly used (Font Size, Options) and can go last. Signed-off-by: Johannes Sixt <> Signed-off-by: Shawn O. Pearce <>
2007-12-05Update Hungarian translation. 100% completed.Miklos Vajna
Signed-off-by: Miklos Vajna <> Signed-off-by: Shawn O. Pearce <>
2007-12-05Update ja.po for git-guiしらいしななこ
Signed-off-by: Shawn O. Pearce <>
2007-12-03git-gui: Improve the application icon on Windows.Johannes Sixt
Previusly, there was only a 16x16 image, which looked very distorted. Here we add a 32x32 version, and also make the image sharper. Signed-off-by: Johannes Sixt <> Signed-off-by: Shawn O. Pearce <>
2007-12-03git-gui: install-sh from automake does not like -m755Robert Schiele
The install-sh script as shipped with automake requires a space between the -m switch and its argument. Since this is also the regular way of doing it with other install implementations this change inserts the missing space. Signed-off-by: Robert Schiele <> Signed-off-by: Shawn O. Pearce <>
2007-12-03git-gui: Reorder msgfmt command-line argumentsbrian m. carlson
Any program using getopt or getopt_long will stop processing options once a non-option argument has been encountered, if POSIXLY_CORRECT is set. Therefore, reorder the command-line arguments to put options first, so that the msgfmt call works in this scenario. Signed-off-by: brian m. carlson <> Signed-off-by: Shawn O. Pearce <>
2007-11-27Update German translation. 100% completed.Christian Stimming
Signed-off-by: Shawn O. Pearce <>
2007-11-27Update git-gui.pot with latest (few) string additions and changes.Christian Stimming
Signed-off-by: Shawn O. Pearce <>
2007-11-22git-gui: update it.po and glossary/it.poMichele Ballabio
Updates and fixes: * current -> attuale * failed -> impossibile/non riuscito * corrupt -> danneggiato Signed-off-by: Michele Ballabio <> Signed-off-by: Shawn O. Pearce <>