| 4498b3a | Pat Thoyts | 18 April 2015, 11:15:32 UTC | git-gui: set version 0.20 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:15:32 UTC |
| 5a5c11f | Peter Krefting | 27 March 2015, 09:25:32 UTC | git-gui: sv.po: Update Swedish translation (547t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:03:50 UTC |
| de18648 | Alexander Shopov | 07 April 2015, 15:29:46 UTC | git-gui i18n: Updated Bulgarian translation (547t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 10:51:39 UTC |
| 83da013 | Remi Rampin | 06 March 2015, 16:21:53 UTC | git-gui: Makes chooser set 'gitdir' to the resolved path If _is_git follows a "gitdir: ..." file link to get to the actual repository, we want _gitdir to be set to that final path. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Remi Rampin <remirampin@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 March 2015, 12:29:03 UTC |
| cc6825e | Remi Rampin | 06 March 2015, 16:21:52 UTC | git-gui: Fixes chooser not accepting gitfiles Support the case where .git is a platform independent symbolic link and not a directory. This occurs when --separate-git-dir is used when creating the local repository to store the .git directory elsewhere. git-gui does not support such repositories when using the repository chooser as the test to determine that the chosen directory is a git repository fails for such repositories. This commit enables _is_git to read the real location from the symbolic link file. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Remi Rampin <remirampin@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 March 2015, 12:28:58 UTC |
| ce3e848 | Kyle J. McKay | 06 January 2015, 10:41:21 UTC | git-gui: reinstate support for Tcl 8.4 Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Since only Tcl 8.4 is required this presents a problem. The extended syntax was used starting with Git 2.0.0 in commit b3f0c5c0 (git-gui: tolerate major version changes when comparing the git version, 2014-05-17), so that a major version change would still satisfy the condition. However, what we really want is just a basic version compare, so use vcompare instead to restore compatibility with Tcl 8.4. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 January 2015, 00:42:03 UTC |
| a117fa2 | Csaba Kiraly | 15 December 2014, 15:38:00 UTC | git-gui: fix problem with gui.maxfilesdisplayed gui.maxfilesdisplayed (added in dd6451f9c7c5a36d3006231b618ac6da06c7c7b4) was applied brute force on the file list in alphabetic order. As a result, files that had modifications might not be displayed by git-gui. Even worse, files that are already in the index might not be displayed, which makes git-gui hard to use in some workflows. This fix changes the meaning of gui.maxfilesdisplayed, making it a soft limit that only applies to "_O" files, i.e. files that are "Untracked, not staged". Signed-off-by: Csaba Kiraly <kiraly@disi.unitn.it> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 January 2015, 16:13:25 UTC |
| cdc6aba | Pat Thoyts | 07 November 2014, 00:37:28 UTC | git-gui: fix verbose loading when git path contains spaces. After setting GITGUI_VERBOSE to enable load tracing the source command is redefined but fails if the git installation path has spaces. Fixed quoting by using lists to handle the arguments. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 November 2014, 00:37:28 UTC |
| 3b422bc | Sebastian Schuberth | 23 October 2014, 19:30:54 UTC | git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows Windows does not necessarily mean Cygwin, it could also be MSYS. The latter ships with a version of "kill" that does not understand "-f". In msysgit this was addressed shipping Cygwin's version of kill. Properly fix this by using the stock Windows "taskkill" command instead, which is available since Windows XP Professional. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 November 2014, 22:13:32 UTC |
| a43c5f5 | Michael Lutz | 12 February 2012, 15:55:17 UTC | git-gui: add configurable tab size to the diff view For Tk 8.5 the "wordprocessor" mode allows us to get a bit fancy for merge diffs and intend the tabs by one to compensate for the additional diff marker at the line start. The code is heavily based on how gitk handles tabs. Signed-off-by: Michael Lutz <michi@icosahedron.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 October 2014, 09:34:52 UTC |
| a3b3ae3 | David Turner | 21 July 2014, 20:41:38 UTC | git-gui: Make git-gui lib dir configurable at runime Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui where to look for TCL libs. This allows a git-gui which has been built with a prefix of /foo to be run out of directory /bar. This is the equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL libraries. Signed-off-by: David Turner <dturner@twitter.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 August 2014, 11:48:28 UTC |
| 8871820 | Alexander Shopov | 08 August 2014, 06:10:03 UTC | git-gui i18n: Updated Bulgarian translation (520t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 August 2014, 11:27:30 UTC |
| df7369f | Pat Thoyts | 29 June 2014, 11:59:15 UTC | Merge remote-tracking branch 'vnwildman/master' | 29 June 2014, 11:59:15 UTC |
| bf00fa1 | Trần Ngọc Quân | 28 June 2014, 00:10:58 UTC | L10n: vi.po (543t): Init translation for Vietnamese * Pickup pot file then msginit from it Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com> | 28 June 2014, 00:10:58 UTC |
| 41a5f0b | Pat Thoyts | 13 June 2014, 18:38:28 UTC | git-gui: align the new recursive checkbox with the radiobuttons. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 June 2014, 18:38:28 UTC |
| 2202b8b | Henri GEIST | 11 March 2014, 18:21:01 UTC | git-gui: Add a 'recursive' checkbox in the clone menu. Permit to do a 'git clone --recursive' through git-gui. Add a 'recursive' checkbox in the clone menu which allows users to clone a repository and all its submodules in one go (unless the 'update' flag is set to "none" in the .gitmodules file for a submodule, in that case that specific submodule is not cloned automatically). Enable this new option per default, as most users want to clone all submodules too when cloning the superproject (This is currently not possible without leaving git gui or adding a custom tool entry for that). Signed-off-by: Henri GEIST <geist.henri@laposte.net> Thanks-to: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 June 2014, 18:12:52 UTC |
| 3decb8e | Jens Lehmann | 17 May 2014, 19:49:05 UTC | git-gui: tolerate major version changes when comparing the git version Since git 2.0.0 starting git gui in a submodule using a gitfile fails with the following error: No working directory ../../../<path> couldn't change working directory to "../../../<path>": no such file or directory This is because "git rev-parse --show-toplevel" is only run when git gui sees a git version of at least 1.7.0 (which is the version in which the --show-toplevel option was introduced). But "package vsatisfies" returns false when the major version changes, which is not what we want here. Fix that for both places where the git version is checked using vsatisfies by appending a '-' to the version number. This tells vsatisfies that a change of the major version is not considered to be a problem, as long as the new major version is larger. This is done for both the place that caused the reported bug and another spot where the git version is tested for another feature. Reported-by: Chris Packham <judge.packham@gmail.com> Reported-by: Yann Dirson <ydirson@free.fr> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> | 13 June 2014, 18:03:48 UTC |
| e0db1dd | Jens Lehmann | 08 April 2014, 19:30:51 UTC | git-gui: show staged submodules regardless of ignore config Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to "all" suppresses all output of submodule changes for git-gui. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it manually this change won't show up under "Staged Changes (Will Commit)". Fix that by using the '--ignore-submodules=dirty' option for both callers of "git diff-index --cached" when the underlying git version supports that option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 June 2014, 17:27:33 UTC |
| 1b2c79e | Pat Thoyts | 18 January 2014, 17:29:34 UTC | git-gui 0.19 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 17:29:34 UTC |
| c64a0ad | Jonathan Nieder | 25 November 2013, 21:01:05 UTC | git-gui: chmod +x po2msg, windows/git-gui.sh The Makefile only runs po/po2msg.sh using tclsh, but because the script has the usual tcl preamble starting with #!/bin/sh it can also be run directly. The Windows git-gui wrapper is usable in-place for the same reason. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 17:06:41 UTC |
| 02f6cfb | Max Kirillov | 14 January 2014, 23:58:09 UTC | git-gui: fallback right pane to packed widgets with Tk 8.4 Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that tk < 8.5 does not support -stretch option for panedwindow. Without the option it's not possible to properly expand the right half - the commit area is expanded, while desired behavior is to expand the diff area. So the whole feature should be disabled with Tk version less than 8.5. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 16:51:15 UTC |
| 1ea11f0 | Alexander Shopov | 15 January 2014, 11:07:56 UTC | git-gui i18n: Added Bulgarian translation Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 16:32:13 UTC |
| 15a7453 | Alexander Shopov | 15 January 2014, 11:07:57 UTC | git-gui l10n: Add 29 more terms to glossary Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 16:32:09 UTC |
| 99337ef | Alexander Shopov | 15 January 2014, 11:07:55 UTC | git-gui i18n: Initial glossary in Bulgarian Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 January 2014, 16:32:04 UTC |
| 73fd416 | Masanari Iida | 12 November 2013, 15:17:44 UTC | git-gui: correct spelling errors in comments Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 November 2013, 20:44:08 UTC |
| 224cce8 | Pat Thoyts | 12 September 2013, 20:15:19 UTC | git-gui: add menu item to launch a bash shell on Windows. When using git-gui as the primary git application on Windows it can be awkward obtaining a suitable shell. This commit adds a menu item to the Repository menu that launches the bash shell provided with the git installation on Windows. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 12 September 2013, 20:15:19 UTC |
| 4394faf | John Murphy | 04 September 2013, 15:03:48 UTC | git-gui: corrected setup of git worktree under cygwin. Under cygwin the _gitworktree variable needs to contain the Windows style path string so the output provided by git rev-parse must be converted from cygwin path style to native. Reviewed-by: Jesse Welch <jesse.welch@baml.com> Signed-off-by: John Patrick Murphy <john.murphy@baml.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 September 2013, 21:42:07 UTC |
| 918dbf5 | Max Kirillov | 21 August 2013, 03:38:40 UTC | git-gui: right half window is paned For long descriptions it would be nice to be able to resize the comment text field. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 August 2013, 19:06:43 UTC |
| e632b3c | Max Kirillov | 21 August 2013, 03:29:13 UTC | git-gui: Add gui.displayuntracked option When git is used to track only a subset of a directory, or there is no sure way to divide files to ignore from files to track, git user have to live with large number of untracked files. These files present in file list, and should always be scrolled through to handle real changes. Situation can become even worse, then number of the untracked files grows above the maxfilesdisplayed limit. In the case, even staged can be hidden by git-gui. This change introduces new configuration variable gui.displayuntracked, which, when set to false, instructs git-gui not to show untracked files in files list. They can be staged from commandline or other tools (like IDE of file manager), then they become visible. Default value of the option is true, which is compatible with current behavior. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 August 2013, 19:06:42 UTC |
| d478056 | Pat Thoyts | 27 August 2013, 10:11:15 UTC | git-gui: show the maxrecentrepo config option in the preferences dialog Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 August 2013, 19:06:42 UTC |
| a865604 | Pat Thoyts | 10 July 2013, 12:31:13 UTC | git-gui: added gui.maxrecentrepo to extend the number of remembered repos The list of recently opened repositories shown when launching git-gui from outside a repository was hard coded to only show a maximum of 10 items. This config variable allows the user to override this default. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 August 2013, 19:06:41 UTC |
| 317797b | Mads Dørup | 21 July 2013, 12:23:48 UTC | git-gui: Improve font rendering on retina macbooks Signed-off-by: Mads Dørup <mads@dorup.dk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 August 2013, 19:06:40 UTC |
| 8a383db | Pat Thoyts | 15 June 2013, 22:53:34 UTC | git-gui 0.18 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 June 2013, 22:53:34 UTC |
| 5c37033 | Pat Thoyts | 15 June 2013, 22:36:27 UTC | git-gui: avoid an error message when removing the last remote When the last remote is removed on a system that has tearoff menu items the code that adjusts the fetch and prune menus may raise an error when probing the menu entry for a non-existing -label option. Check the entry type to avoid this fault. Reported-by: Vedran Miletić <rivanvx@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 June 2013, 22:36:27 UTC |
| 2f38dd0 | John Keeping | 27 April 2013, 13:24:16 UTC | git-gui: fix file name handling with non-empty prefix Commit e3d06ca (git-gui: Detect full path when parsing arguments - 2012-10-02) fixed the handling of absolute paths passed to the browser and blame subcommands by checking whether the file exists without the prefix before prepending the prefix and checking again. Since we have chdir'd to the top level of the working tree before doing this, this does not work if a file with the same name exists in a subdirectory and at the top level (for example Makefile in git.git's t/ directory). Instead of doing this, revert that patch and fix absolute path issue by using "file join" to prepend the prefix to the supplied path. This will correctly handle absolute paths by skipping the prefix in that case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 June 2013, 22:03:29 UTC |
| 7d2017e | Stefan Haller | 06 June 2013, 08:17:47 UTC | git-gui: bring wish process to front on Mac On Mac OS X, any application that is started from the Terminal will open behind all running applications; as a work-around, manually bring ourselves to the front. (Stolen from gitk, commit 76bf6ff93e.) We do this as the very first thing, so that any message boxes that might pop up during the rest of the startup sequence are actually seen by the user. [PT: added catch and moved down to ensure Tk has been loaded] Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 June 2013, 00:34:42 UTC |
| ed05e9f | Pat Thoyts | 17 May 2013, 09:51:01 UTC | git-gui: change dialog button positions for Windows to suit platform. On windows it is more common to have cancel furthest on the right. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 May 2013, 09:51:01 UTC |
| 1fcd24d | Heiko Voigt | 09 May 2013, 16:30:02 UTC | git-gui: allow "\ No newline at end of file" for linewise staging Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss <tobias.preuss@googlemail.com> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 16 May 2013, 22:40:59 UTC |
| 60468d6 | Pat Thoyts | 22 February 2013, 20:13:21 UTC | git-gui: fix the mergetool launcher for the Beyond Compare tool. When using Beyond Compare as the mergetool it fails to save the merged result correctly due to a quoting problem when executing the tool. This patch solves the quoting problem. Signed-off-by: Warren Falk <warren@warrenfalk.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 22 February 2013, 20:13:21 UTC |
| 9f31646 | Christian Couder | 18 December 2012, 18:47:20 UTC | Makefile: replace "echo 1>..." with "echo >..." This is clearer to many people this way. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 25 December 2012, 00:21:59 UTC |
| ab571ef | Grahack | 28 November 2012, 14:49:43 UTC | French translation: copy -> copie. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 November 2012, 21:29:21 UTC |
| 552ee61 | Kirill Smelkov | 13 November 2012, 12:30:17 UTC | git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree> Commit e3d06ca9 (git-gui: Detect full path when parsing arguments) broke git gui blame rev path-not-present-in-worktree in particular this does not work anymore: # in linux.git $ git gui blame 2bb8c26242c2393b097a993ffe9b003ec9b85395 drivers/net/sky2.c This patch restores the original functionality in this case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 November 2012, 23:52:14 UTC |
| f6dd784 | Pat Thoyts | 17 October 2012, 20:57:29 UTC | git-gui 0.17 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:57:29 UTC |
| df46eda | Andrew Wong | 02 October 2012, 16:25:15 UTC | git-gui: Don't prepend the prefix if value looks like a full path When argument parsing fails to detect a file name, "git-gui" will try to use the previously detected "head" as the file name. We should avoid prepending the prefix if "head" looks like a full path. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:47:50 UTC |
| e3d06ca | Andrew Wong | 02 October 2012, 16:25:14 UTC | git-gui: Detect full path when parsing arguments When running "git-gui blame" from a subfolder (which means prefix is non-empty), if we pass a full path as argument, the argument parsing will fail to recognize the argument as a file name, because prefix is prepended to the argument. This patch handles that scenario by adding an additional branch that checks the file name without using the prefix. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:47:49 UTC |
| 5a5e4d2 | Beat Bolli | 18 August 2012, 20:28:00 UTC | git-gui: remove .git/CHERRY_PICK_HEAD after committing Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 September 2012, 10:59:05 UTC |
| 9ef7508 | Beat Bolli | 18 August 2012, 20:24:00 UTC | git-gui: Fix a loose/lose mistake Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 September 2012, 10:53:37 UTC |
| 44e88ce | Vitaly _Vi Shukela | 14 September 2012, 23:36:41 UTC | git-gui: Fix semi-working shortcuts for unstage and revert Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding. They were working only when one area was focused (diff or commit message), now they should work everywhere. Acked-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 September 2012, 08:23:35 UTC |
| 272b929 | Pat Thoyts | 19 June 2012, 20:34:11 UTC | Merge branch 'rt/trans' | 19 June 2012, 20:34:11 UTC |
| 1a8cdac | Ralf Thielow | 19 June 2012, 18:25:41 UTC | git-gui: de.po: translate "remote" as "extern" According to the translation in git-core, we translate "remote" as "extern". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 June 2012, 20:31:14 UTC |
| 774b79f | Ralf Thielow | 19 June 2012, 18:25:40 UTC | git-gui: de.po: translate "bare" as "bloß" According to the translation in git-core, we translate "bare" as "bloß". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 June 2012, 20:31:14 UTC |
| 3c3737d | Ralf Thielow | 19 June 2012, 18:25:39 UTC | git-gui: de.po: consistently add untranslated hook names within braces The user might not really know what hook is actually meant if it's translated. To avoid such a confusion we should consistently write it untranslated within braces after. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 June 2012, 20:31:14 UTC |
| fda1ba0 | Pat Thoyts | 19 April 2012, 10:19:58 UTC | git-gui: preserve commit messages in utf-8 The commit message buffer is automatically preserved to a local file but this uses the system encoding which may fail to properly encode unicode text. Forcing this file to use utf-8 preserves the message correctly. Reported-by: Ángel José Riesgo <ajriesgo@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 April 2012, 13:07:39 UTC |
| c42939d | Heiko Voigt | 23 March 2012, 17:46:27 UTC | git-gui: open console when using --trace on windows When starting a gui program on windows stdout, stderr and stdin are not connected to the cmd console. As a workaround tk has a console window. Lets open this when the --trace commandline option has been given. This is helpful for debugging. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 25 March 2012, 12:24:14 UTC |
| ef42057 | Benjamin Kerensa | 06 March 2012, 01:53:23 UTC | git-gui: fix a typo in po/ files "succeeded" was misspelled in the code, which propagated throughout the translations. Fixed all of them. Signed-off-by: Benjamin Kerensa <bkerensa <at> ubuntu.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 March 2012, 23:25:34 UTC |
| 446f822 | Marcus Karlsson | 09 March 2012, 23:17:22 UTC | git-gui: Use PWD if it exists on Mac OS X The current working directory is set to / when git-gui is invoked using the Git Gui.app bundle on Mac OS X. This means that if it is launched from a directory which contains a repository then git-gui won't automatically find it unless the repository happens to be located in /. The PWD environment variable is however preserved if the bundle is invoked using open(1). If git-gui would check for PWD then a user could for example type open -a 'Git Gui' on a command line in order to launch the program and it would automatically find the repository. Teach git-gui to use the PWD environment variable on Mac OS X. Signed-off-by: Marcus Karlsson <mk@acc.umu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 March 2012, 23:16:24 UTC |
| ba5d445 | Clemens Buchacher | 21 January 2012, 17:57:28 UTC | git-gui: fix git-gui crash due to uninitialized variable Recently, a clone initiated via git gui on Windows crashed on me due to an "unknown variable cdone". It turns out that there is a code path where this variable is used uninitialized. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 22 January 2012, 23:16:03 UTC |
| 942e6ba | Pat Thoyts | 13 December 2011, 23:44:30 UTC | git-gui 0.16 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 December 2011, 23:44:30 UTC |
| 7d076d5 | Pat Thoyts | 09 December 2011, 15:14:32 UTC | git-gui: handle shell script text filters when loading for blame. When loading a file into the blame window git-gui does all the work and must handle the text conversion filters if defined. On Windows it is necessary to detect the need for a shell script explicitly. Such filter commands are run using non-blocking I/O but this has the unfortunate side effect of losing any error that might be reported when the pipe is closed. Switching to blocking mode just before closing enables reporting of errors in the filter scripts to the user. Tested-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 09 December 2011, 15:14:32 UTC |
| 215d4fd | Samuel Bronson | 07 December 2011, 12:48:04 UTC | git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. It would be better if the 32x32 icon was equivalent to the one used on Windows (in git-gui.ico), but I'm not sure how that would best be done, so I copied this code from gitk instead. Signed-off-by: Samuel Bronson <naesten@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 December 2011, 12:48:34 UTC |
| af86768 | Pat Thoyts | 29 November 2011, 09:27:17 UTC | git-gui: added config gui.gcwarning to disable the gc hint message On startup in multicommit mode git-gui checks to see if the repository has a lot of objects. If so it shows a dialog suggesting gc be run. This adds 'gui.gcwarning' as a control config variable to allow this to be disabled. The default is true (the warning is shown). Setting this false will prevent the check being done. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 November 2011, 14:37:26 UTC |
| 6f01e20 | Pat Thoyts | 30 November 2011, 11:35:28 UTC | git-gui: set whitespace warnings appropriate to this project Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 November 2011, 11:35:28 UTC |
| d8d166b | Bert Wesarg | 22 October 2011, 19:39:40 UTC | git-gui: don't warn for detached head when rebasing Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 November 2011, 00:39:04 UTC |
| f49517a | Bert Wesarg | 22 October 2011, 19:39:39 UTC | git-gui: make config gui.warndetachedcommit a boolean Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 November 2011, 00:39:03 UTC |
| 54531e7 | Tilman Vogel | 21 January 2011, 10:59:45 UTC | git-gui: add config value gui.diffopts for passing additional diff options Signed-off-by: Tilman Vogel <tilman.vogel@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 November 2011, 00:38:01 UTC |
| 3f2fb17 | Pat Thoyts | 19 November 2010, 22:22:20 UTC | git-gui: sort the numeric ansi codes This ensures that underline does not conflict with inverse colors. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 04 November 2011, 16:16:54 UTC |
| 9af6413 | Pat Thoyts | 19 November 2010, 10:00:49 UTC | git-gui: support underline style when parsing diff output Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 04 November 2011, 16:16:52 UTC |
| 4198579 | Dejan Ribič | 30 October 2011, 17:18:44 UTC | git-gui: fix spelling error in sshkey.tcl Spelling error originally reported to Ubuntu as launchpad bug #879427. Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Dejan Ribič <dejan.ribic@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 31 October 2011, 08:58:18 UTC |
| 95fa862 | Bert Wesarg | 20 October 2011, 19:32:30 UTC | git-gui: include the file path in guitools confirmation dialog For those guitools that require a filename, display this filename when asking the user to confirm the tool launch. [PT: modified to use positional parameters for i18n] Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 21 October 2011, 22:15:10 UTC |
| ff3f01b | Bert Wesarg | 20 October 2011, 19:30:30 UTC | git-gui: span widgets over the full file output area in the blame view Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 21 October 2011, 21:28:27 UTC |
| f9ace9e | Bert Wesarg | 20 October 2011, 19:27:27 UTC | git-gui: use a tristate to control the case mode in the searchbar The config is now called gui.search.case and can have the three values: no/yes/smart. yes is the default. It also resets the case detection in smart mode, when the entry field was cleared by the use. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 21 October 2011, 21:28:23 UTC |
| 508dee3 | Pat Thoyts | 19 October 2011, 13:26:29 UTC | git-gui: set suitable extended window manager hints. This patch uses recent Tk attributes support to specify the intended use of new toplevels by setting the correct EWMH hint. This helps modern window managers to apply sensible decoration for the tooltip and dialogs. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 October 2011, 13:26:29 UTC |
| 80e6667 | Bert Wesarg | 23 November 2010, 07:37:50 UTC | git-gui: fix display of path in browser title Ensure the browser path is shown on the title with a / suffix and escape any backslashes or newlines in path elements before display. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 October 2011, 13:13:15 UTC |
| ae6ec61 | Pat Thoyts | 19 October 2011, 12:35:30 UTC | Merge branch 'bw/searching' | 19 October 2011, 12:35:30 UTC |
| 8eaf24b | Pat Thoyts | 19 October 2011, 12:29:52 UTC | git-gui: enable the smart case sensitive search only if gui.search.smartcase is true Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 October 2011, 12:29:52 UTC |
| b66f4f7 | Pat Thoyts | 19 October 2011, 12:22:33 UTC | git-gui: catch invalid or complete regular expressions and treat as no match. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 October 2011, 12:22:33 UTC |
| 3592767 | Pat Thoyts | 19 October 2011, 11:44:39 UTC | git-gui: theme the search and line-number entry fields on blame screen Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 October 2011, 11:44:39 UTC |
| 99665fc | Pat Thoyts | 18 October 2011, 08:32:22 UTC | git-gui: include the number of untracked files to stage when asking the user Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:44:10 UTC |
| bb196e2 | Bert Wesarg | 14 October 2011, 19:25:21 UTC | git-gui: new config to control staging of untracked files The default is the current "ask". Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:44:10 UTC |
| 526aa2b | Bert Wesarg | 14 October 2011, 19:25:20 UTC | git-gui: use "untracked" for files which are not known to git "untracked" is the right phrase for files new to git. For example git-status uses this phrase. Also make the question shorter. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:44:10 UTC |
| b020bbd | Bert Wesarg | 14 October 2011, 19:25:19 UTC | git-gui: fix unintended line break in message string Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:44:10 UTC |
| 1159971 | Bert Wesarg | 14 October 2011, 08:14:52 UTC | git-gui: add search history to searchbar Use the up/down keys to browse the history. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:27:28 UTC |
| e9144d5 | Bert Wesarg | 14 October 2011, 08:14:51 UTC | git-gui: add regexp search mode to the searchbar It's off by default, but can be enabled via the config gui.search.regexp. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:27:28 UTC |
| 0a0243d | Bert Wesarg | 14 October 2011, 08:14:50 UTC | git-gui: add smart case search mode in searchbar Setting config gui.search.smartcase to true, the search mode in the searchbar (from the blame view) is by default case-insensitive. But entering an upper case letter into the search field activates the case- sensitive search mode. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:27:28 UTC |
| 12b219f | Bert Wesarg | 14 October 2011, 08:14:49 UTC | git-gui: handle config booleans without value When git interprets a config variable without a value as bool it is considered as true. But git-gui doesn't so until yet. The value for boolean configs are also case-insensitive. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:27:28 UTC |
| a8ca786 | Bert Wesarg | 14 October 2011, 08:19:26 UTC | git-gui: fix multi selected file operation When staging a selection of files using Shift-Click to choose a range of files then using Ctrl-T or the Stage To Commit menu item will stage all the selected files. However if a non-sequential range is selected using Ctrl-Click then all but the first name selected gets staged. This commit fixes this to properly stage all selected files by explicitly adding the path to the list before showing the diff. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 October 2011, 08:10:51 UTC |
| 843d659 | Bert Wesarg | 13 October 2011, 13:48:15 UTC | git-gui: incremental goto line in blame view The view jumps now to the given line number after each key press. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 October 2011, 22:14:13 UTC |
| 81a92e5 | Bert Wesarg | 13 October 2011, 13:48:13 UTC | git-gui: clear the goto line input when hiding Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 October 2011, 22:14:13 UTC |
| 5925210 | Bert Wesarg | 13 October 2011, 13:48:14 UTC | git-gui: only accept numbers in the goto-line input Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 October 2011, 22:13:32 UTC |
| e0e0a6c | Bert Wesarg | 13 October 2011, 13:48:12 UTC | git-gui: search and linenumber input are mutual exclusive in the blame view It was possible to open the search input (Ctrl+S) and the goto-line input (Ctrl+G) at the same time. Prevent this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 October 2011, 08:13:33 UTC |
| 856c2d7 | Heiko Voigt | 27 May 2011, 15:40:24 UTC | git-gui: deal with unknown files when pressing the "Stage Changed" button As a shortcut the "Stage Changed" button can be used to stage all current changes in the worktree which are not set to ignore. Previously unknown files would be ignored. The user might want to say: "Just save everything in my worktree". To support this workflow we now ask whether the user also wants to stage the unknown files if there are some present. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 October 2011, 22:20:16 UTC |
| 29776c7 | Pat Thoyts | 19 July 2011, 14:33:34 UTC | git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. The 'n' binding should cause the next match to be selected but results in the search field gaining focus and additional 'n's being appended. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 July 2011, 14:33:34 UTC |
| af9a462 | David Fries | 16 July 2011, 16:59:45 UTC | git-gui: Add keyboard shortcuts for search and goto commands in blame view. Use forward-slash or Control-S to bring up the search dialog. In the blame view, Enter or 'n' jump to the next selected region while Shift-Enter or Shift-n will jump to the previous selected region. Within the search control, hitting Enter will now jump to the next matching region. Signed-off-by: David Fries <David@Fries.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 July 2011, 14:31:29 UTC |
| 9a483e5 | David Fries | 17 July 2011, 01:47:14 UTC | git-gui: Enable jumping to a specific line number in blame view. This patch adds a goto control similar to the search control currently available. The goto control permits the user to specify a line number to jump to. When in blame, Control-G is bound to display this control. Signed-off-by: David Fries <David@Fries.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 July 2011, 14:31:24 UTC |
| 768e300 | Pat Thoyts | 11 July 2011, 12:55:38 UTC | Fix tooltip display with multiple monitors on windows. On Windows the position of a window may be negative on a monitor to the left of the primary display. A plus sign is used as the separator between the width and height and the positional parts of the geometry so always include the plus sign even for negative positions on this platform. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 11 July 2011, 12:55:38 UTC |
| c5c45e1 | Dmitry Ivankov | 16 June 2011, 12:22:39 UTC | Fix typo: existant->existent This typo was discovered in core git sources. Clean in it up in git-gui too. There is just one occurence in a comment line. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 11 July 2011, 10:26:47 UTC |
| 8c0bf68 | Pat Thoyts | 31 March 2011, 15:24:36 UTC | git-gui: updated translator README for current procedures. We do not have a mob branch and the i18n fork is no longer used. Suggest translators simply send patches as per other contributors. Reported-by: Rodrigo Rosenfeld <rr.rosas@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 11 July 2011, 10:26:46 UTC |
| e34789c | Heiko Voigt | 15 February 2011, 19:43:54 UTC | git-gui: warn when trying to commit on a detached head The commandline is already warning when checking out a detached head. Since the only thing thats potentially dangerous is to create commits on a detached head lets warn in case the user is about to do that. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 20 May 2011, 21:49:15 UTC |
| 1cac41f | Christoffer Pettersson | 16 May 2011, 09:36:00 UTC | git-gui: Corrected a typo in the Swedish translation of 'Continue' Reported-by: Christoffer Pettersson <corgrath@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 16 May 2011, 09:36:00 UTC |
| fbc9629 | Pat Thoyts | 25 March 2011, 08:26:47 UTC | Merge branch 'ss/git-gui-mergetool' | 25 March 2011, 08:26:47 UTC |
