| 00e9de7 | Pat Thoyts | 14 September 2010, 21:42:37 UTC | git-gui 0.13 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 September 2010, 21:42:37 UTC |
| 2473543 | Pat Thoyts | 13 September 2010, 19:41:42 UTC | git-gui: avoid mis-encoding the copyright message on Windows. On Windows the tcl script file will use the system encoding and attempting to convert the copyright mis-encodes the string. Instead, keep the message as ASCII and substitute in the correct unicode character when running. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 19:41:42 UTC |
| 421a31e | Peter Krefting | 12 September 2010, 20:13:29 UTC | git-gui: Update Swedish translation (521t). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 18:25:55 UTC |
| aef0b48 | Pat Thoyts | 18 August 2010, 22:19:24 UTC | git-gui: ensure correct application termination in git-gui--askpass With Tk 8.5 the askpass utility can hang waiting for the wish shell implicit event loop to exit. This patch uses an explicit event loop to ensure correct application termination. Reported-by: Anders Kaseorg <andersk@mit.edu> Tested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 August 2010, 22:19:24 UTC |
| d5257fb | Pat Thoyts | 07 August 2010, 19:32:13 UTC | git-gui: handle textconv filter on Windows and in development When developing/testing we run git-gui.sh directly and the makefile configured variables are not properly set. Configure the new shellpath accessor to handle this case. On Windows we may not find the shell so in this case revert to simply executing the filter command without the shell intermediate. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 12 August 2010, 20:37:32 UTC |
| 62f9a63 | Matthieu Moy | 05 August 2010, 10:05:22 UTC | git-gui: use shell to launch textconv filter in "blame" The textconv filters may include multiple arguments and may make use of unix shell features. To maintain compatibility with 'git blame' ensure these commands are passed through bash. Reported-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 12 August 2010, 20:35:09 UTC |
| 7807777 | Pat Thoyts | 07 August 2010, 23:07:43 UTC | git-gui: display error launching blame as a message box. This does not appear to Windows users and can follow the form of the fatal error messages near the top of the script file. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 August 2010, 23:07:43 UTC |
| ea47503 | Pat Thoyts | 07 August 2010, 23:07:01 UTC | git-gui: Make usage statement visible on Windows. On Windows stdout and stderr are not connected to anything so the usage statement is never shown to the user when an error is made with a command line like 'git gui browser'. Use a messagebox on windows. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 August 2010, 23:07:01 UTC |
| 2810a58 | Pat Thoyts | 02 August 2010, 12:42:45 UTC | git-gui: fix size and position of window panes on startup The themed panedwindow needs to have the sash position set after the widget has been mapped therefore apply this setting in the Map event binding. To avoid visible redraws as the application is constructed the main window should be withdrawn until all the widgets have been added Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 12:42:45 UTC |
| 9cb268c | Pat Thoyts | 02 August 2010, 11:13:05 UTC | git-gui: mc cannot be used before msgcat has been loaded If someone attempts to use an older version that Tk 8.4 the error was masked by the lack of a mc command. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 11:13:05 UTC |
| 1fbacca | Clément Poulain | 30 July 2010, 08:11:02 UTC | git-gui: use textconv filter for diff and blame Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options. If checked and if the driver for the concerned file exists, git-gui calls diff and blame with --textconv option Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| 8512354 | Pat Thoyts | 08 March 2010, 12:43:27 UTC | git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 On Windows the Control-C binding is used to copy and is mapped to the Tk virtual event <<Copy>>. In the initial git-gui dialog this is also bound as an accelerator for the Clone menu item. The effect is that both bindings run, copying the text but resetting the clone page or switching to the clone page when the user tries to copy text from one of the entry fields. This patch avoids this by using Control-L instead for Windows only. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| fc17e5e | Heiko Voigt | 27 February 2010, 20:48:48 UTC | git-gui: fix shortcut creation on cygwin When the user tried to create a desktop icon with git gui on cygwin wscript was complaining about an unknown option and displaying the non-native path as such. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:26 UTC |
| 4c79adc | Heiko Voigt | 27 February 2010, 20:47:42 UTC | git-gui: fix PATH environment for mingw development environment When creating a desktop shortcut from the gui the shortcut directly starts wish with the git-gui script. In the msysgit development environment some dll's reside in the mingw/bin directory which causes that git can not start because libiconv2.dll is not found. When using such a link the error is even more cryptic stating: "child killed: unknown signal" Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| a197b1e | Heiko Voigt | 27 February 2010, 20:45:51 UTC | git-gui: fix usage of _gitworktree when creating shortcut for windows This fixes msysGit issue 425. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| 2e0cda6 | Markus Heidelberg | 25 February 2010, 00:14:22 UTC | git-gui: fix "Explore Working Copy" for Windows again It has already been fixed in commit 454efb47 (git-gui (Win): make "Explore Working Copy" more robust, 2009-04-01), but has been broken in commit 21985a11 (git-gui: handle non-standard worktree locations, 2010-01-23) by accidentally replacing too much with a new variable. The problem can be reproduced when starting git-gui from within a subdirectory. The solution is to convert the path name, explorer.exe is invoked with, to a platform native name. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| b963d11 | Heiko Voigt | 20 February 2010, 13:38:38 UTC | git-gui: fix usage of themed widgets variable There was one forgotten global so NS was not visible to the method which resulted in an error. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> | 10 July 2010, 22:41:54 UTC |
| 13a3d63 | Pat Thoyts | 10 July 2010, 22:40:59 UTC | git-gui: Handle failure of core.worktree to identify the working directory. Commit 21985a11 'git-gui: handle non-standard worktree locations' attempts to use either GIT_WORK_TREE or core.worktree to set the _gitworktree variable but these may not be set which leads to a failure to launch gitk to review history. Use _gitdir to set the location for a standard git layout where the parent of the .git directory is the working tree. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 July 2010, 22:40:59 UTC |
| 2a9edd0 | Shawn O. Pearce | 08 February 2010, 15:57:37 UTC | Merge branch 'maint' * maint: git-gui: check whether systems nice command works or disable it | 08 February 2010, 15:57:37 UTC |
| 9c898a1 | Heiko Voigt | 07 February 2010, 21:47:56 UTC | git-gui: check whether systems nice command works or disable it This fixes issue 394 from msysgit. It seems that the Gnuwin32 project provides a nice command but it returns a "not implemented" error. To help users we now try to execute once and disable it in case it fails. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2010, 15:56:55 UTC |
| 89d6159 | Emmanuel Trillaud | 02 February 2010, 11:59:34 UTC | git-gui: update french translation Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 15:34:04 UTC |
| 5bf4684 | Nanako Shiraishi | 02 February 2010, 10:20:21 UTC | git-gui: update Japanese translation Update ja.po to match 2010-01-26 version of pot file. Signed-off-by: しらいし ななこ <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 14:59:06 UTC |
| e1a3f28 | Shawn O. Pearce | 29 January 2010, 15:58:56 UTC | Merge branch 'maint' * maint: git-gui: fix shortcut for menu "Commit/Revert Changes" | 29 January 2010, 15:58:56 UTC |
| d6db1bb | Heiko Voigt | 29 January 2010, 15:57:48 UTC | git-gui: fix shortcut for menu "Commit/Revert Changes" The shortcut was not properly recognized previously. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 January 2010, 15:58:52 UTC |
| 831cc7e | Jens Lehmann | 28 January 2010, 21:20:39 UTC | git-gui: Quote git path when starting another gui in a submodule In do_git_gui the path of the git executable has to be put into a list, otherwise calling it will fail when when spaces are present in its path. Reported-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 23:44:41 UTC |
| cbdaf56 | Michele Ballabio | 07 September 2009, 16:45:16 UTC | git-gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 15:18:29 UTC |
| fe9c06b | Peter Krefting | 28 January 2010, 12:57:34 UTC | git-gui: Update Swedish translation (520t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 15:17:47 UTC |
| c80d7be | Pat Thoyts | 26 January 2010, 00:05:31 UTC | git-gui: use themed tk widgets with Tk 8.5 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 <patthoyts@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 01:13:52 UTC |
| ab2d3b0 | Christian Stimming | 26 January 2010, 21:26:45 UTC | git-gui: Update German translation (12 new or changed strings). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 01:13:47 UTC |
| 60eb4f1 | Shawn O. Pearce | 26 January 2010, 23:47:45 UTC | git-gui: Update translation template Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 January 2010, 23:47:45 UTC |
| 73b3446 | Shawn O. Pearce | 25 January 2010, 15:33:41 UTC | git-gui: Remove unused icon file_parttick This icon hasn't been used in git gui. I think it dates back to the original set of icons I took from Paul Mackerras' prototype that I turned into git gui. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 January 2010, 15:33:41 UTC |
| 0602de4 | Peter Oberndorfer | 24 January 2010, 18:54:19 UTC | git-gui: use different icon for new and modified files in the index This allows to quickly differentiate between new and modified files in the index without selecting the file and looking at the diff. Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 January 2010, 15:31:38 UTC |
| a9fa11f | Giuseppe Bilotta | 23 January 2010, 23:59:00 UTC | git-gui: set GIT_DIR and GIT_WORK_TREE after setup Rather than juggling with the env var GIT_DIR around the invocation of gitk, set it and GIT_WORK_TREE after finishing setup, ensuring that any external tool works with the setup we're running with. This also allows us to remove a couple of conditionals when running gitk or git gui in a submodule, as we know that the variables are present and have to be unset and reset before and after the invocation. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 January 2010, 00:02:16 UTC |
| 3748b03 | Giuseppe Bilotta | 23 January 2010, 10:03:38 UTC | git-gui: update shortcut tools to use _gitworktree Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:15:55 UTC |
| 29e5573 | Giuseppe Bilotta | 23 January 2010, 10:03:35 UTC | git-gui: handle bare repos correctly Refactor checking for a bare repository into its own proc, that relies on git rev-parse --is-bare-repository if possible. For older versions of git we fall back to a logic such that the repository is considered bare if: * either the core.bare setting is true * or the worktree is not set and the directory name ends with .git The error message for the case of an unhandled bare repository is also updated to reflect the fact that the problem is not the funny name but the bareness. The new refactored proc is also used to disable the menu entry to explore the working copy, and to skip changing to the worktree before the gitk invocation. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:21 UTC |
| 21985a1 | Giuseppe Bilotta | 23 January 2010, 10:03:34 UTC | git-gui: handle non-standard worktree locations Don't rely on the git worktree being the updir of the gitdir, since it might not be. Instead, define (and use) a new _gitworktree global variable, setting it to $GIT_WORK_TREE if present, falling back to core.worktree if defined, and finally to whatever we guess the correct worktree is. Getting core.worktree requires the config from the alleged git dir _gitdir to be loaded early. Supporting non-standard worktree locations also breaks the git-gui assumption (made when calling gitk) that the worktree was the dirname of $_gitdir and that, by consequence, the git dir could be set to the tail of $_gitdir once we changed to the worktree root directory. Therefore, we need to export a GIT_DIR environment variable set to the full, normalized path of $_gitdir instead. We also skip changing to the worktree directory if it's empty (i.e. if we're working on a bare repository). Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:21 UTC |
| ff07c3b | Jeff Epler | 08 December 2009, 00:22:43 UTC | git-gui: Support applying a range of changes at once Multiple lines can be selected in the diff viewer and applied all at once, rather than selecting "Stage Line For Commit" on each individual line. Signed-off-by: Jeff Epler <jepler@unpythonic.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:15 UTC |
| 25476c6 | Jens Lehmann | 02 January 2010, 16:58:49 UTC | git-gui: Add a special diff popup menu for submodules To make it easier for users to deal with submodules, a special diff popup menu has been added for submodules. The "Show Less Context" and "Show More Context" entries have been removed, as they don't make any sense for a submodule summary. Four new entries are added to the top of the popup menu to gain access to more detailed information about the changes in a submodule than the plain summary does offer. These are: - "Visualize These Changes In The Submodule" starts gitk showing the selected commit range - "Visualize These Changes In The Submodule" starts gitk showing the whole submodule history of the current branch - "Visualize All Branch History In The Submodule" starts gitk --all in the submodule - "Start git gui In The Submodule" guess what :-) Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:15 UTC |
| a9ae14a | Jens Lehmann | 23 January 2010, 22:04:12 UTC | git-gui: Use git diff --submodule when available Doing so is much faster and gives the same output. Here are some numbers: $ time git submodule summary real 0m0.219s user 0m0.050s sys 0m0.111s $ time git diff --submodule real 0m0.012s user 0m0.003s sys 0m0.009s Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:15 UTC |
| 87cd09f | Giuseppe Bilotta | 23 January 2010, 10:03:36 UTC | git-gui: work from the .git dir When git-gui is run from a .git dir, _gitdir would be set to "." by rev-parse, something that confuses the worktree detection. Fix by expanding the value of _gitdir to pwd in this special case. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:04 UTC |
| 390425b | Jeff Epler | 08 December 2009, 00:22:42 UTC | git-gui: Fix applying a line when all following lines are deletions If a diff looked like: @@ context -del1 -del2 and you wanted to stage the deletion 'del1', the generated patch wouldn't apply because it was missing the line 'del2' converted to context, but this line was counted in the @@-line Signed-off-by: Jeff Epler <jepler@unpythonic.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:00:09 UTC |
| 7ec2b69 | Jens Lehmann | 07 December 2009, 20:35:59 UTC | git-gui: Correct file_states when unstaging partly staged entry When unstaging a partly staged file or submodule, the file_states list was not updated properly (unless unstaged linewise). Its index_info part did not contain the former head_info as it should have but kept its old value. This seems not to have had any bad effects but diminishes the value of the file_states list for future enhancements. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:13 UTC |
| e27d106 | Peter Krefting | 21 January 2010, 12:15:17 UTC | git-gui: Fix gitk for branch whose name matches local file When trying to run gitk on a branch name whose name matches a local file, it will toss an error saying that the name is ambiguous. Adding a pair of dashes will make gitk parse the options to the left of it as branch names. Since wish eats the first pair of dashes we throw at it, we need to add a second one to ensure they get through. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:12 UTC |
| 3c6a287 | Christopher Beelby | 23 January 2010, 22:37:17 UTC | git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync When the number of recent repo's gets to ten there can be a situation where an item is removed from the .gitconfig file via a call to git config --unset, but the internal representation of that file (repo_config(gui.recentrepo)) is not updated. Then a subsequent attempt to remove an item from the list fails because git-gui attempts to call --unset on a value that has already been removed. This leads to duplicates in the .gitconfig file, which then also cause errors if the git-gui tries to --unset them (rather than using --unset-all. --unset-all is not used because it is not expected that duplicates should ever be allowed to exist.) When loading the list of recent repositories (proc _get_recentrepos) if a repo in the list is not considered a valid git reposoitory then we should go ahead and remove it so it doesn't take up a slot in the list (since we limit to 10 items). This will prevent a bunch of invalid entries in the list (which are not shown) from making valid entries dissapear off the list even when there are less than ten valid entries. See: http://code.google.com/p/msysgit/issues/detail?id=362 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:12 UTC |
| ea888f8 | Pat Thoyts | 20 December 2009, 02:02:03 UTC | git-gui: handle really long error messages in updateindex. 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 <patthoyts@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:22:28 UTC |
| b677c66 | Vitaly _Vi Shukela | 31 December 2009, 13:32:53 UTC | git-gui: Add hotkeys for "Unstage from commit" and "Revert changes" Signed-off-by: Vitaly _Vi Shukela <public_vi@tut.by> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 January 2010, 02:21:11 UTC |
| 54350a2 | Jonathan Nieder | 06 January 2010, 08:16:38 UTC | git-gui: Makefile: consolidate .FORCE-* targets Providing multiple targets to force a rebuild is unnecessary complication. Avoid using a name that could conflict with future special targets in GNU make (a leading period followed by uppercase letters). Cc: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 January 2010, 02:20:01 UTC |
| 60204dd | Jindrich Makovicka | 04 December 2009, 09:28:44 UTC | git-gui: suppress RenderBadPicture X error caused by Tk bug Due to a bug in Tk, git-gui almost always (unless git-gui is closed right after starting) produces an X window error message on exit, something like: X Error of failed request: RenderBadPicture (invalid Picture parameter) Major opcode of failed request: 150 (RENDER) Minor opcode of failed request: 7 (RenderFreePicture) Picture id in failed request: 0x3a000dc Serial number of failed request: 1965 Current serial number in output stream: 1980 Respective Tk bug report is here: http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 This bug is triggered only when the send command is blocked via rename send {} . The following patch re-enables send just before quiting git-gui to suppress the error. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 December 2009, 15:39:58 UTC |
| 1085208 | Alexander Gavrilov | 13 November 2008, 19:02:09 UTC | git-gui: Increase blame viewer usability on MacOS. On MacOS raising a window causes the focus to be transferred to it -- although it may actually be a bug in the Tcl/Tk port. When this happens with the blame viewer tooltips, it makes the interface less usable, because Entry and Leave handlers on the text view cause the tip to disappear once the mouse is moved even 1 pixel. This commit makes the code raise the main window on MacOS when Tk 8.5 is used. This version seems to properly support wm transient by making the tip stay on top of the master, so reraising the master does not cause it to disappear. Thus the only remaining sign of problems is slight UI flicker when focus is momentarily transferred to the tip and back. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2009, 22:26:59 UTC |
| 88520ca | Clemens Buchacher | 13 September 2009, 22:20:44 UTC | git-gui: search 4 directories to improve statistic of gc hint On Windows, git-gui suggests running the garbage collector if it finds 1 or more files in .git/objects/42 (as opposed to 8 files on other platforms). The probability of that happening if the repo contains about 100 loose objects is 32%. The probability for the same to happen when searching 4 directories is only 8%, which is bit more reasonable. Also remove $objects_limit from the message, because we already know that we are above (or close to) that limit. Telling the user about that number does not really give him any useful information. The following octave script shows the probability for at least m*q objects to be found in q subdirectories of .git/objects if n is the total number of objects. q = 4; m = [1 2 8]; n = 0:10:2000; P = zeros(length(n), length(m)); for k = 1:length(n) P(k, :) = 1-binocdf(q*m-1, n(k), q/(256-q)); end plot(n, P); n \ q 1 4 50 18% 1% 100 32% 8% 200 54% 39% 500 86% 96% Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2009, 21:48:03 UTC |
| c0d1532 | Heiko Voigt | 04 December 2009, 21:26:48 UTC | git gui: make current branch default in "remote delete branch" merge check We already do the same when locally deleting a branch. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2009, 21:17:51 UTC |
| acb9108 | Vietor Liu | 16 October 2009, 09:41:26 UTC | git-gui: adjust the minimum height of diff pane for shorter screen height When the main window is maximized, if the screen height is shorter (e.g. Netbook screen 1024x600), both the partial commit pane and the status bar are hidden. The diff pane is resizable, so that it can use less vertical height, allowing the overall window to be shorter and still display both the entire commit pane and status bar. Signed-off-by: Vietor Liu <vietor@vxwo.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 October 2009, 18:25:59 UTC |
| cd846aa | Jens Lehmann | 24 September 2009, 16:56:28 UTC | git-gui: fix use of uninitialized variable This fixes a bug introduced by the "display summary when showing diff of a submodule" patch. It lead to a "no such variable" error when opening the diff context menu while no diff was shown. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 23:42:00 UTC |
| ed7b603 | Alexey Borzenkov | 08 September 2009, 18:39:33 UTC | git-gui: store wm state and fix wm geometry I often close git gui window when it is maximized, and when I reopen it next time the it would usually become out of place (e.g. a huge window with a top-left corner somewhere close to the center of the screen). Fix it by storing and restoring wm state in config, as well as setting wm state to normal before retrieving wm geometry info. Signed-off-by: Alexey Borzenkov <snaury@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 September 2009, 18:35:29 UTC |
| 118d938 | Shawn O. Pearce | 27 August 2009, 00:39:45 UTC | git-gui: Ensure submodule path is quoted properly When quoting an arbitrary user string in Tcl, its better to use [list ...] than to use {...}, in case the user string has spaces or { embedded within it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 August 2009, 00:42:50 UTC |
| af413de | Jens Lehmann | 26 August 2009, 20:25:15 UTC | git-gui: fix diff for partially staged submodule changes When a submodule commit had already been staged and another commit had been checked out inside the submodule, the diff always displayed the submodule commit log messages between the last supermodule commit and the working tree, totally ignoring the commit in the index. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 August 2009, 00:35:16 UTC |
| b350e46 | Alex Riesen | 12 August 2009, 15:24:10 UTC | git-gui: Update russian translation Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 August 2009, 15:34:37 UTC |
| dd6451f | Dan Zwell | 11 August 2009, 18:50:00 UTC | git-gui: Limit display to a maximum number of files When there is a large number of new or modified files, "display_all_files" takes a long time, and git-gui appears to hang. This change limits the number of files that are displayed. This limit can be set as gui.maxfilesdisplayed, and is 5000 by default. A warning is shown the first time the list of files is truncated in this GUI session. Subsequent truncations are not mentioned to the user. Signed-off-by: Dan Zwell <dzwell@zwell.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 August 2009, 14:41:52 UTC |
| 2112be7 | Heiko Voigt | 15 June 2009, 21:19:56 UTC | git-gui: remove warning when deleting correctly merged remote branch If the user wants to delete a remote branch and selects the correct "merged into" we should not warn that "Recovering deleted branches is difficult". For local branches we do the same already. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 August 2009, 15:47:34 UTC |
| 2ee94d1 | Jimmy Angelakos | 23 June 2009, 18:35:35 UTC | git-gui: Added Greek translation & glossary Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 August 2009, 15:43:07 UTC |
| 246295b | Jens Lehmann | 21 July 2009, 17:32:31 UTC | git-gui: display summary when showing diff of a submodule As it is hard to say what changed in a submodule by looking at the hashes, let's show the colored submodule summary instead. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 August 2009, 15:30:26 UTC |
| a91be3f | Daniel A. Steffen | 16 August 2008, 01:20:09 UTC | git-gui: Fixes for Mac OS X TkAqua - detect more Tk.framework variants - fix apple menu setup, use native preferences menu item - don't set menu font Signed-off-by: Daniel A. Steffen <das@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 May 2009, 22:04:52 UTC |
| c736b4c | Alex Riesen | 29 April 2009, 05:56:06 UTC | git-gui: Update Russian translation Also, the previous translations of the words 'tag' and 'merge' were changed. Added translation of the 'Tool' submenu. Thanks go to Alexander Gavrilov and Dmitry Potapov for proofreading and suggestions. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2009, 15:37:23 UTC |
| b4c813b | Jens Lehmann | 06 April 2009, 19:05:55 UTC | git-gui: run post-checkout hook after clone git-gui is using "git-read-tree -u" when cloning which doesn't invoke the post-checkout hook as a plain git-clone would. So git-gui must call the hook itself. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 April 2009, 14:42:54 UTC |
| 4339d51 | Shawn O. Pearce | 08 April 2009, 14:41:13 UTC | Merge branch 'maint' * maint: git-gui: Ensure consistent usage of mergetool.keepBackup git-gui: fix use of undeclared variable diff_empty_count | 08 April 2009, 14:41:13 UTC |
| fb25092 | Ferry Huberts | 07 April 2009, 15:33:35 UTC | git-gui: Ensure consistent usage of mergetool.keepBackup In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 April 2009, 14:40:58 UTC |
| 8052e78 | Joerg Bornemann | 06 April 2009, 19:59:28 UTC | git-gui: fix use of undeclared variable diff_empty_count Commit 584fa9cc introduced the global variable diff_empty_count, which is used in diff.tcl. This variable wasn't declared anywhere which resulted in an ugly error message box instead of the intended informative message. Signed-off-by: Joerg Bornemann <joerg.bornemann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 April 2009, 14:38:11 UTC |
| b01d432 | Markus Heidelberg | 31 March 2009, 23:55:39 UTC | git-gui (Win): make starting via "Git GUI Here" on .git/ possible This works around git-gui's error message Cannot use funny .git directory: . when started from the .git/ directory, which is useful in repositories without any directories for the right click. Now git-gui can be started via Windows Explorer shell extension (Git GUI Here) from the .git/ directory. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2009, 20:06:24 UTC |
| 454efb4 | Markus Heidelberg | 31 March 2009, 23:55:36 UTC | git-gui (Win): make "Explore Working Copy" more robust Starting the Explorer from the git-gui menu "Explore Working Copy" didn't work, when git-gui was started via Windows Explorer shell extension (Git GUI Here) from a directory within the project. The Explorer raised an error message like this: Path "C:/somedir/worktree" is not available or not a directory It worked when started from the project directory itself, because then the path argument for the Explorer was just '.' (current directory) without any problematic forward slashes. To make it work, convert the path given as argument to explorer.exe to its native format with backslashes. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2009, 20:05:29 UTC |
| c949833 | Jens Lehmann | 30 March 2009, 19:46:17 UTC | git-gui: run post-checkout hook on checkout git-gui is using "git-read-tree -u" for checkout which doesn't invoke the post-checkout hook as a plain git-checkout would. So git-gui must call the hook itself. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2009, 19:58:26 UTC |
| f0d4eec | Jens Lehmann | 30 March 2009, 18:35:57 UTC | git-gui: When calling post-commit hook wrong variable was cleared. Before calling the post-commit hook, the variable "pc_err" is cleared while later only "pch_error" is used. "pch_error$cmt_id" only appeared in "upvar"-Statements (which were changed to "global") and was removed. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2009, 19:45:40 UTC |
| 3eb5682 | Markus Heidelberg | 05 April 2009, 01:48:21 UTC | git-gui: use `git --html-path` to get the location of installed HTML docs Previously a hardcoded path $GIT_EXEC_PATH/../Documentation/ was used to search for the documentation, when the user has asked for it via menu "Help -> Online Documentation". This didn't work for the default directory structure. To find the path reliably, use the new git command line option, which returns the correct path. If the output of `git --html-path` is empty because git is not found or the option is not yet supported in the installed git, the documentation from kernel.org is launched. There is no additional guessing of the right location of the installed docs. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2009, 19:29:10 UTC |
| 122ee54 | Shawn O. Pearce | 30 March 2009, 14:09:28 UTC | Merge branch 'maint' * maint: git-gui: fix deleting from the context menu with empty selection | 30 March 2009, 14:09:28 UTC |
| bf516ec | Markus Heidelberg | 29 March 2009, 14:29:23 UTC | git-gui: fix deleting from the context menu with empty selection An "Application Error" was raised when trying to delete text from the commit message field when no text was selected. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 March 2009, 14:06:37 UTC |
| 966d077 | Sam Hocevar | 23 March 2009, 23:42:24 UTC | git-gui: minor spelling fix and string factorisation. Properly spell "successful" and slightly rewrite a couple of strings that actually say the same thing in order to reduce translation work. Update .pot and .po files accordingly since no new translation is required. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 March 2009, 23:17:30 UTC |
| b59f091 | Sam Hocevar | 24 March 2009, 23:15:38 UTC | git-gui: various French translation fixes Mostly grammar, spelling and typography fixes, but also a few wording enhancements here and there. Signed-off-by: Sam Hocevar <sam@zoy.org> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 March 2009, 23:16:42 UTC |
| b0d644b | Shawn O. Pearce | 20 March 2009, 21:44:48 UTC | Merge branch 'maint' | 20 March 2009, 21:44:48 UTC |
| e27430e | Jens Lehmann | 20 March 2009, 07:48:55 UTC | git-gui: Fix merge conflict display error when filename contains spaces When a merge conflict occurs in a file with spaces in the filename, git-gui showed wrongly "LOCAL: deleted". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 March 2009, 21:44:28 UTC |
| 73fea17 | Shawn O. Pearce | 17 March 2009, 03:01:27 UTC | Merge branch 'maint' * maint: git-gui: don't hide the Browse button when resizing the repo chooser | 17 March 2009, 03:01:27 UTC |
| 379f84b | Markus Heidelberg | 13 March 2009, 23:42:37 UTC | git-gui: don't hide the Browse button when resizing the repo chooser Rather shrink the input field for "Create New Repository" and "Open Existing Repository" as it's already done for "Clone Existing Repository". Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 March 2009, 02:57:48 UTC |
| 880fa11 | Phil Lawrence | 09 March 2009, 22:09:49 UTC | Append ampersand to "Target" of lnk files created by do_cygwin_shortcut The git-gui menu item "Repository | Create Desktop Icon" creates a shortcut (.lnk file) on the Windows desktop. The purpose of the created shortcut is to make it easy for a user to launch git-gui for a particular repo in the future. A Windows user would expect to see git gui launch when they click the shortcut; they would not expect (nor want) to see a cmd window open and remain open in the background. msysGit avoids opening a command window altogether when it's Git GUI shortcut is used. Ideally, git on cygwin would also have shortcuts that simply open the GUI, but as a first step, this change allows the shell window to politely disappear after starting git gui as a background process. Signed-off-by: Phil Lawrence <prlawrence@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 March 2009, 23:21:17 UTC |
| 764369c | Alexander Gavrilov | 07 February 2009, 16:43:57 UTC | git-gui: Support more git version notations. Recently the msysgit repository has got a '1.6.1-msysgit1' tag, which, when used to build the git version, is not handled gracefully by the git-gui version code. This patch changes the regular expressions to fix it, and removes the hardcoded 'rc' string. Now git-gui can accept a version tail like '.foo123.GIT.bar.456.7.g89ab' Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2009, 19:50:58 UTC |
| 584fa9c | Alexander Gavrilov | 07 February 2009, 16:24:01 UTC | git-gui: Avoid an infinite rescan loop in handle_empty_diff. If the index update machinery and git diff happen to disagree on whether a particular file is modified, it may cause git-gui to enter an infinite index rescan loop, where an empty diff starts a rescan, which finds the same set of files modified, and tries to display the diff for the first one, which happens to be the empty one. A current example of a possible disagreement point is the autocrlf filter. This patch breaks the loop by using a global counter to track the auto-rescans. The variable is reset whenever a non-empty diff is displayed. Another suggested approach, which is based on giving the --exit-code argument to git diff, cannot be used, because diff-files seems to trust the timestamps in the index, and returns a non-zero code even if the file is actually unchanged, which essentially defeats the purpose of the auto-rescan logic. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2009, 19:50:11 UTC |
| 06569cd | Alexander Gavrilov | 23 January 2009, 21:18:13 UTC | git-gui: Fix post-commit status with subject in non-locale encoding As pointed out in msysgit bug #181, when a non-locale encoding is used for commits, post-commit status messages display the subject incorrectly. It happens because the file handle is not properly configured before the subject is read back. This patch fixes it by factoring out the code that is used to setup the output handle into a separate function, and calling it from the reading code. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Robin Rosenberg <robin.rosenberg@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 February 2009, 22:56:54 UTC |
| e612120 | Shawn O. Pearce | 18 December 2008, 04:15:17 UTC | git-gui 0.12 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 December 2008, 04:15:17 UTC |
| d4d1351 | Johannes Schindelin | 14 December 2008, 22:12:49 UTC | git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 December 2008, 15:50:55 UTC |
| b8dc2f5 | Miklos Vajna | 10 December 2008, 14:03:13 UTC | git-gui: Update Hungarian translation for 0.12 Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 December 2008, 19:44:03 UTC |
| 93b6d7c | Peter Krefting | 10 December 2008, 08:51:27 UTC | git-gui: Fixed typos in Swedish translation. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 December 2008, 19:43:15 UTC |
| 7f64a66 | Peter Krefting | 09 December 2008, 15:26:46 UTC | git-gui: Updated Swedish translation (515t0f0u). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:35:01 UTC |
| 64bcf58 | Michele Ballabio | 04 December 2008, 17:28:21 UTC | git gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:20:08 UTC |
| e882c6e | Nanako Shiraishi | 09 December 2008, 03:42:17 UTC | git-gui: Update Japanese translation for 0.12 Adds translation for one new message string. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:11:20 UTC |
| 9c996d0 | Fredrik Skolmli | 08 December 2008, 16:36:57 UTC | git-gui: Starting translation for Norwegian This file have been used locally for some time, and is near completion. Will put an effort into completing it later on, or just leave it as an excercise for other Norwegians. Signed-off-by: Fredrik Skolmli <fredrik@frsk.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 17:32:11 UTC |
| 07bba55 | Christian Stimming | 06 December 2008, 20:22:16 UTC | git-gui: Update German (completed) translation. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:49:56 UTC |
| 8a33356 | Shawn O. Pearce | 08 December 2008, 16:32:28 UTC | git-gui: Update po template to include 'Mirroring %s' message A late addition to the message library. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| 3ac31e4 | Alexander Gavrilov | 06 December 2008, 17:24:35 UTC | git-gui: Fix commit encoding handling. Commits without an encoding header are supposed to be encoded in utf8. While this apparently hasn't always been the case, currently it is the active convention, so it is better to follow it; otherwise people who have to use commitEncoding on their machines are unable to read utf-8 commits made by others. I also think that it is preferrable to display the warning about an unsupported value of commitEncoding more prominently, because this condition may lead to surprising behavior and, eventually, to loss of data. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| 95e706b | Alexander Gavrilov | 06 December 2008, 17:21:54 UTC | git-gui: Fix handling of relative paths in blame. Currently using '..' or '.' in the file path for gui blame causes it to break, because the path is passed inside the SHA:PATH spec to cat-file, which apparently does not understand such items. As a result, cat-file returns nothing, and the viewer crashes because of an "index out of range" error. This commit adds a simple function that normalizes such paths. I choose not to use [file normalize], because it uses some data from the file system, e.g. dereferences symlinks, and creates an absolute path, while blame may be used to inspect historical information that bears no relation to the current filesystem state. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| 861c68e | Mark Burton | 02 December 2008, 15:15:02 UTC | git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror. When the destination repository is a mirror, this function goofed by still passing a refspec to git-push. Now it notices that the remote is a mirror and holds the refspec. Signed-off-by: Mark Burton <markb@ordern.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 December 2008, 15:20:19 UTC |
| 6249067 | Nanako Shiraishi | 26 November 2008, 10:21:44 UTC | git-gui: update Japanese translation Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 November 2008, 22:13:30 UTC |
| 1a93d67 | Christian Couder | 23 November 2008, 19:52:20 UTC | git-gui: french translation update Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 November 2008, 20:53:45 UTC |
| f6e4110 | Peter Krefting | 21 November 2008, 07:35:53 UTC | Updated Swedish translation (514t0f0u). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 November 2008, 15:07:02 UTC |
