| 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 |
| 35b6f72 | Pat Thoyts | 18 February 2011, 13:42:54 UTC | git-gui: detect the use of MUI langauge packs on Windows The Tcl msgcat package doesn't detect the use of a multi-lingual language pack on Windows 7. This means that a user may have their display language set to Japanese but the system installed langauge was English. This patch reads the relevent registry key to fix this before loading in the locale specific parts of git-gui. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 25 March 2011, 08:26:31 UTC |
| f3768a6 | Sebastian Schuberth | 26 February 2011, 10:52:17 UTC | mergetool--lib: Add Beyond Compare 3 as a tool Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 08:47:34 UTC |
| 0e0f450 | Sebastian Schuberth | 26 February 2011, 10:51:14 UTC | mergetool--lib: Sort tools alphabetically for easier lookup Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 08:47:13 UTC |
| 4c2519e | Heiko Voigt | 22 February 2011, 19:30:21 UTC | git-gui: fetch/prune all entry appears last The user might have got used to the order the remotes appeared previously. Lets add the all entry last so the all entry does not confuse previous users. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Tested-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 February 2011, 00:11:50 UTC |
| 4bfa250 | Heiko Voigt | 22 February 2011, 19:28:36 UTC | git-gui: fetch/prune all entry only for more than one entry In case there is only one remote a fetch/prune all entry is redundant. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Tested-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 February 2011, 00:11:45 UTC |
| ba44692 | Pat Thoyts | 15 February 2011, 00:20:36 UTC | git-gui: Include version check and test for tearoff menu entry The --all option for git fetch was added in v1.6.6 so ensure we have a usable version before adding the menu items. Sometimes people use tearoff menus and these offset the entry indices by one. Acked-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 15 February 2011, 00:20:36 UTC |
| 69e21b8 | Heiko Voigt | 13 February 2011, 13:57:15 UTC | git-gui: teach fetch/prune menu to do it for all remotes The commandline fetch already has this option for some time. Since this was not available at the time git gui was written lets implement it now. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 February 2011, 12:15:36 UTC |
| e8db403 | Heiko Voigt | 13 February 2011, 13:50:38 UTC | git-gui: refactor remote submenu creation into subroutine Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 February 2011, 12:10:54 UTC |
| 9d04278 | Heiko Voigt | 12 February 2011, 16:44:58 UTC | git-gui: always default to the last merged branch in remote delete This is useful if you are directly working together with other developers pushing feature branches on a shared remote. You typically push feature branches to the remote so others can review. Once they are satisfied and the branch is merged into the main branch it needs to be deleted on the server. Since we did not yet have a preselected default branch in the remote delete dialog lets use the last merged branch if it is found on the server. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 February 2011, 00:47:24 UTC |
| 8b92658 | Heiko Voigt | 12 February 2011, 16:43:44 UTC | git-gui: fix deleting item from all_remotes variable lsearch and lreplace both take the variable content as argument and not just their name. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 February 2011, 00:47:19 UTC |
| df12813 | Heiko Voigt | 06 February 2011, 17:22:46 UTC | git-gui: instead of defaulting to home directory use working directory When starting git gui in a non-git directory it presents the user a dialog which asks to create, clone or open a repository. The filedialogs used to choose the path(s) would always default to the home directory of the user. This patch changes this behavior and uses the current working directory in which git gui was started as default. This is useful in various cases. First being that the user starts the gui in some directory and can go search to create, open or clone a repository from there. Another use case is that tools like filemanager context menues can transport a natural default when selected from a folder. Users who like to have their home folder as a default can fall back on starting git gui with its working directory set to the home folder. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 February 2011, 22:43:35 UTC |
| fb027e1 | Heiko Voigt | 06 February 2011, 17:04:27 UTC | git-gui: scroll down to default selection for push dialog If the list of remote/local branches is very long its inconvenient to scroll down and find the selected branch. This patch makes the widget automatically scroll down so its shown on the top. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 February 2011, 22:20:05 UTC |
| 9e34e62 | Heiko Voigt | 06 February 2011, 17:01:08 UTC | git gui: keep selected branch when remote is changed in push dialog The selection of the branch to be pushed would be cleared when the remote was changed. This seems to be dependent on the fact that the selected content in the combobox was exported to the clipboard. It was only apparent when using the new ttk widget. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 February 2011, 22:03:39 UTC |
| bf59439 | Bert Wesarg | 09 December 2010, 20:47:59 UTC | git-gui: handle meta diff header lines only in the header section Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| d1c7f8a | Bert Wesarg | 09 December 2010, 20:47:58 UTC | git-gui: handle special content lines only in the diff header section These two also stop the diff header. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| 6459d7c | Bert Wesarg | 09 December 2010, 20:47:57 UTC | git-gui: always reset the current tag Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| 963ceab | Bert Wesarg | 09 December 2010, 20:47:56 UTC | git-gui: move 3way diff autodetect up Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| 3c9ae64 | Bert Wesarg | 09 December 2010, 20:47:55 UTC | git-gui: there is no "mode *" diff header line Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| 97b8ee1 | Bert Wesarg | 09 December 2010, 20:47:54 UTC | git-gui: name also new symlinks so and rename them only in the diff header Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| ebd143f | Bert Wesarg | 09 December 2010, 20:47:53 UTC | git-gui: handle index lines only in the diff header Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| c976bbf | Bert Wesarg | 09 December 2010, 20:47:52 UTC | git-gui: rework handling of diff header The fix in ca53c3f (Fix diff parsing for lines starting with "--" or "++", 2008-09-05) got a bug report from Johannes Sixt, that new files in the index now looks like: new file mode 100644 --- /dev/null +++ b/foo @@ -0,0 +1 @@ +foo The introduced problem was that the 'in-diff-header'-flag was unconditially disabled. Now it is only disabled when a hunk line is detected. And also re-enabled when we encounter a new diff header. The second part solves also the issue reported by me for diffs with file type changes (i.e. the ''error: Unhandled 2 way diff marker: {d}"', which comes from the second 'diff --git' line). Reported-by: Johannes Sixt <j.sixt@viscovery.net> Reported-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 09:01:17 UTC |
| 7587f4d | Bert Wesarg | 09 December 2010, 20:46:23 UTC | git-gui: learn more type change states Support the following states with type change in git-gui: AT, MT, TD, TM Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 00:16:50 UTC |
| 4a065c8 | Bert Wesarg | 09 December 2010, 20:46:22 UTC | git-gui: remove 'no such variable' for s error when encounter unknown file states $s will be referenced in the error message. Which was broken since "git-gui: Automatically update-index all included files before commit" (bbe3b3b, 2006-11-16). Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 00:16:46 UTC |
| bf5fe3f | Bert Wesarg | 09 December 2010, 20:46:21 UTC | git-gui: fix typo in image data Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 28 January 2011, 00:16:42 UTC |
| 7b3680f | Alexandre Erwin Ittner | 13 December 2010, 22:28:19 UTC | git-gui: add Brazilian Portuguese (pt-BR) translation Translating a SCM is tricky due to amount of jargon, so, I tried to keep the wording consistent with both the German and Italian git translations and the pt-BR translation of other SCMs. Signed-off-by: Alexandre Erwin Ittner <alexandre@ittner.com.br> | 27 January 2011, 16:22:10 UTC |
| 073291c | Alex Riesen | 19 January 2011, 21:01:32 UTC | git-gui: update russian translation Improve the translation of warning given by mergetool when staging files with conflict markers. Suggested-by: Alexey Shumkin <zapped@mail.ru> Tipping-vote-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 January 2011, 23:46:38 UTC |
| 75e88a5 | Alex Riesen | 17 January 2011, 21:08:55 UTC | git-gui: update russian translation Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 January 2011, 23:46:33 UTC |
| b6efd40 | Skip | 17 January 2011, 21:08:28 UTC | git-gui: spelling fixes in russian translation Signed-off-by: Skip <bsvskip@rambler.ru> Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 January 2011, 23:46:29 UTC |
| 9673abc | Serge Ziryukin | 17 January 2011, 21:08:24 UTC | git-gui: fix russian translation typos Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com> Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 24 January 2011, 23:46:25 UTC |
| 673eb4a | Stefan Naewe | 10 December 2010, 15:41:09 UTC | git-gui: use --exclude-standard to check for untracked files This fixes git-gui failing to display untracked files that are listed if core.excludefiles is set to ~/.gitexcludes [PT: added expansion of core.excludesfile value by tcl] Signed-off-by: Stefan Naewe <stefan.naewe@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 December 2010, 15:42:09 UTC |
| 88b21c2 | Bert Wesarg | 06 December 2010, 22:01:01 UTC | git-gui: Fix use of hunk tag for non-hunk content. The hunk tag d_@ lost its blue forground color in "apply color information from git diff output" (2010-10-22, 8f85599). But this tag was also used for non-hunk content like untracked file mime types or git submodules. Introduce a new tag for this type of content which has the blue forground again. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 December 2010, 22:01:01 UTC |
| c7ec31a | Bert Wesarg | 29 November 2010, 08:21:57 UTC | git-gui: Fix use of renamed tag. The d======= was renamed to d= in 4590307. Fix this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 December 2010, 21:09:53 UTC |
| 1ab8628 | Bert Wesarg | 19 November 2010, 20:43:48 UTC | git-gui: fix browsers [Up To Parent] in sub-sub-directories. browser_path used to end with a slash, so the regexp matches the empty string and therefore removes nothing. Fix this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 22 November 2010, 21:52:51 UTC |
| 4590307 | Bert Wesarg | 16 November 2010, 09:21:52 UTC | git-gui: respect conflict marker size Respect the conflict-marker-size attribute on paths when detecting merge conflicts. [PT: fixed problem with variable substitution in the regexps] Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 November 2010, 11:25:00 UTC |
| 46a0431 | Bert Wesarg | 15 November 2010, 10:00:33 UTC | git-gui: fix ANSI-color parsing git diff always outputs color reset commands, even when the color for the current part is disabled (ie. normal). But the current ANSI-color parsing code assumes that color start and reset commands appear in matching pairs. Relax this assumption. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 19 November 2010, 09:32:58 UTC |
| 8f85599 | Pat Thoyts | 22 October 2010, 15:14:38 UTC | git-gui: apply color information from git diff output This patch extracts the ANSI color sequences from git diff output and applies these to the diff view window. This ensures that the gui view makes use of the current git configuration for whitespace display. ANSI codes may include attributes, foreground and background in a single sequence. Handle this and support bold and reverse attributes. Ignore all other attributes. Suggested-by: Tor Arvid Lund <torarvid@gmail.com> Suggested-by: Junio C Hamano <gitster@pobox.com> Tested-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 October 2010, 22:47:28 UTC |
| c744086 | Pat Thoyts | 27 October 2010, 22:37:31 UTC | git-gui: use wordprocessor tab style to ensure tabs work as expected The Tk text widget tab style is tabular where the first tab will align to the first tabstop and if that position is left of the current location then just a single character space is used. With the wordprocessor style a tab moves the next character position to the next rightmost tabstop as expected for viewing code. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 27 October 2010, 22:37:31 UTC |
| 38ec8d3 | Pat Thoyts | 20 October 2010, 13:29:56 UTC | git-gui: correct assignment of work-tree git-gui currently uses its own logic to determine the work-tree setting but 'git rev-parse --toplevel' directly returns git's work-tree value by calling get_git_work_tree() and is therefore always correct. This fixes an inability to handle some repository configurations. In particular where .git is a file containing a path to the real directory (a cross-platform symbolic link). To continue to support older versions than 1.7.0, setting the work-tree by normalizing the --show-cdup value is more reliable as git-dir might be outside the work-tree entirely. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 20 October 2010, 13:29:56 UTC |
| 4c56d1d | Pat Thoyts | 07 October 2010, 22:00:33 UTC | git-gui: use full dialog width for old name when renaming branch Let the combobox/option menu expand to fill the width of the dialog. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 October 2010, 22:00:33 UTC |
| 67112c4 | Pat Thoyts | 07 October 2010, 21:28:45 UTC | git-gui: generic version trimming Rather than attempting to trim off all the non-version number suffixes from the 'git version' result, let us scan along from the beginning until we find a non-numeric part and stop there. Any such dot-version number will be compatible with the Tcl package version comparison command which is the aim of this code. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 October 2010, 21:28:45 UTC |
| c0d2c38 | Pat Thoyts | 05 October 2010, 22:51:34 UTC | git-gui: enable the Tk console when tracing/debugging on Windows Without any standard channels the trace option is pretty useless on Win32 unless you can show the Tk console which captures such output. This also permits introspection of the running application to assist in debugging. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 October 2010, 22:51:34 UTC |
| 7ae1e72 | Pat Thoyts | 05 October 2010, 22:39:54 UTC | git-gui: show command-line errors in a messagebox on Windows Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 October 2010, 22:39:54 UTC |
