| 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 |
| 3cf2801 | Michele Ballabio | 26 August 2008, 22:49:54 UTC | git gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 19 November 2008, 19:17:39 UTC |
| 0c76ae2 | Miklos Vajna | 17 November 2008, 22:11:43 UTC | Update Hungarian translation. 100% completed. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 November 2008, 00:58:29 UTC |
| 9419307 | Alexander Gavrilov | 13 November 2008, 18:52:52 UTC | git-gui: Fix the search bar destruction handler. Since delete_this is an ordinary function, it should not be passed to cb; otherwise it produces errors when blame windows are closed. Unfortunately, it is not noticeable when blame is shown in the master window, so I missed this bug. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 22:02:13 UTC |
| bd45bd9 | Shawn O. Pearce | 16 November 2008, 21:56:55 UTC | Update the po template Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:56:55 UTC |
| b8dfb16 | Alexander Gavrilov | 16 November 2008, 18:46:51 UTC | git-gui: Implement automatic rescan after Tool execution. The Tools menu is generally intended for commands that affect the working directory or repository state. Thus, the user would usually want to initiate rescan after execution of a tool. This commit implements it. In case somebody would want to avoid rescanning after certain tools, it also adds an option that controls it, although it is not made available through the Add dialog. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:33:33 UTC |
| 67df911 | Alexander Gavrilov | 16 November 2008, 18:46:50 UTC | git-gui: Allow Tools request arguments from the user. While static commands are already useful, some tools need additional parameters to reach maximum usability. This commit adds support for passing them one revision name parameter, and one arbitrary string. With this addition, the tools menu becomes flexible enough to implement basic rebase support: [core] editor = kwrite [guitool "Rebase/Abort"] cmd = git rebase --abort confirm = yes [guitool "Rebase/Continue"] cmd = git rebase --continue [guitool "Rebase/Skip Commit"] cmd = git rebase --skip confirm = yes [guitool "Rebase/Start..."] cmd = git rebase $ARGS $REVISION $CUR_BRANCH title = Start Rebase prompt = Rebase Current Branch argprompt = Flags revprompt = New Base revunmerged = yes Some of the options, like title or prompt, are intentionally not included in the Add dialog to avoid clutter. Also, the dialog handles argprompt and revprompt as boolean vars. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:33:09 UTC |
| 0ce76de | Alexander Gavrilov | 16 November 2008, 18:46:49 UTC | git-gui: Add a Tools menu for arbitrary commands. Due to the emphasis on scriptability in the git design, it is impossible to provide 100% complete GUI. Currently unaccounted areas include git-svn and other source control system interfaces, TopGit, all custom scripts. This problem can be mitigated by providing basic customization capabilities in Git Gui. This commit adds a new Tools menu, which can be configured to contain items invoking arbitrary shell commands. The interface is powerful enough to allow calling both batch text programs like git-svn, and GUI editors. To support the latter use, the commands have access to the name of the currently selected file through the environment. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:33:09 UTC |
| 7cf4566 | Alexander Gavrilov | 16 November 2008, 18:46:48 UTC | git-gui: Fix the after callback execution in rescan. The rescan function receives a callback command as its parameter, which is supposed to be executed after the scan finishes. It is generally used to update status. However, rescan may initiate a loading of a diff, which always calls ui_ready after completion. If the after handler is called before that, ui_ready will override the new status. This commit ensures that the after callback is properly threaded through the diff machinery. Since it uncovered the fact that force_first_diff actually didn't work due to an undeclared global variable, and the desired effects appeared only because of the race condition between the diff system and the rescan callback, I also reimplement this function to make it behave as originally intended. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:33:09 UTC |
| 153ad78 | Alexander Gavrilov | 16 November 2008, 18:46:47 UTC | git-gui: Implement system-wide configuration handling. With the old implementation any system-wide options appear to be set locally in the current repository. This commit adds explicit handling of system options, essentially interpreting them as customized default_config. The difficulty in interpreting system options stems from the fact that simple 'git config' lists all values, while 'git config --global' only values set in ~/.gitconfig, excluding both local and system options. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:33:09 UTC |
| d1f2b36 | Giuseppe Bilotta | 16 November 2008, 02:42:32 UTC | git-gui: try to provide a window icon under X When running under X, we try to set up a window icon by providing a hand-crafted 16x16 Tk photo image equivalent to the .ico. Wrap in a catch because the earlier Tcl/Tk 8.4 releases didn't provide the 'wm iconphoto' command. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 November 2008, 21:31:41 UTC |
| f75c8b3 | Alexander Gavrilov | 09 November 2008, 15:53:09 UTC | git-gui: Request blame metadata in utf-8. The blame builtin now supports automatic conversion of metadata encoding. By default it is converted to the character set specified by i18n.logoutputencoding. Since gui blame expects the data in utf-8, it is necessary to specify the desired encoding directly. An old version of the blame command will simply ignore the option. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 11 November 2008, 17:29:36 UTC |
| e29c0d1 | Alexander Gavrilov | 09 November 2008, 15:51:16 UTC | git-gui: Add the Show SSH Key item to the clone dialog. The user might need to see the key before cloning a repository. This patch makes the relevant menu item available in the Select Repository/Clone dialog. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 11 November 2008, 17:29:36 UTC |
| b28ebab | Alexander Gavrilov | 09 November 2008, 15:36:50 UTC | git-gui: Fix focus transition in the blame viewer. Now that the blame viewer has a search panel, it should be taken into account by the focus transition code. Otherwise showing a commit tip (by accidentally moving the mouse to the text frame) causes the focus to transfer away from the search field. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 11 November 2008, 17:29:36 UTC |
| 9d83c6a | Christian Stimming | 25 October 2008, 20:51:05 UTC | git-gui: Update German translation. Not yet completed, though. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 November 2008, 01:58:15 UTC |
| 63aa1d0 | Johannes Sixt | 14 October 2008, 11:48:37 UTC | git-gui: Do not munge conflict marker lines in a normal diff Previously, conflict markers were highlighted in two ways: (1) They received a distinguishing color; and (2) they had the '+' removed at the beginning of the line. However, by doing (2), a hunk that contained conflict markers could not be staged or unstaged because the resulting patch was corrupted. With this change we no longer modify the diff text of a 2-way diff, so that "Stage Hunk" and friends work. Note that 3-way diff of a conflicted file is unaffected by this change, and '++' before conflict markers is still removed. But this has no negative impact because in this mode staging hunks or lines is disabled anyway. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2008, 23:12:29 UTC |
| 8c76212 | Alexander Gavrilov | 15 October 2008, 09:28:21 UTC | git-gui: Add a simple implementation of SSH_ASKPASS. OpenSSH allows specifying an external program to use for direct user interaction. While most Linux systems already have such programs, some environments, for instance, msysgit, lack it. This patch adds a simple fallback Tcl implementation of the tool. In msysgit it is also necessary to set a fake value of the DISPLAY variable, because otherwise ssh won't even try to use SSH_ASKPASS handlers. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2008, 23:01:34 UTC |
| 98a6846 | Alexander Gavrilov | 15 October 2008, 09:28:20 UTC | git-gui: Add a dialog that shows the OpenSSH public key. Generating a new SSH key or finding an existing one may be a difficult task for non-technical users, especially on Windows. This commit adds a new dialog that shows the public key, or allows the user to generate a new one if none were found. Since this is a convenience/informational feature for new users, and the dialog is mostly read-only, it is located in the Help menu. The command line used to invoke ssh-keygen is designed to force it to use SSH_ASKPASS if available, or accept empty passphrases, but _never_ wait for user response on the tty. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2008, 23:01:23 UTC |
| 7f15b00 | Johannes Sixt | 03 October 2008, 11:13:42 UTC | git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:33:21 UTC |
| f2df8a5 | Johannes Sixt | 03 October 2008, 08:28:49 UTC | git-gui: Show a round number of bytes of large untracked text files If an untracked text file is selected, then its contents are displayed instead of a diff. If the file is large, then the following hint is inserted at the top: * Untracked file is 14774881 bytes. * Showing only first 131072 bytes. Why exactly 131072 bytes? With this patch it is 100000 bytes. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:33:21 UTC |
| 5c91cb5 | Alexander Gavrilov | 03 October 2008, 07:36:54 UTC | git-gui: Fix the blame viewer destroy handler. It did not delete the object, which is not very good. Also, destroy may be fired up for subwindows, so we should check %W. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:33:21 UTC |
| f10d5b0 | Alexander Gavrilov | 03 October 2008, 07:36:53 UTC | git-gui: Add a search command to the blame viewer. One of the largest deficiencies in the blame viewer at the moment is the impossibility to search for a text string. This commit fixes it by adding a Firefox-like search panel to the viewer. The panel can be shown by pressing F7 or clicking a menu entry, and is hidden by pressing Esc. Find Next is available through the F3 key. Implementation is based on the gitk code, but heavily refactored. It now also supports case-insensitive searches, and uses the text box background color to signal success or failure of the search. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:33:21 UTC |
| d4d9925 | Alexander Gavrilov | 03 October 2008, 07:36:52 UTC | git-gui: Fix the blame window shape. On modern high-resolution monitors the blame viewer window is very high, yet too narrow. This patch makes it gravitate to a more sane resolution, which takes the font size into account. It also changes the default text view size to 80% of the window, and slightly modifies the border decorations for better appearance. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:33:21 UTC |
| a910898 | Johannes Sixt | 08 October 2008, 08:03:54 UTC | git-gui: Fix switch statement in lib/merge.tcl 0aea2842 (Make Ctrl-T safe to use for conflicting files) introduced a new case, but forgot the '-' to indicate that it shares the body with the subsequent case label. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 16:31:58 UTC |
| 0b32cab | Petr Baudis | 24 September 2008, 23:39:13 UTC | git-gui: Fix fetching from remotes when adding them As you can see, this particular code branch did not see a lot of testing for some time now. Apologies for that. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:37 UTC |
| 2243ffc | Petr Baudis | 24 September 2008, 23:32:47 UTC | git-gui: Fix removing non-pushable remotes Git-gui does not add most of the remotes to the 'push' menu since they are missing the "Push" line in their remotespec. In that case, removing the remote would end up with an error. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:37 UTC |
| 902e2bb | Petr Baudis | 24 September 2008, 22:12:51 UTC | git-gui: Make input boxes in init/clone/open dialogs consistent Before, the input boxes would not be sunken and would have larger border, which is inconsistent with the rest of the inputboxes for repository locations in the git-gui UI. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 4259568 | Petr Baudis | 24 September 2008, 22:12:50 UTC | git-gui: Avoid using the term URL when specifying repositories Instead, 'Location' is used to label such inputs; in the Clone dialog, 'Source' and 'Target' are also introduced to further clarify the situation. The intent is to increase GUI consistency in the case location templates (upcoming) are used - then, other locators than URL may be used. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| bb4812b | Petr Baudis | 24 September 2008, 22:07:02 UTC | git-gui: gui.autoexplore makes explorer to pop up automatically after picking Especially for Windows users used to work with the Windows Explorer, it is very useful when after picking a repository (either opening a local one or initializing/cloning a new one) in the "intro" window, the explorer view of the working copy pops up along the standard Git GUI window, so that the users can, well, actually work with the repository. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| afd5424 | Petr Baudis | 24 September 2008, 22:05:53 UTC | git-gui: Add Explore Working Copy to the Repository menu Especially when cloning is finished, the Git GUI window pops up, but there is not really much one can do within it - there needs to be a way to easily start exploring and working with the new working copy using the standard system interface: explorer.exe on Windows, open on MacOS/X and xdg-open as a fallback (all modern Linux desktops). This might be also a post-clone option instead (possibly opening the window automagically) but I believe that this might be useful also in other situations, e.g. you don't have to keep the working copy window around if you work in multiple repositories. This operation will not make sense on bare repositories. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 2db21e7 | Petr Baudis | 24 September 2008, 21:57:16 UTC | git-gui: Use git web--browser for web browsing This patch removes git-gui specific webbrowser guessing and instead relies on git web--browser to do the right thing, removing unnecessary code duplication. New function start_browser encapsulates the browser execution, for usage from other parts of code. This will also make git-gui show the documentation menu item even in cases it might not be able to start up a browser, these cases should be however only very rare. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| adcbd43 | Petr Baudis | 24 September 2008, 20:44:03 UTC | git-gui: mkdir -p when initializing new remote repository This allows the user to create repositories with arbitrary paths on the server. The downside is that errorneously typed paths are not caught but instead created remotely; YMMV. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 0d40441 | Petr Baudis | 24 September 2008, 20:44:02 UTC | git-gui: Add support for removing remotes We introduce new submenu Remote -> Remove Remote, allowing to remove remotes. In the future, we might consider a confirmation popup to avoid misclicks, but removing a remote is not very lossy operation. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| ba6485e | Petr Baudis | 24 September 2008, 20:44:01 UTC | git-gui: Add support for adding remotes When a remote is being added, it can also be automatically either fetched or initialized and pushed; this patch adds capability for initializing of local and ssh repositories. This also of course leaves a lot of space for further customization features, like individually turning the initialization phase on/off or tuning attributes of the remote repository; I consider that out of scope of this patch, however. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 8329bd0 | Petr Baudis | 24 September 2008, 20:44:00 UTC | git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu The meat of the routines is now separated to add_fetch_entry() and add_push_entry(). This refactoring will allow easy implementation of adding individual remotes later. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 3c1c2a0 | Petr Baudis | 24 September 2008, 20:43:59 UTC | git-gui: Clarify the Remote -> Delete... action Currently, it was not really clear what all does this perform. We rename "Delete..." to "Delete Branch..." (since this does not delete the remote as a whole) and relabel the window from "Delete Remote Branch" to "Delete Branch Remotely" (since the action also involves pushing the delete out). Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 34785f8 | Johannes Sixt | 30 September 2008, 06:39:29 UTC | git-gui: Remove space from the end of aspell's reply before processing When git gui processes a reply from aspell it explicitly ignores an empty line. The Windows version of aspell, however, terminates lines with CRLF, but TCL's 'gets' does not remove CR, hence, a "visibly" empty line was not actually recognized as empty. With this change we explicitly trim off whitespace before the line is further processed. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:59:18 UTC |
| 0aea284 | Alexander Gavrilov | 30 September 2008, 08:12:16 UTC | git-gui: Make Ctrl-T safe to use for conflicting files. 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 <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 18:47:33 UTC |
| d3bcf55 | Johannes Sixt | 24 September 2008, 19:08:01 UTC | git-gui: Do not automatically stage file after merge tool finishes If a merge tool was invoked on a conflicted file and the tool completed, then the conflicted file was staged automatically. However, the fact that the user closed the merge tool cannot be understood as the unequivocal sign that the conflict was completely resolved. For example, the user could have decided to postpone the resolution of the conflict, or could have accidentally closed the tool. We better leave the file unstaged and let the user stage it explicitly. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 18:40:48 UTC |
| ed70e4d | Shawn O. Pearce | 26 September 2008, 14:44:40 UTC | git-gui: Show/hide "Sign Off" based on nocommitmsg option If citool --nocommit is invoked we hide the Sign Off features, as the commit message area is not editable. But we really want the selection tied to the message area's editing ability. Suggested-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2008, 14:44:40 UTC |
| 30ef1d8 | Shawn O. Pearce | 26 September 2008, 14:07:40 UTC | Merge branch 'maint' | 26 September 2008, 14:07:40 UTC |
| dd87558 | Gustaf Hendeby | 25 September 2008, 21:31:22 UTC | git-gui: Help identify aspell version on Windows too On windows, git gui fails to correctly extract the aspell version (experienced with aspell version 0.50.3) due to scilent white space at the end of the version string. Trim the obtained version string to work around this. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2008, 14:07:34 UTC |
| 3e34838 | Alexander Gavrilov | 20 September 2008, 08:19:18 UTC | git-gui: Reenable staging unmerged files by clicking the icon. This restores functionality of the file icon for unmerged files. Safety is enforced by loading the diff and checking for lines that look like conflict markers. If such lines are found, or the conflict involves deletion and/or symlinks, a confirmation dialog is presented. Otherwise, the icon immediately stages the working copy version of the file. Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca (Restore ability to Stage Working Copy for conflicts) Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:51:43 UTC |
| 6fc835a | Alexander Gavrilov | 17 September 2008, 21:07:36 UTC | git-gui: Support the encoding menu in gui blame. Allow dynamically changing the encoding from the blame viewer as well. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:32 UTC |
| a1c3feb | Alexander Gavrilov | 17 September 2008, 21:07:35 UTC | git-gui: Optimize encoding name resolution using a lookup table. Encoding menu construction does almost a hundred of encoding resolutions, which with the old implementation led to a small but noticeable delay. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:32 UTC |
| 3fe0162 | Alexander Gavrilov | 17 September 2008, 21:07:34 UTC | git-gui: Allow forcing display encoding for diffs using a submenu. Add a submenu to allow dynamically changing the encoding to use for diffs. Encoding settings are remembered while git-gui runs. The rules are: 1) Encoding set for a specific file overrides gitattributes. 2) Last explicitly set value of the encoding overrides gui.encoding Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:32 UTC |
| 50102c5 | Alexander Gavrilov | 17 September 2008, 21:07:33 UTC | git-gui: Add a menu of available encodings. To make encoding selection easier, add a menu that lists available encodings to the Options window. Menu structure is borrowed from Firefox. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:32 UTC |
| 72e6b00 | Alexander Gavrilov | 17 September 2008, 21:07:32 UTC | git-gui: Cleanup handling of the default encoding. - Make diffs and blame default to the system (locale) encoding instead of hard-coding UTF-8. - Add a gui.encoding option to allow overriding it. - gitattributes still have the final word. The rationale for this is Windows support: 1) Windows people are accustomed to using legacy encodings for text files. For many of them defaulting to utf-8 will be counter-intuitive. 2) Windows doesn't support utf-8 locales, and switching the system encoding is a real pain. Thus the option. This patch also adds proper encoding conversion to Apply Hunk/Line. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:32 UTC |
| 696235c | Shawn O. Pearce | 23 January 2008, 05:39:50 UTC | git-gui: Assume `blame --incremental` output is in UTF-8 Most commits have author name encoded in UTF-8, but the incremental blame output dumps raw bytes and doesn't give us the encoding header from the commit. Rather than fixing up tooltip data after we have viewed that particular commit in the blame viewer we can assume all names are in UTF-8. This is still going to cause problems when the author name is not encoded in UTF-8, but the only (efficient) way to solve that is to add an "encoding" header to the blame --incremental mode output, as otherwise we need to run `git cat-file commit $sha1` for each and every commit identified and that would be horribly expensive on any platform. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:31 UTC |
| 1ffca60 | Shawn O. Pearce | 23 January 2008, 05:37:10 UTC | git-gui: Use gitattribute "encoding" for file content display Most folks using git-gui on internationalized files have complained that it doesn't recognize UTF-8 correctly. In the past we have just ignored the problem and showed the file contents as binary/US-ASCII, which is wrong no matter how you look at it. This really should be a per-file attribute, managed by .gitattributes, so we now pull the "encoding" attribute data for the given path from the .gitattributes (if available) and use that, falling back to UTF-8 if the attributes are unavailable, git-check-attr is broken, or an encoding for this path not specified. We apply the encoding anytime we show file content, which currently is limited to only the diff viewer and the blame viewer. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:48:31 UTC |
| 2cd1fd1 | Joshua Williams | 24 September 2008, 19:11:53 UTC | git-gui: Add support for calling out to the prepare-commit-msg hook Signed-off-by: Joshua Williams <joshua.williams@qlogic.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 19:43:00 UTC |
