[REQUEST PULL] git-gui 0.20.0 to 0.21.0

2016-10-20 Thread Pat Thoyts
Olaf Hering (1): 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 dete

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

2016-10-13 Thread Pat Thoyts
ot;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 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 should maintain that backwards co

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

2016-10-03 Thread Pat Thoyts
Junio C Hamano writes: >Junio C Hamano writes: > >> Pat Thoyts writes: >> >>> I'm just starting to catch up once again. hopefully I can be >>> a bit more reactive than recently. Merging 52285c83 looks fine. I'll >>> stick that onto

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

2016-10-03 Thread Pat Thoyts
set paths [concat $paths $untracked_paths] > } > } >- add_helper {Adding all changed files} $paths >+ add_helper [mc "Adding all changed files"] $paths > } > > proc revert_helper {txt paths} { This series looks good. Especially

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

2016-10-03 Thread Pat Thoyts
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 w >- wm title $top [append "[appname] ([reponame]): " [mc "Add Tool"]] >+ wm title $top [mc "%s (%s): Add Tool" [appname] [reponame]] > if {$top ne {.}} { > wm geometry $top "+[winfo rootx .]+[winfo rooty .]" > wm transient $top . >@@ -184,7 +184,7 @@ constructor dialog {} { > load_config 1 > > make_dialog top w >- wm title $top [append "[appname] ([reponame]): " [mc "Remove Tool"]] >+ wm title $top [mc "%s (%s): Remove Tool" [appname] [reponame]] > if {$top ne {.}} { > wm geometry $top "+[winfo rootx .]+[winfo rooty .]" > wm transient $top . >@@ -280,7 +280,7 @@ constructor dialog {fullname} { > } > > make_dialog top w -autodelete 0 >- wm title $top [append "[appname] ([reponame]): " $title] >+ wm title $top "[mc "%s (%s):" [appname] [reponame]] $title" > if {$top ne {.}} { > wm geometry $top "+[winfo rootx .]+[winfo rooty .]" > wm transient $top . >diff --git a/lib/transport.tcl b/lib/transport.tcl >index e5d211e..a1a424a 100644 >--- a/lib/transport.tcl >+++ b/lib/transport.tcl >@@ -226,7 +226,7 @@ proc do_push_anywhere {} { > bind $w "grab $w; focus $w.buttons.create" > bind $w "destroy $w" > bind $w [list start_push_anywhere_action $w] >- wm title $w [append "[appname] ([reponame]): " [mc "Push"]] >+ wm title $w [mc "%s (%s): Push" [appname] [reponame]] > wm deiconify $w > tkwait window $w > } Well spotted! -- 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 2/2] git-gui: ensure the file in the diff pane is in the list of selected files

2016-10-03 Thread Pat Thoyts
) 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
u. > >That is, if that ever happens--is git-gui pretty much in deep >maintenance mode without anything more to do from your point of >view? > >Thanks. > I'm just starting to catch up once again. hopefully I can be a bit more reactive than recently. Merging 52285c83 look

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

2016-10-03 Thread Pat Thoyts
e to work with older versions of git as well. So adding a guard using the git-version procedure should maintain that backwards compatibility. I suggest: >From c2716458f05893ca88c05ce211a295a330e74590 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 24 Sep 2016 13:30:22 +0200 Subject: [PA

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

2015-11-09 Thread Pat Thoyts
ghted 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 >statement)? > >Ciao, >Johannes A bit late to the party but

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

2015-10-14 Thread Pat Thoyts
ate: 2015-10-12 11:36+\n" >+"Last-Translator: Dimitriy Ryazantcev \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" > &qu

REQUEST-PULL: Please pull from git-gui.

2015-04-18 Thread Pat Thoyts
Lehmann (2): 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

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

2015-03-12 Thread Pat Thoyts
les > Makes chooser set 'gitdir' to the resolved path > > lib/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

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

2015-01-12 Thread Pat Thoyts
else { >> @@ -1539,7 +1539,7 @@ proc rescan_stage2 {fd after} { >> close $fd >> } >> >> -if {[package vsatisfies $::_git_version 1.6.3-]} { >> +if {[package vcompare $::_git_version 1.6.3] >= 0} { >> set ls_others [li

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

2015-01-12 Thread Pat Thoyts
> display_all_files_helper $ui_index $path \ >@@ -1993,6 +1995,7 @@ proc display_all_files {} { > if {$s ne {_}} { > display_all_files_helper $ui_workdir $path \ > $icon_name $s >

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

2014-08-10 Thread Pat Thoyts
an alternate location. >Convenient! > >> git-gui directory in my tree comes from its upstream repository >> git://repo.or.cz/git-gui.git/, and it is maintained by Pat Thoyts >> (Cc'ed). > >> Note that these two upstream projects do not have leading >

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

2014-08-10 Thread Pat Thoyts
approximately %i > loose objects. Applying this to git-gui I get an error raised can't read "repo_config(gc.auto)": no such element in array which occurs because I've never set this config variable and it is not present in the default_config array which is used to initialize repo_

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

2014-06-15 Thread Pat Thoyts
ot;Error creating temporary directory %s:" > $gitktmpdir] $err" > unset gitktmpdir This is a problem on Windows where we will not have mktemp. In Tcl 8.6 the file command acquired a "file tempfile" command to help with this kind of issue (https://www.tcl.tk/ma

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

2014-06-13 Thread Pat Thoyts
when the underlying git version supports that >option. > >Signed-off-by: Jens Lehmann >Signed-off-by: Junio C Hamano >--- > > * Pat, I've been carrying this in my 'pu' but I would prefer > changes to git-gui fed to me through you. Could you

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

2014-05-17 Thread Pat Thoyts
n using an unlimited check by appending a - (minus sign) to the version to yield an open ended range. Or by giving another 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 bu

Re: git gui error with relocated repository

2014-05-06 Thread Pat Thoyts
gt;> >> $ git --version >> git version 2.0.0.rc0 >> >> $ cat .git >> gitdir: ../.git/modules/ >> >> $ git rev-parse --git-dir >> /home/chris/src//.git/modules/ >> >> $ git config core.worktree >> ../../../ >> &g

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 wrote: > Am 1/23/2014 13:02, schrieb Pat Thoyts: >> On 23 January 2014 07:28, Johannes Sixt wrote: >>> @@ -1773,7 +1773,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES >>> >>> git.res: git.rc GIT-VERS

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

2014-01-23 Thread Pat Thoyts
file. Given that the majority of versions has the same first two digits this becomes fairly useless without the patchlevel digit. So it would be preferable to try to maintain all three digits. The following should do this: GIT_VERSION=1.9.rc0 all: echo $(join -DMAJOR= -DMINOR= -DPATCH=, \

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

Re: [PATCH] Improve font rendering on retina macbooks

2013-08-27 Thread Pat Thoyts
his patch in, if you like it. I've >never contributed 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.

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

2013-08-27 Thread Pat Thoyts
ommarea -weight 0 >+} else { >+ .vpane.lower paneconfigure .vpane.lower.diff -stretch always >+ .vpane.lower paneconfigure .vpane.lower.commarea -stretch never >+} > > # -- Commit Area Buttons > # Also fine and applied. Thank you. -- Pat Thoyts

Re: [PATCH] Add gui.displayuntracked option

2013-08-27 Thread Pat Thoyts
tracked {mc "Staging of untracked files"} {list > "yes" "no" "ask"}} >+ {b gui.displayuntracked {mc "Show untracked files"}} > } { > set type [lindex $option 0] > set name [lindex $opti

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 wrote: > Stefan Haller 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, commit 76bf6ff93e.) >> >> We do thi

REQUEST PULL: git-gui

2013-06-15 Thread Pat Thoyts
French translation: copy -> 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 Pat Thoyts (4): git-

REQUEST-PULL: some msysgit build patches for upstream

2013-06-06 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 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 first thing, so that

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 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

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

2013-01-09 Thread Pat Thoyts
ion on Stackoverflow [1]. >> >> Please let me know if you need more information or if I should send >> this problem to some other mailing list. >> Thank you, Tobias >> >> >> [1] >> http://stackoverflow.com/questions/13223868/how-to-stage-line-by-line-i

Re: [msysGit] Re: Python extension commands in git - request for policy change

2012-11-25 Thread Pat Thoyts
On 25 November 2012 03:15, Nguyen Thai Ngoc Duy wrote: > CCing msysgit. I vaguely remember they had problems with building > Python on Windows. I don't know if it's still an issue. > > On Sun, Nov 25, 2012 at 9:44 AM, Eric S. Raymond wrote: >> git presently contains one Python extension command,

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

2012-11-10 Thread Pat Thoyts
On 10 November 2012 21:13, Jean-Jacques Lafay wrote: > Le samedi 10 novembre 2012 21:00:10 UTC+1, Philip Oakley a écrit : >> >> From: "Jean-Jacques Lafay" Sent: Saturday, >> November 10, 2012 5:36 PM >> > In large repos, the recursion implementation of contains(commit, >> > commit_list) >> > may

[PULL REQUEST]: Please pull git-gui

2012-10-17 Thread Pat Thoyts
Heiko 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):

Re: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing

2012-09-17 Thread Pat Thoyts
of "git commit-tree" in the >implementation of this Tcl procedure instead. > >Pat? > I agree - this looks like the code in contrib/examples/git-commit.sh so presumably predates the builtin 'commit' command. For now I've applied the above - but this should be chan

Re: [PATCH 1/2] git-gui: Fix a loose/lose mistake

2012-09-17 Thread Pat Thoyts
changes and it can be difficult\ >> to retrieve them later from the reflog. You should probably cancel this\ >> commit and create a new branch to continue.\n\ >> \n\ > >Looks obviously correct; Pat? > Yes. Applied. -- Pat Thoytshttp://www

Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

2012-09-17 Thread Pat Thoyts
1B-Key-u> do_unstage_selection >+bind . <$M1B-Key-U> do_unstage_selection > bind . <$M1B-Key-j> do_revert_selection > bind . <$M1B-Key-J> do_revert_selection > bind . <$M1B-Key-i> do_add_all Looks good to me. Applied. Thank you. -- Pat Thoyts