[REQUEST PULL] git-gui 0.20.0 to 0.21.0

2016-10-20 Thread Pat Thoyts
): git-gui: sort entries in tclIndex Orgad Shaneh (1): git-gui: Do not reset author details on amend Pat Thoyts (19): Allow keyboard control to work in the staging widgets. Amend tab ordering and text widget border and highlighting. git-gui: fix detection of Cygwin

Re: [GIT GUI l18n 1/2] git-gui: Mark 'All' in remote.tcl for translation

2016-10-13 Thread Pat Thoyts
&& [$fetch_m entrycget end -label] eq "All"} { + && [$fetch_m entrycget end -label] eq [mc "All"]} { delete_from_menu $fetch_m end delete_from_menu $fetch_m end -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD

Re: [PATCH] git-gui: stop using deprecated merge syntax

2016-10-03 Thread Pat Thoyts
René Scharfe <l@web.de> writes: >Am 03.10.2016 um 10:30 schrieb Pat Thoyts: >> The only problem I see here is that generally git-gui tries to continue >> to work with older versions of git as well. So adding a guard using the >> git-version procedure sho

Re: [PATCH v2 6/6] git-gui: Update Japanese information

2016-10-03 Thread Pat Thoyts
Junio C Hamano <gits...@pobox.com> writes: >Junio C Hamano <gits...@pobox.com> writes: > >> Pat Thoyts <pattho...@users.sourceforge.net> writes: >> >>> I'm just starting to catch up once again. hopefully I can be >>> a bit more reactive than

Re: [PATCH 1/5] git-gui i18n: mark strings for translation

2016-10-03 Thread Pat Thoyts
e {}} { > add_helper \ >@@ -385,7 +385,7 @@ proc do_add_all {} { > set paths [concat $paths $untracked_paths] > } > } >- add_helper {Adding all changed files} $paths >+ add_helper [mc "Adding all changed files"] $path

Re: [PATCH 4/5] git-gui: fix incorrect use of Tcl append command

2016-10-03 Thread Pat Thoyts
"] > if {$fn != {}} { >diff --git a/lib/tools_dlg.tcl b/lib/tools_dlg.tcl >index 7eeda9d..c05413c 100644 >--- a/lib/tools_dlg.tcl >+++ b/lib/tools_dlg.tcl >@@ -19,7 +19,7 @@ constructor dialog {} { > global repo_config use_ttk NS > > make_dialog top

Re: [PATCH 2/2] git-gui: ensure the file in the diff pane is in the list of selected files

2016-10-03 Thread Pat Thoyts
current_diff_path selected_paths >+ set selected_paths($current_diff_path) 1 > } > > proc show_unmerged_diff {cont_info} { These both look good. Applied with minor changes to the commit message for patch 1. Thank you, -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD

Re: [PATCH v2 6/6] git-gui: Update Japanese information

2016-10-03 Thread Pat Thoyts
ntly. Merging 52285c83 looks fine. I'll stick that onto the 0.20.0 head and see what else I can pick up on top. There are a few from the git for windows set among others. -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD

Re: [PATCH] git-gui: stop using deprecated merge syntax

2016-10-03 Thread Pat Thoyts
05893ca88c05ce211a295a330e74590 Mon Sep 17 00:00:00 2001 From: René Scharfe <l@web.de> Date: Sat, 24 Sep 2016 13:30:22 +0200 Subject: [PATCH] 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 merg

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

2015-11-09 Thread Pat Thoyts
CURLAUTH_ANY); >-- snap -- > >cannot be copyrighted because it is pretty much the only way to implement >said functionality? > >Still, Pat, if you find the time, could you please simply relicense your >patch (I know that you are fine with it, but we need an explicit >statem

Re: [PATCH] git-gui: Update Russian translation

2015-10-14 Thread Pat Thoyts
l.ru>\n" >+"Language-Team: Russian >(http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" > "MIME-Version: 1.0\n" > "Content-Type: text/plain; charset=UTF-8\n" > "Content-Transfer-Encoding: 8bit\n" >+"Language: ru\n"

REQUEST-PULL: Please pull from git-gui.

2015-04-18 Thread Pat Thoyts
): git-gui: show staged submodules regardless of ignore config git-gui: tolerate major version changes when comparing the git version Kyle J. McKay (1): git-gui: reinstate support for Tcl 8.4 Michael Lutz (1): git-gui: add configurable tab size to the diff view Pat Thoyts (4

Re: [PATCH 0/2] [git-gui] Open existing repository with submodules

2015-03-12 Thread Pat Thoyts
/choose_repository.tcl | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-) Thanks. I've applied these onto git-gui's upstream repository with minor changes to the commit comment to clarify where this becomes useful. -- Pat Thoytshttp

Re: [PATCH v2] git-gui: fix problem with gui.maxfilesdisplayed

2015-01-12 Thread Pat Thoyts
\ $icon_name $s + incr displayed } } I found a way to test this and it seems fine. The message box points out the new controlling config variable which is good. Applied to the master branch. -- Pat Thoytshttp://www.patthoyts.tk

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-12 Thread Pat Thoyts
. Applied. -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http

