git/lib/index.tcl, branch gitgui-0.13.0

git-gui: use themed tk widgets with Tk 8.5

2010-01-28T01:13:52Z

This patch enables the use of themed Tk widgets with Tk 8.5 and above. These make a significant difference on Windows in making the application appear native. On Windows and MacOSX ttk defaults to the native look as much as possible. On X11 the user may select a theme using the TkTheme XRDB resource class by adding an line to the .Xresources file. The set of installed theme names is available using the Tk command 'ttk::themes'. The default on X11 is similar to the current un-themed style - a kind of thin bordered motif look. A new git config variable 'gui.usettk' may be set to disable this if the user prefers the classic Tk look. Using Tk 8.4 will also avoid the use of themed widgets as these are only available since 8.5. Some support is included for Tk 8.6 features (themed spinbox and native font chooser for MacOSX and Windows). Signed-off-by: Pat Thoyts Signed-off-by: Shawn O. Pearce

git-gui: handle really long error messages in updateindex.

2010-01-23T22:22:28Z

As reported to msysGit (bug #340) it is possible to get some very long error messages when updating the index. The use of a label to display this prevents scrolling the output. This patch replaces the label with a scrollable text widget configured to look like a label. Signed-off-by: Pat Thoyts Signed-off-by: Shawn O. Pearce

git-gui: Make Ctrl-T safe to use for conflicting files.

2008-09-30T18:47:33Z

A previous patch added a check for conflict markers, which is done when the file is about to be staged due to a click on the icon. However, pressing Ctrl-T still immediately stages the file without confirmation. This patch fixes it. The check requires a loaded diff, so staging multiple files at once won't work if they are unmerged. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Support conflict states _U & UT.

2008-09-05T04:28:55Z

Support _U (local deleted, remote modified) and UT (file type changed in conflict) modes. Note that 'file type changed' does not refer to changes in the executable bit, instead it denotes replacing a file with a link, or vice versa. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Mark forgotten strings for translation.

2008-09-05T04:28:48Z

Signed-off-by: Shawn O. Pearce

git-gui: Teach git gui about file type changes

2008-08-25T04:36:17Z

Signed-off-by: Gustaf Hendeby Signed-off-by: Shawn O. Pearce

git-gui: (i18n) Fix a bunch of still untranslated strings.

2008-02-04T02:25:29Z

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

git-gui: Fix broken revert confirmation.

2008-01-16T05:44:14Z

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

Merge branch 'maint'

2007-10-23T22:50:19Z

* maint: git-gui: Make sure we get errors from git-update-index Conflicts: lib/index.tcl

git-gui: Make sure we get errors from git-update-index

2007-10-23T22:49:27Z

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