user/sven/git.git, branch gitgui-0.9.2

git-gui: Correctly cleanup msgfmt '1 message untranslated' output

2008-01-23T04:56:15Z

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

git-gui: Make the statistics of po2msg match those of msgfmt

2008-01-23T04:52:07Z

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

git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available

2008-01-23T04:44:36Z

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 po2msg.sh 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

git-gui: Work around random missing scrollbar in revision list

2008-01-23T04:37:15Z

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

git-gui: Correct encoding of glossary/fr.po to UTF-8

2008-01-21T04:03:23Z

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

git-gui: Consolidate hook execution code into a single function

2008-01-21T03:45:38Z

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

git-gui: Correct window title for hook failure dialogs

2008-01-21T03:45:37Z

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

git-gui: Honor the standard commit-msg hook

2008-01-21T03:45:37Z

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

git-gui: Makefile - Handle $DESTDIR on Cygwin

2008-01-18T03:58:24Z

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

git-gui: add french glossary: glossary/fr.po

2008-01-18T02:35:01Z

Signed-off-by: Christian Couder Signed-off-by: Shawn O. Pearce