Re: [PATCH] git-gui: make gc warning threshold match 'git gc --auto'

2014-08-10 Thread Pat Thoyts
to initialize repo_config. The following should solve this by moving where we ser the default: From bdb136cbcb2a3fc0e3441f852e4bf4525ee4cf99 Mon Sep 17 00:00:00 2001 From: Pat Thoyts pattho...@users.sourceforge.net Date: Sun, 10 Aug 2014 11:36:47 +0100 Subject: [PATCH] git-gui: initialize the default value

Re: [PATCH] git-gui: Make git-gui lib dir configurable at runtime

2014-08-10 Thread Pat Thoyts
-gui.git/, and it is maintained by Pat Thoyts (Cc'ed). Note that these two upstream projects do not have leading directories git-gui and gitk-git themselves (they are merged to my tree while their paths being renamed). A patch that is appliable to them would touch paths without them (e.g

Re: [PATCH] gitk: use mktemp -d to avoid predictable temporary directories

2014-06-15 Thread Pat Thoyts
8.6 the file command acquired a file tempfile command to help with this kind of issue (https://www.tcl.tk/man/tcl8.6/TclCmd/file.htm#M39) but for older versions we should probably stick with the existing pattern at least on Windows. -- Pat Thoytshttp://www.patthoyts.tk

Re: [PATCH] git-gui: show staged submodules regardless of ignore config

2014-06-13 Thread Pat Thoyts
. Signed-off-by: Jens Lehmann jens.lehm...@web.de Signed-off-by: Junio C Hamano gits...@pobox.com --- * Pat, I've been carrying this in my 'pu' but I would prefer changes to git-gui fed to me through you. Could you apply this so that I can drop my tentative copy? OK - Applied. -- Pat Thoyts

Re: [GIT GUI PATCH] git-gui: use vcompare when comparing the git version

2014-05-17 Thread Pat Thoyts
range. So the only change required is to append a minus. package vsatisfies $::_git_version 1.7.0- will suffice. package vsatisfies $::_git_version 1.7.0 2.0.0 would work but would cause failures when we arrive at git 3.0 -- Pat Thoytshttp://www.patthoyts.tk/ PGP

Re: git gui error with relocated repository

2014-05-06 Thread Pat Thoyts
to a parent? Here's some other info that might help $ git --version git version 2.0.0.rc0 $ cat .git gitdir: ../.git/modules/repo $ git rev-parse --git-dir /home/chris/src/super/.git/modules/repo $ git config core.worktree ../../../repo Thanks, Chris -- Pat Thoyts

Re: [msysGit] [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Pat Thoyts
,$(filter-out rc%,$(subst -, ,$(subst ., ,$(GIT_VERSION 0 0)) This removes any rc* parts and appends a couple of zeros so that all missing elements should appear as 0 in the final list. Pat Thoyts -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [msysGit] [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Pat Thoyts
On 23 January 2014 14:16, Johannes Sixt j.s...@viscovery.net wrote: Am 1/23/2014 13:02, schrieb Pat Thoyts: On 23 January 2014 07:28, Johannes Sixt j.s...@viscovery.net wrote: @@ -1773,7 +1773,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc GIT-VERSION-FILE

REQUEST-PULL: Please pull from git-gui.

2014-01-18 Thread Pat Thoyts
more terms to glossary 99337ef git-gui i18n: Initial glossary in Bulgarian -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH] Add gui.displayuntracked option

2013-08-27 Thread Pat Thoyts
has a typo in 'default'. I'll make a note to forward this part of the patch at request-pull time. -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH] git-gui: right half window is paned

2013-08-27 Thread Pat Thoyts
+ .vpane.lower paneconfigure .vpane.lower.commarea -stretch never +} # -- Commit Area Buttons # Also fine and applied. Thank you. -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from

Re: [PATCH] Improve font rendering on retina macbooks

2013-08-27 Thread Pat Thoyts
here before, so please me know about any procedures I have missed. Regards, Mads Dørup Looks like it makes a big difference from those pictures. Patch applied. Thank you. -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0

REQUEST PULL: git-gui

2013-06-15 Thread Pat Thoyts
- copie. Heiko Voigt (1): git-gui: allow \ No newline at end of file for linewise staging John Keeping (1): git-gui: fix file name handling with non-empty prefix Kirill Smelkov (1): git-gui: Fix parsing of rev path-which-not-present-in-worktree Pat Thoyts (4): git-gui: fix

Re: [PATCH v2] git-gui: bring Wish process to front on Mac

2013-06-15 Thread Pat Thoyts
On 14 June 2013 18:54, Junio C Hamano gits...@pobox.com wrote: Stefan Haller ste...@haller-berlin.de writes: 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,

REQUEST-PULL: some msysgit build patches for upstream

2013-06-07 Thread Pat Thoyts
and merging upstream should simplify future maintenance. Johannes Schindelin (2): Define NO_GETTEXT for Git for Windows Windows resource: handle dashes in the Git version gracefully Pat Thoyts (3): Provide a Windows

Re: [PATCH] git-gui: bring Wish process to front on Mac

2013-06-06 Thread Pat Thoyts
On 6 June 2013 09:17, Stefan Haller ste...@haller-berlin.de wrote: 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

Re: t0008-ignores failure (was: [msysGit] Git for Windows 1.8.3)

2013-05-30 Thread Pat Thoyts
On 30 May 2013 16:15, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Karsten, On Thu, 30 May 2013, Karsten Blees wrote: Am 25.05.2013 21:16, schrieb Pat Thoyts: On that note -- with this merge as it now stands I get the following test failures: t0008-ignores.sh

Re: Fwd: git-gui / Warning: No newline at end of file”

2013-01-09 Thread Pat Thoyts
] http://stackoverflow.com/questions/13223868/how-to-stage-line-by-line-in-git-gui-although-no-newline-at-end-of-file-warnin -- Pat Thoytshttp://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from this list: send

Re: [msysGit] [PATCH] git tag --contains : avoid stack overflow

2012-11-10 Thread Pat Thoyts
On 10 November 2012 21:13, Jean-Jacques Lafay jeanjacques.la...@gmail.com wrote: Le samedi 10 novembre 2012 21:00:10 UTC+1, Philip Oakley a écrit : From: Jean-Jacques Lafay jeanjacq...@gmail.com Sent: Saturday, November 10, 2012 5:36 PM In large repos, the recursion implementation of

[PULL REQUEST]: Please pull git-gui

2012-10-17 Thread Pat Thoyts
Voigt (1): git-gui: open console when using --trace on windows Marcus Karlsson (1): git-gui: Use PWD if it exists on Mac OS X Pat Thoyts (3): git-gui: preserve commit messages in utf-8 Merge branch 'rt/trans' git-gui 0.17 Ralf Thielow (3): git-gui: de.po