path: root/lib
AgeCommit message (Collapse)Author
2008-03-15git-gui: Don't translate the special Apple menuShawn O. Pearce
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 <>
2008-03-08git-gui: Add option for changing the width of the commit message text boxAdam Piątyszek
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 <> Signed-off-by: Shawn O. Pearce <>
2008-03-06git-gui: if a background colour is set, set foreground colour as wellPhilipp A. Hartmann
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 <> Signed-off-by: Shawn O. Pearce <>
2008-02-28Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: Paper bag fix info dialog when no files are staged at commit
2008-02-28git-gui: Paper bag fix info dialog when no files are staged at commitgitgui-0.9.3Shawn O. Pearce
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 <>
2008-02-22Merge branch 'maint'Shawn O. Pearce
* 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
2008-02-22git-gui: Focus insertion point at end of strings in repository chooserShawn O. Pearce
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 <>
2008-02-22git-gui: Paper bag fix error dialogs opening over the main windowShawn O. Pearce
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 <>
2008-02-22git-gui: fix typo in lib/spellcheck.tclMichele Ballabio
Signed-off-by: Michele Ballabio <> Signed-off-by: Shawn O. Pearce <>
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-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-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: 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: 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-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: 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 <>
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-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-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-11-22git-gui: fix a typo in lib/commit.tclMichele Ballabio
Signed-off-by: Michele Ballabio <> Signed-off-by: Shawn O. Pearce <>
2007-10-23Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: Make sure we get errors from git-update-index Conflicts: lib/index.tcl
2007-10-23git-gui: Make sure we get errors from git-update-indexShawn O. Pearce
I'm seeing a lot of silent failures from git-update-index on Windows and this is leaving the index.lock file intact, which means users are later unable to perform additional operations. When the index is locked behind our back and we are unable to use it we may need to allow the user to delete the index lock and try again. However our UI state is probably not currect as we have assumed that some changes were applied but none of them actually did. A rescan is the easiest (in code anyway) solution to correct our UI to show what the index really has (or doesn't have). Signed-off-by: Shawn O. Pearce <>
2007-10-21Merge branch 'maint'Shawn O. Pearce
* maint: git-gui: Don't display CR within console windows git-gui: Handle progress bars from newer gits git-gui: Correctly report failures from git-write-tree Conflicts: lib/commit.tcl lib/console.tcl
2007-10-21git-gui: Don't display CR within console windowsgitgui-0.8.4Shawn O. Pearce
Git progress bars from tools like git-push and git-fetch use CR to skip back to the start of the current line and redraw it with an updated progress. We were doing this in our Tk widget but had failed to skip the CR, which Tk doesn't draw well. Signed-off-by: Shawn O. Pearce <>
2007-10-21git-gui: Handle progress bars from newer gitsShawn O. Pearce
Post Git 1.5.3 a new style progress bar has been introduced that uses only one line rather than two. The formatting of the completed and total section is also slightly different so we must adjust our regexp to match. Unfortunately both styles are in active use by different versions of Git so we need to look for both. Signed-off-by: Shawn O. Pearce <>
2007-10-20git-gui: Correctly report failures from git-write-treeShawn O. Pearce
If git-write-tree fails (such as if the index file is currently locked and it wants to write to it) we were not getting the error message as $tree_id was always the empty string so we shortcut through the catch and never got the output from stderr. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Collapse $env(HOME) to ~/ in recent repositories on WindowsShawn O. Pearce
Apparently native Tcl/Tk on Windows is using \ as the return value from [file separator] but [file normalize] on that same system is using / rather than \ to represent a directory separator. I really think that is nuts, but its what is happening. So we can actually just hardcode our separator to / as all systems we support (Windows, Mac OS X, UNIX) use /. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Support cloning Cygwin based work-dirsShawn O. Pearce
If the user tries to clone a Git repository that is actually a workdir of another repository (by way of contrib git-new-workdir) then the contents of .git is a series of Windows .lnk files which Tcl can't read if this is a native Tcl process. To read the real objects directory we need to resolve the link to that location. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Use proper Windows shortcuts instead of bat filesShawn O. Pearce
On Windows its better to use a shortcut (.lnk file) over a batch script (.bat) as we can specify the icon file for the .lnk and thus have these git specific objects appear on the desktop with that git specific icon file. Unfortunately the authors of Tcl did not bless us with the APIs needed to create shortcuts from within Tcl. But Microsoft did give us Windows Scripting Host which allows us to execute some JavaScript that calls some sort of COM object that can operate on a .lnk file. We now build both Cygwin and non-Cygwin "desktop icons" as proper Windows .lnk files, using the "Start in" property of these files to indicate the working directory of the repository the user wants to launch. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Bind n/c/o accelerators in repository chooserShawn O. Pearce
On Windows we need to actually setup binds for the accelerator keys, otherwise the OS doesn't respond to them when the user presses the key combinations. Apparently we automatically get these on Mac OS X when we configure the menu commands, but not on Windows. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Disable the text widget in the repository chooserShawn O. Pearce
Although we are using a text widget here we really do not want the end-user to be able to modify the text it displays. So we need to disable it. Signed-off-by: Shawn O. Pearce <>
2007-10-13git-gui: Fix bind errors when switching repository chooser panelsShawn O. Pearce
We need to remove any variable traces we may have installed when the panel is destroyed as the trace may attempt to use a widget that no longer exists on this panel. Signed-off-by: Shawn O. Pearce <>
2007-10-12git-gui: Offer repository management features in menu barShawn O. Pearce
When we show the repository chooser as the primary toplevel (".") we now offer the major choices not just on the window as hyperlinks but they also now are shown in the Repository menu, including the recent repository list. Signed-off-by: Shawn O. Pearce <>
2007-10-12git-gui: Change repository browser radio buttons to hyperlinksShawn O. Pearce
Making a user click twice to select which action they want to perform when starting git-gui is just wasting their time. Clicking once on a radio button and then clicking again on the "Next >" button is quite unnecessary. Since the recent repository list is shown as a list of hyperlinks we now offer the 3 basic startup actions as hyperlinks. Clicking on a link will immediately jump to the next UI panel, saving the user time as they don't need to click an additional button. Signed-off-by: Shawn O. Pearce <>
2007-10-12git-gui: offer a list of recent repositories on startupSteffen Prohaska
If git-gui is started outside a work tree the repository chooser will offer a list of recently opened repositories. Clicking on any list entry directly opens the repository. The list of recently opened repositories is stored in the config as the multi-valued option gui.recentrepo. If the list grows beyond 10 entries it will be truncated by removing one of the older entries. Only repositories that are opened through the repository chooser will get added to the recent list. Repositories opened from the shell will not yet be added to the recent list, as users are likely to have a way to easily return to the same directory via their shell. [sp: This is actually a combined work from both Steffen and myself. Most of the ideas are Steffen's, as is the basic outline of the code, but any outstanding bugs are entirely my fault.] Signed-off-by: Steffen Prohaska <> Signed-off-by: Shawn O. Pearce <>
2007-10-10git-gui: Bind Cmd-, to Preferences on Mac OS XShawn O. Pearce
A Mac OS X UI convention is to have Cmd-, be the accelerator key for the preferences window, which by convention is located in the apple menu under a separator below the about command. We also now call this "Preferences..." as that is the conventional term used in English. Signed-off-by: Shawn O. Pearce <>
2007-10-10git-gui: Consolidate the Fetch and Push menus into a Remote menuShawn O. Pearce
Sometimes the Fetch menu looks really odd, such as if you are in a repository that has no remotes configured when you start git-gui. Here we didn't have any items to add to the Fetch menu so it was a tad confusing for the end-user to see an empty menu on the menu bar. We now place all of the commands related to fetching and pushing of changes into a single "Remote" menu. This way we have a better class of bucket that we can drop additional remote related items into such as doing a remote merge or editing the remote configuration specs. The shortcuts to execute fetch/remote prune/push on existing remote specifications are now actually submenus listing the remotes by name. Signed-off-by: Shawn O. Pearce <>