| 95dcfa3 | Twiinz | 19 May 2008, 04:01:58 UTC | git-gui: Vertically align textboxes with labels In git-gui after clicking either on 'Create New Repository' or 'Open Existing Repository' the form elements aren't centered like they are pretty much everywhere else in the app. At least when ran on a mac, haven't checked on other platforms. Using grid instead of pack seems to fix this. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 May 2008, 01:05:20 UTC |
| 7f83aa2 | Shawn O. Pearce | 21 May 2008, 20:40:10 UTC | git-gui: Handle workdir detection when CYGWIN=nowinsymlinks If the user has put nowinsymlinks into their CYGWIN environment variable any symlinks created by a Cygwin process (e.g. ln -s) will not have the ".lnk" suffix. In this case workdir is still a workdir, but our detection of looking for "info.lnk" fails as the symlink is actually a normal file called "info". Instead we just always use Cygwin's test executable to see if info/exclude is a file. If it is, we assume from there on it can be read by git-ls-files --others and is thus safe to use on the command line. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 May 2008, 12:34:00 UTC |
| 16dd62a | Shawn O. Pearce | 18 May 2008, 17:08:17 UTC | git-gui: Add a --trace command line option Often new Git users want to know what commands git-gui uses to make changes, so they can learn the command line interface by mimicking what git-gui does in response to GUI actions. Showing the direct commands being executed is easy enough to implement but this is of little value to end-users because git-gui frequently directly calls plumbing, not porcelain. Since the code is already written and tested, its fairly harmless to include. It may not help a new end-user, but it can help with debugging git-gui or reverse-engineering its logic to further make changes to it or implement another GUI for Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 May 2008, 19:44:46 UTC |
| 76bb40c | Shawn O. Pearce | 09 May 2008, 00:29:42 UTC | git-gui: Delete branches with 'git branch -D' to clear config If we are deleting a local branch from refs/heads/ we need to make sure any associated configuration stored in .git/config is also removed (such as branch.$name.remote and branch.$name.merge). The easiest way to do this is to use git-branch as that automatically will look for and delete configuration keys as necessary. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 May 2008, 00:29:42 UTC |
| fe70225 | Shawn O. Pearce | 09 May 2008, 00:16:43 UTC | git-gui: Setup branch.remote,merge for shorthand git-pull When creating new branches if branch.autosetupmerge is not set, or is set to true or always and we have been given a remote tracking branch as the starting point for a new branch we want to create the necessary configuration options in .git/config for the new branch so that a no argument git-pull on the command line pulls from the remote repository's branch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 May 2008, 00:20:27 UTC |
| 259cd0f | Christian Stimming | 01 May 2008, 09:51:47 UTC | git-gui: Update German translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 May 2008, 22:13:14 UTC |
| ca19404 | Shawn O. Pearce | 24 April 2008, 01:38:30 UTC | Merge branch 'maint' * maint: git-gui: Don't use '$$cr master' with aspell earlier than 0.60 | 24 April 2008, 01:38:30 UTC |
| ddc3603 | Shawn O. Pearce | 24 April 2008, 01:34:58 UTC | git-gui: Don't use '$$cr master' with aspell earlier than 0.60 Apparently aspell 0.50 does not recognize "$$cr master" as a command, but instead tries to offer suggestions for how to correctly spell the word "cr". This is not quite what we are after when we want the name of the current dictionary. Instead of locking up git-gui waiting for a response that may never come back from aspell we avoid sending this command if the binary we have started claims to be before version 0.60. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 April 2008, 01:34:58 UTC |
| dd70f3d | Johannes Sixt | 14 April 2008, 08:51:33 UTC | git-gui: Report less precise object estimates for database compression On startup, git-gui warns if there are many loose objects. It does so by saying, e.g., that there are "approximately 768 loose objects". But isn't "768" a very accurate number? Lets say "750", which (while still being a very precise number) sounds much more like an estimation. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 April 2008, 23:34:23 UTC |
| 729ffa5 | Michele Ballabio | 04 April 2008, 21:04:42 UTC | git-gui: use +/- instead of ]/[ to show more/less context in diff On some systems, brackets cannot be used as event details (they don't have a keysym), so use +/- instead (both on keyboard and keypad) and add ctrl-= as a synonym of ctrl-+ for convenience. [sp: Had to change accelerator to show only "$M1T-="; the original version included "$M1T-+ $M1T-=" but this is not drawn at all on Mac OS X.] Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2008, 04:03:19 UTC |
| ccb3b53 | Christian Couder | 05 April 2008, 02:20:23 UTC | git-gui: Update french translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2008, 03:53:50 UTC |
| 54906ad | Shawn O. Pearce | 03 April 2008, 22:06:29 UTC | git-gui: Switch keybindings for [ and ] to bracketleft and bracketright Thanks to Michele Ballabio for the quick fix. This resolves the error introduced by c91ee2bd61. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 04 April 2008, 01:38:12 UTC |
| 3d654be | Shawn O. Pearce | 02 April 2008, 06:17:11 UTC | git-gui 0.10 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 06:17:11 UTC |
| c91ee2b | Jonathan del Strother | 01 April 2008, 10:54:03 UTC | git-gui: Add shortcut keys for Show More/Less Context Bound to Ctrl/Cmd + left & right square brackets, depending on your platform. [sp: Added missing binds for . to allow shortcuts to work when not focused in the commit message area.] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 05:33:32 UTC |
| 739a6d4 | Junio C Hamano | 15 March 2008, 07:43:34 UTC | git-gui: Improve directions regarding POT update in po/README Keeping POT up to date relative to the software is absolutely necessary. What is unwarranted is updating language files at the same time by running msgmerge without checking if there is any outstanding translation work first. If we assume that the translators do not have access to msgmerge, that is a good service to them (the less they have to do, the better), but otherwise, it is better to be leave po/${language}.po files alone. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 March 2008, 06:06:12 UTC |
| 477ef32 | しらいしななこ | 15 March 2008, 11:12:00 UTC | git-gui: Update Japanese translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 March 2008, 03:57:28 UTC |
| 02a8b27 | Shawn O. Pearce | 15 March 2008, 06:22:41 UTC | git-gui: Adjusted Japanese translation to updated POT Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 06:23:06 UTC |
| 45e53d1 | しらいしななこ | 14 March 2008, 13:03:21 UTC | git-gui: Update Japanese translation I updated Japanese translation for the latest git-gui. Signed-off-by: しらいしななこ <nanako3@bluebottle.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 06:22:08 UTC |
| 442b3ca | Shawn O. Pearce | 15 March 2008, 05:11:08 UTC | git-gui: Don't translate the special Apple menu Peter Karlsson pointed out there is no value in translating the string "Apple", as this is used as the dummy label for the Apple menu on Mac OS X systems. The Apple menu is actually not the menu with the Apple corporate logo, but the menu next to it, which shows the name of the application and is typically called the application menu. Most users of git-gui see this menu titled as "Git Gui". The actual label of this menu comes from our Info.plist file and cannot be specified by any other means. Translating this string in the Tcl PO files is not necessary. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 05:11:08 UTC |
| 427f486 | Miklos Vajna | 14 March 2008, 16:28:53 UTC | git-gui: Updated Hungarian translation (e5fba18) Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 05:02:25 UTC |
| b79f5ff | Alex Riesen | 14 March 2008, 22:25:57 UTC | git-gui: update russian translation Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 05:00:57 UTC |
| 4f99493 | Michele Ballabio | 14 March 2008, 20:59:52 UTC | git-gui: remove spurious "fuzzy" attributes in po/it.po Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 March 2008, 05:00:09 UTC |
| 9065c36 | Peter Karlsson | 14 March 2008, 06:36:44 UTC | git-gui: updated Swedish translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 March 2008, 06:36:44 UTC |
| 0212242 | Peter Karlsson | 14 March 2008, 06:36:18 UTC | git-gui: Regenerated po template and merged translations with it Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 March 2008, 06:36:18 UTC |
| 48ed49f | Miklos Vajna | 13 March 2008, 12:31:10 UTC | Update Hungarian translation. 100% completed. | 13 March 2008, 12:31:10 UTC |
| 0c87a95 | Michele Ballabio | 14 February 2008, 12:42:19 UTC | git-gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 March 2008, 05:23:22 UTC |
| 7276607 | Junio C Hamano | 12 March 2008, 05:29:52 UTC | git-gui: Simplify MSGFMT setting in Makefile To prepare msg files for Tcl scripts, the command that is set to MSGFMT make variable needs to be able to grok "--tcl -l <lang> -d <here>" options correctly. This patch simplifies the tests done in git-gui's Makefile to directly test this condition. If the test run does not exit properly with zero status (either because you do not have "msgfmt" itself, or your "msgfmt" is too old to grok --tcl option --- the reason does not matter), have it fall back to po/po2msg.sh Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2008, 05:48:32 UTC |
| 11027d5 | Adam Piątyszek | 06 March 2008, 19:38:40 UTC | git-gui: Add option for changing the width of the commit message text box The width of the commit message text area is currently hard-coded to 75 characters. This value might be not optimal for some projects. For instance users who would like to generate GNU-style ChangeLog file from git commit message might prefer commit messages of width no longer than 70 characters. This patch adds a global and per repository option "Commit Message Text Width", which could be used to change the width of the commit message text area. Signed-off-by: Adam Piątyszek <ediap@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 March 2008, 01:59:35 UTC |
| c382fdd | Philipp A. Hartmann | 05 March 2008, 16:54:22 UTC | git-gui: if a background colour is set, set foreground colour as well In several places, only the background colour is set to an explicit value, sometimes even "white". This does not work well with dark colour themes. This patch tries to set the foreground colour to "black" in those situations, where an explicit background colour is set without defining any foreground colour. Signed-off-by: Philipp A. Hartmann <ph@sorgh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 March 2008, 04:47:11 UTC |
| 312fd92 | eric miao | 06 January 2008, 09:47:05 UTC | git-gui: translate the remaining messages in zh_cn.po to chinese 'make' shows: MSGFMT po/zh_cn.msg 368 translated, 2 fuzzy, 1 untranslated message. 1. update the zh_cn.po and translate the remaining messages in chinese 2. correct some of the previously mis-translated messages 3. add a list of word interpretation in the head as a guideline for subsequent updatings and translations Signed-off-by: eric miao <eric.miao@marvell.com> Acked-by: Xudong Guan <xudong.guan@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 March 2008, 04:45:19 UTC |
| f15b758 | Shawn O. Pearce | 05 March 2008, 07:13:37 UTC | Merge branch 'maint' * maint: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails | 05 March 2008, 07:13:37 UTC |
| 2162306 | Shawn O. Pearce | 28 February 2008, 00:29:34 UTC | git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails Mac OS X Tiger may have a msgfmt available but it doesn't understand how to implement --tcl. Falling back to po2msg.sh on such systems is a reasonable behavior. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 March 2008, 07:13:16 UTC |
| f49b6c1 | Shawn O. Pearce | 28 February 2008, 06:29:19 UTC | Merge branch 'maint' * maint: git-gui: Paper bag fix info dialog when no files are staged at commit | 28 February 2008, 06:29:19 UTC |
| 094fbbf | Shawn O. Pearce | 28 February 2008, 06:28:45 UTC | git-gui: Paper bag fix info dialog when no files are staged at commit If the user tries to commit their changes without actually staging anything we used to display an informational dialog suggesting they first stage those changes, then retry the commit feature. Unfortunately I broke this in aba15f7 ("Ensure error dialogs always appear over all other windows") and failed to fix it in the paper bag fix that came one day after it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 February 2008, 06:28:45 UTC |
| b5e2f80 | Shawn O. Pearce | 22 February 2008, 06:40:25 UTC | Merge branch 'maint' * maint: git-gui: Focus insertion point at end of strings in repository chooser git-gui: Avoid hardcoded Windows paths in Cygwin package files git-gui: Default TCL_PATH to same location as TCLTK_PATH git-gui: Paper bag fix error dialogs opening over the main window | 22 February 2008, 06:40:25 UTC |
| 3baee1f | Shawn O. Pearce | 11 February 2008, 05:53:52 UTC | git-gui: Focus insertion point at end of strings in repository chooser When selecting a local working directory for a new repository or a location to clone an existing repository into we now set the insert point at the end of the selected path, allowing the user to type in any additional parts of the path if they so desire. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:39:36 UTC |
| df4ec4c | Shawn O. Pearce | 22 February 2008, 00:27:46 UTC | git-gui: Avoid hardcoded Windows paths in Cygwin package files When we are being built by the Cygwin package maintainers we need to embed the POSIX path to our library files and not the Windows path. Embedding the Windows path means all end-users who install our Cygwin package would be required to install Cygwin at the same Windows path as the package maintainer had Cygwin installed to. This requirement is simply not user-friendly and may be infeasible for a large number of our users. We now try to auto-detect if the Tcl/Tk binary we will use at runtime is capable of translating POSIX paths into Windows paths the same way that cygpath does the translations. If the Tcl/Tk binary gives us the same results then it understands the Cygwin path translation process and should be able to read our library files from a POSIX path name. If it does not give us the same answer as cygpath then the Tcl/Tk binary might actually be a native Win32 build (one that is not linked against Cygwin) and thus requires the native Windows path to our library files. We can assume this is not a Cygwin package as the Cygwin maintainers do not currently ship a pure Win32 build of Tcl/Tk. Reported on the git mailing list by Jurko Gospodnetić. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:38:32 UTC |
| 651fbba | Shawn O. Pearce | 22 February 2008, 00:17:27 UTC | git-gui: Default TCL_PATH to same location as TCLTK_PATH Most users set TCLTK_PATH to tell git-gui where to find wish, but they fail to set TCL_PATH to the same Tcl installation. We use the non-GUI tclsh during builds so headless systems are still able to create an index file and create message files without GNU msgfmt. So it matters to us that we find a working TCL_PATH at build time. If TCL_PATH hasn't been set yet we can take a better guess about what tclsh executable to use by replacing 'wish' in the executable path with 'tclsh'. We only do this replacement on the filename part of the path, just in case the string "wish" appears in the directory paths. Most of the time the tclsh will be installed alongside wish so this replacement is a sensible and safe default. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:44 UTC |
| 85ec3e7 | Shawn O. Pearce | 21 February 2008, 17:22:08 UTC | git-gui: Paper bag fix error dialogs opening over the main window If the main window is the only toplevel we have open then we don't have a valid grab right now, so we need to assume the best toplevel to use for the parent is ".". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:23 UTC |
| afdb4be | Michele Ballabio | 21 February 2008, 14:38:56 UTC | git-gui: fix typo in lib/spellcheck.tcl Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:33:07 UTC |
| bb760f0 | Shawn O. Pearce | 21 February 2008, 05:20:50 UTC | git-gui: Shorten Aspell version strings to just Aspell version number 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 <spearce@spearce.org> | 21 February 2008, 05:22:07 UTC |
| 827743b | Shawn O. Pearce | 21 February 2008, 05:17:18 UTC | git-gui: Gracefully display non-aspell version errors to users 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 <spearce@spearce.org> | 21 February 2008, 05:22:07 UTC |
| de83f8c | Shawn O. Pearce | 21 February 2008, 03:34:11 UTC | 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> | 21 February 2008, 05:22:06 UTC |
| 35d04b3 | Shawn O. Pearce | 21 February 2008, 02:55:43 UTC | git-gui: Only bind the spellcheck popup suggestion hook once 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 <spearce@spearce.org> | 21 February 2008, 05:22:06 UTC |
| dd09628 | Shawn O. Pearce | 21 February 2008, 02:52:54 UTC | git-gui: Remove explicit references to 'aspell' in message strings 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 <spearce@spearce.org> | 21 February 2008, 05:22:06 UTC |
| f57ca1e | Shawn O. Pearce | 21 February 2008, 02:48:21 UTC | git-gui: Ensure all spellchecker 'class' variables are initialized 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 <spearce@spearce.org> | 21 February 2008, 05:22:06 UTC |
| f4d9348 | Shawn O. Pearce | 21 February 2008, 05:21:54 UTC | Merge branch 'maint' * maint: git-gui: Ensure error dialogs always appear over all other windows | 21 February 2008, 05:21:54 UTC |
| aba15f7 | Shawn O. Pearce | 21 February 2008, 04:37:07 UTC | git-gui: Ensure error dialogs always appear over all other windows 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 <spearce@spearce.org> | 21 February 2008, 04:39:32 UTC |
| cec8f51 | Shawn O. Pearce | 20 February 2008, 05:40:13 UTC | Merge branch 'maint' * maint: git-gui: relax "dirty" version detection | 20 February 2008, 05:40:13 UTC |
| 2c2a378 | Wincent Colaiuta | 18 February 2008, 08:36:33 UTC | git-gui: relax "dirty" version detection "git gui" would complain at launch if the local version of Git was "1.5.4.2.dirty". Loosen the regular expression to look for either "-dirty" or ".dirty", thus eliminating spurious warnings. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 February 2008, 01:50:29 UTC |
| c548f86 | Christian Stimming | 16 February 2008, 20:53:23 UTC | git-gui: Update German translation. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 February 2008, 07:23:48 UTC |
| b8331e1 | Christian Stimming | 16 February 2008, 20:56:22 UTC | git-gui: (i18n) Add newly added translation strings to template. And markup one missing string for translation. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 February 2008, 07:22:07 UTC |
| 740b9b9 | Shawn O. Pearce | 14 February 2008, 06:07:39 UTC | git-gui: Correct size of dictionary name widget in options dialog 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 <spearce@spearce.org> | 14 February 2008, 06:07:39 UTC |
| 765239e | Shawn O. Pearce | 14 February 2008, 06:05:04 UTC | git-gui: Paper bag fix bad string length call in spellchecker 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 <spearce@spearce.org> | 14 February 2008, 06:05:04 UTC |
| 95b002e | Shawn O. Pearce | 07 February 2008, 07:35:25 UTC | git-gui: Automatically spell check commit messages as the user types 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 <spearce@spearce.org> | 12 February 2008, 07:35:18 UTC |
| 88965d1 | Shawn O. Pearce | 12 February 2008, 07:35:03 UTC | Merge branch 'maint' * maint: git-gui: support Git Gui.app under OS X 10.5 | 12 February 2008, 07:35:03 UTC |
| 20a87ec | Jay Soffian | 12 February 2008, 02:33:52 UTC | git-gui: support Git Gui.app under OS X 10.5 The Tk Framework moved its location in 10.5 compared to 10.4 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Tested-by: Seth Falcon <seth@userprimary.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2008, 07:34:45 UTC |
| 5f09a37 | Christian Stimming | 02 February 2008, 09:18:27 UTC | git-gui: Update German translation. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 04 February 2008, 02:27:20 UTC |
| 5e6d776 | Christian Stimming | 02 February 2008, 09:20:17 UTC | git-gui: (i18n) Fix a bunch of still untranslated strings. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 04 February 2008, 02:25:29 UTC |
| 3b8f19a | Shawn O. Pearce | 23 January 2008, 04:56:15 UTC | git-gui: Correctly cleanup msgfmt '1 message untranslated' output 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 <spearce@spearce.org> | 23 January 2008, 04:56:15 UTC |
| 2cd9ad2 | Shawn O. Pearce | 23 January 2008, 04:52:07 UTC | git-gui: Make the statistics of po2msg match those of msgfmt 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 <spearce@spearce.org> | 23 January 2008, 04:52:07 UTC |
| 3470ada | Shawn O. Pearce | 23 January 2008, 04:44:36 UTC | git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available 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 <spearce@spearce.org> | 23 January 2008, 04:44:36 UTC |
| 3ddff72 | Shawn O. Pearce | 22 January 2008, 15:40:13 UTC | git-gui: Work around random missing scrollbar in revision list 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 <spearce@spearce.org> | 23 January 2008, 04:37:15 UTC |
| 6caaf2d | Shawn O. Pearce | 21 January 2008, 04:03:23 UTC | git-gui: Correct encoding of glossary/fr.po to UTF-8 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 <spearce@spearce.org> | 21 January 2008, 04:03:23 UTC |
| ed76cb7 | Shawn O. Pearce | 20 January 2008, 19:46:59 UTC | git-gui: Consolidate hook execution code into a single function 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 <spearce@spearce.org> | 21 January 2008, 03:45:38 UTC |
| c87238e | Shawn O. Pearce | 20 January 2008, 19:43:38 UTC | git-gui: Correct window title for hook failure dialogs 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 <spearce@spearce.org> | 21 January 2008, 03:45:37 UTC |
| fb0ca47 | Shawn O. Pearce | 20 January 2008, 19:11:52 UTC | git-gui: Honor the standard commit-msg hook 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 <spearce@spearce.org> | 21 January 2008, 03:45:37 UTC |
| a028557 | Mark Levedahl | 18 January 2008, 03:50:23 UTC | git-gui: Makefile - Handle $DESTDIR on Cygwin 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 <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 January 2008, 03:58:24 UTC |
| a1f8f50 | Christian Couder | 16 January 2008, 07:19:34 UTC | git-gui: add french glossary: glossary/fr.po Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 January 2008, 02:35:01 UTC |
| a41e45e | Shawn O. Pearce | 16 January 2008, 06:29:39 UTC | git-gui: Refresh file status description after hunk application 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 <spearce@spearce.org> | 16 January 2008, 06:29:39 UTC |
| d36a8f7 | Shawn O. Pearce | 16 January 2008, 06:14:42 UTC | git-gui: Allow 'Create New Repository' on existing directories 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 <spearce@spearce.org> | 16 January 2008, 06:14:42 UTC |
| daaa958 | Christian Couder | 16 January 2008, 05:51:40 UTC | git-gui: Initial french translation 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 <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 06:01:19 UTC |
| d71b565 | Christian Stimming | 15 January 2008, 19:41:39 UTC | git-gui: Improve German translation. 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 <spearce@spearce.org> | 16 January 2008, 05:50:20 UTC |
| 10899a8 | Peter Karlsson | 12 January 2008, 08:28:57 UTC | git-gui: Updated Swedish translation after mailing list review. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:50:10 UTC |
| d454460 | Christian Stimming | 08 January 2008, 20:21:15 UTC | git-gui: Fix broken revert confirmation. I broke this extremely cool feature in 1ac17950, but it is rather easy to fix this. Sorry for that. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:44:14 UTC |
| 898ff9e | Christian Stimming | 07 January 2008, 21:00:25 UTC | git-gui: Update German translation "revert" translated as "verwerfen". "hunk" translated as "Kontext". Several menu items reworded to be shorter. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:42:41 UTC |
| b3125ad | Christian Stimming | 07 January 2008, 20:48:55 UTC | git-gui: Update glossary: add term "hunk" Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:42:37 UTC |
| a6d5888 | Bernt Hansen | 28 December 2007, 02:15:56 UTC | git-gui: Make commit log messages end with a newline 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 <bernt@alumni.uwaterloo.ca> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 December 2007, 02:03:55 UTC |
| f0e8692 | Peter Karlsson | 27 December 2007, 12:34:31 UTC | Added Swedish translation. | 30 December 2007, 02:00:14 UTC |
| 9fe9811 | Mark Levedahl | 13 December 2007, 14:02:26 UTC | git-gui: Unconditionally use absolute paths with Cygwin 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 <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 December 2007, 06:51:37 UTC |
| a4750dd | Shawn O. Pearce | 14 December 2007, 06:51:22 UTC | git-gui: Handle file mode changes (644->755) in diff viewer 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 <spearce@spearce.org> | 14 December 2007, 06:51:22 UTC |
| fba6072 | Johannes Sixt | 13 December 2007, 14:39:21 UTC | git-gui: Move frequently used commands to the top of the context menu. "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 <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 December 2007, 06:30:20 UTC |
| cfb5e10 | Miklos Vajna | 04 December 2007, 00:28:42 UTC | Update Hungarian translation. 100% completed. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2007, 23:55:25 UTC |
| e360beb | しらいしななこ | 05 December 2007, 09:24:26 UTC | Update ja.po for git-gui Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2007, 23:54:10 UTC |
| cbd9ac9 | Johannes Sixt | 27 November 2007, 15:25:24 UTC | git-gui: Improve the application icon on Windows. 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 <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 04:05:10 UTC |
| 74521ee | Robert Schiele | 01 December 2007, 17:05:40 UTC | git-gui: install-sh from automake does not like -m755 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 <rschiele@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 04:04:02 UTC |
| 5405110 | brian m. carlson | 03 December 2007, 01:26:33 UTC | git-gui: Reorder msgfmt command-line arguments 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 <sandals@crustytoothpaste.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 03:49:36 UTC |
| 6f4ec3a | Christian Stimming | 24 November 2007, 09:56:42 UTC | Update German translation. 100% completed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 November 2007, 02:09:52 UTC |
| aa7db34 | Christian Stimming | 24 November 2007, 09:56:32 UTC | Update git-gui.pot with latest (few) string additions and changes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 November 2007, 02:09:47 UTC |
| b53a191 | Michele Ballabio | 22 November 2007, 10:46:21 UTC | git-gui: update it.po and glossary/it.po Updates and fixes: * current -> attuale * failed -> impossibile/non riuscito * corrupt -> danneggiato Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 November 2007, 21:04:10 UTC |
| 208320d | Michele Ballabio | 22 November 2007, 15:20:08 UTC | git-gui: fix a typo in lib/commit.tcl Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 November 2007, 21:02:09 UTC |
| 41188dd | Shawn O. Pearce | 21 November 2007, 07:10:03 UTC | git-gui 0.9.0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 November 2007, 07:10:03 UTC |
| cd16a6c | Shawn O. Pearce | 08 November 2007, 07:22:21 UTC | git-gui: Bind Meta-T for "Stage To Commit" menu action Aaron Digulla suggested we bind Ctrl-T or Cmd-T to "Stage To Commit" menu action so it can be easily accessed from the keyboard. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 November 2007, 07:22:21 UTC |
| 48b8d2b | Shawn O. Pearce | 01 November 2007, 04:31:36 UTC | git-gui: Allow users to set font weights to bold Previously we allowed users to tweak their font weight to be bold by setting it manually in their ~/.gitconfig prior to starting git-gui. This was broken in ae0754ac9a24afa2693246222fc078fe9c133b3a when Simon set the font weight to normal by default, overridding whatever we found from the ~/.gitconfig file. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:31:36 UTC |
| 6ea1079 | Junio C Hamano | 01 November 2007, 04:14:01 UTC | git-gui: Update Japanese strings (part 2) Resolve an earlier suggestion from Christian. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:17:25 UTC |
| 76d536b | しらいしななこ | 31 October 2007, 14:12:12 UTC | git-gui: Update Japanese strings This updates the Japanese translation file. Signed-off-by: しらいしななこ <nanako3@bluebottle.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:06:43 UTC |
| efb8486 | Alex Riesen | 31 October 2007, 21:16:17 UTC | Updated russian translation of git-gui Fixed some spelling mistakes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:05:06 UTC |
| 95a8b67 | Johannes Schindelin | 30 October 2007, 11:25:31 UTC | po2msg: actually output statistics The "--statistics" option was ignored so far; no longer. Now we have a message similar to that of msgfmt. (Untranslated, though ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:03:24 UTC |
| 9a25ae8 | Johannes Schindelin | 30 October 2007, 11:24:53 UTC | po2msg: ignore untranslated messages Do not generate translations when the translated message is empty. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:00:31 UTC |
| f94872d | Johannes Schindelin | 30 October 2007, 11:24:37 UTC | po2msg: ignore entries marked with "fuzzy" As Christian Stimming pointed out, entries which are "fuzzy" need to be checked by human translators, and cannot be used. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:00:30 UTC |
