| ccc9851 | Pat Thoyts | 20 October 2016, 10:19:43 UTC | git-gui: set version 0.21 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 20 October 2016, 10:19:43 UTC |
| 5308355 | Pat Thoyts | 20 October 2016, 10:13:42 UTC | Merge branch 'as/bulgarian' into pu | 20 October 2016, 10:13:42 UTC |
| ac459b9 | Alexander Shopov | 13 October 2016, 18:43:48 UTC | git-gui: Mark 'All' in remote.tcl for translation Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 20 October 2016, 10:13:03 UTC |
| 7f8da00 | Alexander Shopov | 13 October 2016, 18:43:49 UTC | git-gui i18n: Updated Bulgarian translation (565,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 20 October 2016, 10:12:50 UTC |
| bfe4344 | Pat Thoyts | 20 October 2016, 10:07:24 UTC | Merge branch 'os/preserve-author' into pu | 20 October 2016, 10:07:24 UTC |
| be44aee | Pat Thoyts | 20 October 2016, 10:06:28 UTC | Merge branch 'kb/unicode' into pu | 20 October 2016, 10:06:28 UTC |
| cfe616b | Pat Thoyts | 06 October 2016, 13:04:42 UTC | git-gui: avoid persisting modified author identity Commit 7e71adc77f fixes a problem with git-gui failing to pick up the original author identity during a commit --amend operation. However, the new author details then become persistent for the remainder of the session. This commit fixes this by ensuring the environment variables are reset and the author information reset once the commit is completed. The relevant changes were reworked to reduce global variables. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 October 2016, 21:18:47 UTC |
| ae75e1e | Karsten Blees | 26 February 2015, 09:19:45 UTC | git-gui: handle the encoding of Git's output correctly If we use 'eval exec $opt $cmdp $args' to execute git command, tcl engine will convert the output of the git comand with the rule system default code page to unicode. But cp936 -> unicode conversion implicitly done by exec is not reversible. So we have to use git_read instead. Bug report and an original reproducer by Cloud Chou: https://github.com/msysgit/git/issues/302 Cloud Chou find the reason of the bug. Thanks-to: Johannes Schindelin <johannes.schindelin@gmx.de> Thanks-to: Pat Thoyts <patthoyts@users.sourceforge.net> Reported-by: Cloud Chou <515312382@qq.com> Original-test-by: Cloud Chou <515312382@qq.com> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Cloud Chou <515312382@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 October 2016, 08:23:21 UTC |
| e2039e9 | Karsten Blees | 04 February 2012, 20:54:36 UTC | git-gui: unicode file name support on windows Assumes file names in git tree objects are UTF-8 encoded. On most unix systems, the system encoding (and thus the TCL system encoding) will be UTF-8, so file names will be displayed correctly. On Windows, it is impossible to set the system encoding to UTF-8. Changing the TCL system encoding (via 'encoding system ...', e.g. in the startup code) is explicitly discouraged by the TCL docs. Change git-gui functions dealing with file names to always convert from and to UTF-8. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 06 October 2016, 08:21:50 UTC |
| 12d29c3 | Pat Thoyts | 04 October 2016, 22:29:40 UTC | Merge branch 'dr/ru' into pu | 04 October 2016, 22:29:40 UTC |
| ec68ada | Dimitriy Ryazantcev | 04 October 2016, 15:15:16 UTC | git-gui: Update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 04 October 2016, 22:28:10 UTC |
| 82fbd8a | Pat Thoyts | 04 October 2016, 11:49:05 UTC | git-gui: maintain backwards compatibility for merge syntax Commit b5f325c updated to use the newer merge syntax but continue to support older versions of git. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 04 October 2016, 22:14:05 UTC |
| 52f2445 | Pat Thoyts | 03 October 2016, 22:40:50 UTC | Merge branch 'va/i18n_2' into pu | 03 October 2016, 22:40:50 UTC |
| 9360fc2 | Vasco Almeida | 08 May 2016, 10:52:58 UTC | git-gui i18n: mark string in lib/error.tcl for translation Mark string "$hook hook failed:" in lib/error.tcl for translation. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:40:23 UTC |
| a3d97af | Vasco Almeida | 08 May 2016, 10:52:57 UTC | git-gui: fix incorrect use of Tcl append command Fix wrong use of append command in strings marked for translation. According to Tcl/Tk Documentation [1], append varName ?value value value ...? appends all value arguments to the current value of variable varName. This means that append "[appname] ([reponame]): " [mc "File Viewer"] is setting a variable named "[appname] ([reponame]): " to the output of [mc "File Viewer"], rather than returning the concatenation of both expressions as one might expect. The format for some strings enables, for instance, a French translator to translate like "%s (%s) : Create Branch" (space before colon). Conversely, strings already translated will be marked as fuzzy and the translator must update them herself. For some cases, use alternative way for concatenation instead of using strcat procedure defined in git-gui.sh. Reference: 31bb1d1 ("git-gui: Paper bag fix missing translated strings", 2007-09-14) fixes the same issue slightly differently. [1] http://www.tcl.tk/man/tcl/TclCmd/append.htm Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:40:10 UTC |
| 43c65a8 | Vasco Almeida | 08 May 2016, 10:52:56 UTC | git-gui i18n: mark "usage:" strings for translation Mark command-line "usage:" string for translation in git-gui.sh. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:40:04 UTC |
| eca9636 | Vasco Almeida | 08 May 2016, 10:52:55 UTC | git-gui i18n: internationalize use of colon punctuation Internationalize use of colon punctuation ':' in options window, windows titles, database statistics window. Some languages might use a different style, for instance French uses "User Name :" (space before colon). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:39:56 UTC |
| 99ba48e | Pat Thoyts | 03 October 2016, 22:30:44 UTC | Merge branch 'pt/non-mouse-usage' into pu | 03 October 2016, 22:30:44 UTC |
| c7fb7bf | Pat Thoyts | 03 October 2016, 22:30:32 UTC | Merge branch 'pt/git4win-mods' into pu | 03 October 2016, 22:30:32 UTC |
| 408c212 | Pat Thoyts | 03 October 2016, 22:28:57 UTC | Merge branch 'patches' into pu | 03 October 2016, 22:28:57 UTC |
| a0a0c68 | Alex Riesen | 28 June 2016, 08:59:25 UTC | git-gui: ensure the file in the diff pane is in the list of selected files It is very confusing that the file which diff is displayed is marked as selected, but it is not in fact selected (that means the array of selected files does not include the file in question). Fixing this also improves the use of $FILENAMES in custom defined tools: one does not have to click the file in the list to make it selected. Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:27:14 UTC |
| 52d196a | Alex Riesen | 28 June 2016, 08:57:42 UTC | git-gui: support for $FILENAMES in tool definitions This adds a FILENAMES environment variable, which contains the repository pathnames of all selected files the list. The variable contains the names separated by LF (\n, \x0a). If the file names contain LF characters, the tool command might be unable to unambiguously split the value of $FILENAME into the separate names. Note that the file marked and diffed immediately after starting the GUI up, is not actually selected. One must click on it once to really select it. Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:27:14 UTC |
| af465c0 | yaras | 23 February 2016, 11:55:46 UTC | git-gui: fix initial git gui message encoding This fix refers https://github.com/git-for-windows/git/issues/664 After `git merge --squash` git creates .git/SQUASH_MSG (UTF-8 encoded) which contains squashed commits. When run `git gui` it copies SQUASH_MSG to PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding problems on `git gui` commit prompt. The same applies on git cherry-pick conflict, where MERGE_MSG is created and then is copied to PREPARE_COMMIT_MSG. In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8. Signed-off-by: yaras <yaras6@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:27:14 UTC |
| c217e26 | Elia Pinto | 22 December 2015, 14:10:29 UTC | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 22:27:14 UTC |
| 64c6b4c | Pat Thoyts | 03 October 2016, 22:23:27 UTC | Merge branch 'va/i18n' into pu | 03 October 2016, 22:23:27 UTC |
| 9613644 | Pat Thoyts | 03 October 2016, 22:23:19 UTC | Merge branch 'rs/use-modern-git-merge-syntax' into pu | 03 October 2016, 22:23:19 UTC |
| 34fe0a7 | Pat Thoyts | 03 October 2016, 22:23:05 UTC | Merge branch 'js/commit-gpgsign' into pu | 03 October 2016, 22:23:05 UTC |
| 446e2a4 | Pat Thoyts | 03 October 2016, 22:22:46 UTC | Merge branch 'sy/i18n' into pu | 03 October 2016, 22:22:46 UTC |
| f110c46 | Pat Thoyts | 02 October 2016, 21:19:47 UTC | git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut` When calling `Repository>Create Desktop Shortcut`, Git GUI assumes that it is okay to call `wish.exe` directly on Windows. However, in Git for Windows 2.x' context, that leaves several crucial environment variables uninitialized, resulting in a shortcut that does not work. To fix those environment variable woes, Git for Windows comes with a convenient `git-gui.exe`, so let's just use it when it is available. This fixes https://github.com/git-for-windows/git/issues/448 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 10:03:47 UTC |
| 577c7e8 | Pat Thoyts | 02 October 2016, 10:51:29 UTC | git-gui: fix detection of Cygwin MSys2 might *look* like Cygwin, but it is *not* Cygwin... Unless it is run with `MSYSTEM=MSYS`, that is. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 03 October 2016, 10:03:29 UTC |
| 30508bc | Pat Thoyts | 01 October 2016, 23:13:07 UTC | Amend tab ordering and text widget border and highlighting. Tab order follows widget creation order (and Z-order) so amend this to match the layout more logically. For keyboard selection a highlight around the selected text widget is useful. Customized on Windows themed Tk to follow the native theme more closely with a custom EntryFrame style. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 01 October 2016, 23:13:07 UTC |
| 088ad75 | Pat Thoyts | 01 October 2016, 21:04:39 UTC | Allow keyboard control to work in the staging widgets. Keyboard focus was restricted to the commit message widget and users were forced to use the mouse to select files in the workdir widget and only then could use a key combination to stage the file. It is now possible to use key navigation (Ctrl-Tab, arrow keys and Ctrl-T or Ctrl-U) to stage and unstage files. Suggested by @koppor in git-for-window/git issue #859 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 01 October 2016, 21:04:39 UTC |
| 66fe3e0 | Vasco Almeida | 06 May 2016, 16:06:42 UTC | git-gui: l10n: add Portuguese translation Add Portuguese glossary. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 September 2016, 14:18:33 UTC |
| 124356b | Vasco Almeida | 08 May 2016, 10:52:54 UTC | git-gui i18n: mark strings for translation Mark strings for translation in lib/index.tcl that were seemingly left behind by 700e560 ("git-gui: Mark forgotten strings for translation.", 2008-09-04) which marks string in do_revert_selection procedure. These strings are passed to unstage_help and add_helper procedures. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 September 2016, 14:18:31 UTC |
| b5f325c | René Scharfe | 24 September 2016, 11:30:22 UTC | git-gui: stop using deprecated merge syntax Starting with v2.5.0 git merge can handle FETCH_HEAD internally and warns when it's called like 'git merge <message> HEAD <commit>' because that syntax is deprecated. Use this feature in git-gui and get rid of that warning. Signed-off-by: Rene Scharfe <l.s.r@web.de> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 September 2016, 14:15:28 UTC |
| 2afe6b7 | Johannes Schindelin | 09 September 2016, 12:28:24 UTC | git-gui: respect commit.gpgsign again As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign` config setting. This broke committing with GPG signature in Git GUI. This fixes https://github.com/git-for-windows/git/issues/850 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2016, 21:52:27 UTC |
| 52285c8 | Satoshi Yasushima | 06 September 2016, 16:02:21 UTC | git-gui: update Japanese information Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:36 UTC |
| 8d5db27 | Satoshi Yasushima | 06 September 2016, 16:02:20 UTC | git-gui: update Japanese translation Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:36 UTC |
| f3c18da | Satoshi Yasushima | 06 September 2016, 16:02:19 UTC | git-gui: add Japanese language code Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:36 UTC |
| b4012d7 | Satoshi Yasushima | 06 September 2016, 16:02:18 UTC | git-gui: apply po template to Japanese translation Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:36 UTC |
| 5085c8a | Satoshi Yasushima | 06 September 2016, 16:02:17 UTC | git-gui: consistently use the same word for "blame" in Japanese Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:35 UTC |
| f86d4c1 | Satoshi Yasushima | 06 September 2016, 16:02:16 UTC | git-gui: consistently use the same word for "remote" in Japanese Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2016, 17:21:35 UTC |
| 7e71adc | Orgad Shaneh | 11 April 2016, 06:57:39 UTC | git-gui: Do not reset author details on amend git commit --amend preserves the author details unless --reset-author is given. git-gui discards the author details on amend. Fix by reading the author details along with the commit message, and setting the appropriate environment variables required for preserving them. Reported long ago in the mailing list[1]. [1] http://article.gmane.org/gmane.comp.version-control.git/243921 Signed-off-by: Orgad Shaneh <orgad.shaneh@audiocodes.com> | 14 April 2016, 14:38:09 UTC |
| 82b2cab | Olaf Hering | 26 January 2015, 15:07:21 UTC | git-gui: sort entries in tclIndex ALL_LIBFILES uses wildcard, which provides the result in directory order. This order depends on the underlying filesystem on the buildhost. To get reproducible builds it is required to sort such list before using them. Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 01 May 2015, 14:53:06 UTC |
| 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 |
