| 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 |
| ff9db6c | Sebastian Schuberth | 05 October 2010, 09:12:00 UTC | On Windows, avoid git-gui to call Cygwin's nice utility It's a common case for Windows developers to have both Cygwin and msysGit installed. Unfortunately, some scenarios also require to have Cygwin in PATH. By default, Cygwin comes with nice.exe, while msysGit does not. Since git-gui calls nice if it is in PATH, this results in Cygwin's nice.exe being called from msysGit's git-gui. Mixing Cygwin and msysGit generally is not a good idea, and in this particular case it causes differences not being correctly detected. So we only call nice.exe on Windows if it is in the same directory as git.exe. This way, this work-around does neither affect a pure Cygwin environment, or the case when nice.exe will be shipped with msysGit at some point in time. This fixes msysGit issue 394. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 05 October 2010, 09:58:14 UTC |
| 00e9de7 | Pat Thoyts | 14 September 2010, 21:42:37 UTC | git-gui 0.13 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 September 2010, 21:42:37 UTC |
| 2473543 | Pat Thoyts | 13 September 2010, 19:41:42 UTC | git-gui: avoid mis-encoding the copyright message on Windows. On Windows the tcl script file will use the system encoding and attempting to convert the copyright mis-encodes the string. Instead, keep the message as ASCII and substitute in the correct unicode character when running. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 19:41:42 UTC |
| 421a31e | Peter Krefting | 12 September 2010, 20:13:29 UTC | git-gui: Update Swedish translation (521t). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 18:25:55 UTC |
| aef0b48 | Pat Thoyts | 18 August 2010, 22:19:24 UTC | git-gui: ensure correct application termination in git-gui--askpass With Tk 8.5 the askpass utility can hang waiting for the wish shell implicit event loop to exit. This patch uses an explicit event loop to ensure correct application termination. Reported-by: Anders Kaseorg <andersk@mit.edu> Tested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 August 2010, 22:19:24 UTC |
| d5257fb | Pat Thoyts | 07 August 2010, 19:32:13 UTC | git-gui: handle textconv filter on Windows and in development When developing/testing we run git-gui.sh directly and the makefile configured variables are not properly set. Configure the new shellpath accessor to handle this case. On Windows we may not find the shell so in this case revert to simply executing the filter command without the shell intermediate. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 12 August 2010, 20:37:32 UTC |
| 62f9a63 | Matthieu Moy | 05 August 2010, 10:05:22 UTC | git-gui: use shell to launch textconv filter in "blame" The textconv filters may include multiple arguments and may make use of unix shell features. To maintain compatibility with 'git blame' ensure these commands are passed through bash. Reported-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 12 August 2010, 20:35:09 UTC |
| 7807777 | Pat Thoyts | 07 August 2010, 23:07:43 UTC | git-gui: display error launching blame as a message box. This does not appear to Windows users and can follow the form of the fatal error messages near the top of the script file. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 August 2010, 23:07:43 UTC |
| ea47503 | Pat Thoyts | 07 August 2010, 23:07:01 UTC | git-gui: Make usage statement visible on Windows. On Windows stdout and stderr are not connected to anything so the usage statement is never shown to the user when an error is made with a command line like 'git gui browser'. Use a messagebox on windows. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 07 August 2010, 23:07:01 UTC |
| 2810a58 | Pat Thoyts | 02 August 2010, 12:42:45 UTC | git-gui: fix size and position of window panes on startup The themed panedwindow needs to have the sash position set after the widget has been mapped therefore apply this setting in the Map event binding. To avoid visible redraws as the application is constructed the main window should be withdrawn until all the widgets have been added Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 12:42:45 UTC |
| 9cb268c | Pat Thoyts | 02 August 2010, 11:13:05 UTC | git-gui: mc cannot be used before msgcat has been loaded If someone attempts to use an older version that Tk 8.4 the error was masked by the lack of a mc command. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 11:13:05 UTC |
| 1fbacca | Clément Poulain | 30 July 2010, 08:11:02 UTC | git-gui: use textconv filter for diff and blame Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options. If checked and if the driver for the concerned file exists, git-gui calls diff and blame with --textconv option Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| 8512354 | Pat Thoyts | 08 March 2010, 12:43:27 UTC | git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 On Windows the Control-C binding is used to copy and is mapped to the Tk virtual event <<Copy>>. In the initial git-gui dialog this is also bound as an accelerator for the Clone menu item. The effect is that both bindings run, copying the text but resetting the clone page or switching to the clone page when the user tries to copy text from one of the entry fields. This patch avoids this by using Control-L instead for Windows only. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| fc17e5e | Heiko Voigt | 27 February 2010, 20:48:48 UTC | git-gui: fix shortcut creation on cygwin When the user tried to create a desktop icon with git gui on cygwin wscript was complaining about an unknown option and displaying the non-native path as such. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:26 UTC |
| 4c79adc | Heiko Voigt | 27 February 2010, 20:47:42 UTC | git-gui: fix PATH environment for mingw development environment When creating a desktop shortcut from the gui the shortcut directly starts wish with the git-gui script. In the msysgit development environment some dll's reside in the mingw/bin directory which causes that git can not start because libiconv2.dll is not found. When using such a link the error is even more cryptic stating: "child killed: unknown signal" Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| a197b1e | Heiko Voigt | 27 February 2010, 20:45:51 UTC | git-gui: fix usage of _gitworktree when creating shortcut for windows This fixes msysGit issue 425. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| 2e0cda6 | Markus Heidelberg | 25 February 2010, 00:14:22 UTC | git-gui: fix "Explore Working Copy" for Windows again It has already been fixed in commit 454efb47 (git-gui (Win): make "Explore Working Copy" more robust, 2009-04-01), but has been broken in commit 21985a11 (git-gui: handle non-standard worktree locations, 2010-01-23) by accidentally replacing too much with a new variable. The problem can be reproduced when starting git-gui from within a subdirectory. The solution is to convert the path name, explorer.exe is invoked with, to a platform native name. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| b963d11 | Heiko Voigt | 20 February 2010, 13:38:38 UTC | git-gui: fix usage of themed widgets variable There was one forgotten global so NS was not visible to the method which resulted in an error. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> | 10 July 2010, 22:41:54 UTC |
| 13a3d63 | Pat Thoyts | 10 July 2010, 22:40:59 UTC | git-gui: Handle failure of core.worktree to identify the working directory. Commit 21985a11 'git-gui: handle non-standard worktree locations' attempts to use either GIT_WORK_TREE or core.worktree to set the _gitworktree variable but these may not be set which leads to a failure to launch gitk to review history. Use _gitdir to set the location for a standard git layout where the parent of the .git directory is the working tree. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 10 July 2010, 22:40:59 UTC |
| 2a9edd0 | Shawn O. Pearce | 08 February 2010, 15:57:37 UTC | Merge branch 'maint' * maint: git-gui: check whether systems nice command works or disable it | 08 February 2010, 15:57:37 UTC |
| 9c898a1 | Heiko Voigt | 07 February 2010, 21:47:56 UTC | git-gui: check whether systems nice command works or disable it This fixes issue 394 from msysgit. It seems that the Gnuwin32 project provides a nice command but it returns a "not implemented" error. To help users we now try to execute once and disable it in case it fails. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2010, 15:56:55 UTC |
| 89d6159 | Emmanuel Trillaud | 02 February 2010, 11:59:34 UTC | git-gui: update french translation Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 15:34:04 UTC |
| 5bf4684 | Nanako Shiraishi | 02 February 2010, 10:20:21 UTC | git-gui: update Japanese translation Update ja.po to match 2010-01-26 version of pot file. Signed-off-by: しらいし ななこ <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 14:59:06 UTC |
| e1a3f28 | Shawn O. Pearce | 29 January 2010, 15:58:56 UTC | Merge branch 'maint' * maint: git-gui: fix shortcut for menu "Commit/Revert Changes" | 29 January 2010, 15:58:56 UTC |
| d6db1bb | Heiko Voigt | 29 January 2010, 15:57:48 UTC | git-gui: fix shortcut for menu "Commit/Revert Changes" The shortcut was not properly recognized previously. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 January 2010, 15:58:52 UTC |
| 831cc7e | Jens Lehmann | 28 January 2010, 21:20:39 UTC | git-gui: Quote git path when starting another gui in a submodule In do_git_gui the path of the git executable has to be put into a list, otherwise calling it will fail when when spaces are present in its path. Reported-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 23:44:41 UTC |
| cbdaf56 | Michele Ballabio | 07 September 2009, 16:45:16 UTC | git-gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 15:18:29 UTC |
| fe9c06b | Peter Krefting | 28 January 2010, 12:57:34 UTC | git-gui: Update Swedish translation (520t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 15:17:47 UTC |
| c80d7be | Pat Thoyts | 26 January 2010, 00:05:31 UTC | git-gui: use themed tk widgets with Tk 8.5 This patch enables the use of themed Tk widgets with Tk 8.5 and above. These make a significant difference on Windows in making the application appear native. On Windows and MacOSX ttk defaults to the native look as much as possible. On X11 the user may select a theme using the TkTheme XRDB resource class by adding an line to the .Xresources file. The set of installed theme names is available using the Tk command 'ttk::themes'. The default on X11 is similar to the current un-themed style - a kind of thin bordered motif look. A new git config variable 'gui.usettk' may be set to disable this if the user prefers the classic Tk look. Using Tk 8.4 will also avoid the use of themed widgets as these are only available since 8.5. Some support is included for Tk 8.6 features (themed spinbox and native font chooser for MacOSX and Windows). Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 01:13:52 UTC |
| ab2d3b0 | Christian Stimming | 26 January 2010, 21:26:45 UTC | git-gui: Update German translation (12 new or changed strings). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 January 2010, 01:13:47 UTC |
| 60eb4f1 | Shawn O. Pearce | 26 January 2010, 23:47:45 UTC | git-gui: Update translation template Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 January 2010, 23:47:45 UTC |
