{"thread":{"id":"33658","subject":"[PATCH] gitk: simplify file filtering","startedAt":"2013-04-27T22:01:39Z","lastAt":"2013-05-13T14:53:19Z","messageCount":8,"participants":["Felipe Contreras","Paul Mackerras","Junio C Hamano","Stefan Haller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"215766","messageId":"1367100099-13798-1-git-send-email-felipe.contreras@gmail.com","threadId":"33658","inReplyTo":null,"subject":"[PATCH] gitk: simplify file filtering","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-04-27T22:01:39Z","receivedAt":"2013-04-27T22:01:39Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"git diff is perfectly able to do this with '-- files', no need for\nmanual filtering.\n\nSigned-off-by: Felipe Contreras \n---\n gitk-git/gitk | 20 +++++++-------------\n 1 file changed, 7 insertions(+), 13 deletions(-)\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex b3706fc..0863877 100755\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -7571,9 +7571,13 @@ proc diffcmd {ids flags} {\n }\n \n proc gettreediffs {ids} {\n- global treediff treepending\n+ global treediff treepending limitdiffs vfilelimit curview\n \n- if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return\n+ set cmd [diffcmd $ids {--no-commit-id}]\n+ if {$limitdiffs && $vfilelimit($curview) ne {}} {\n+\t set cmd [concat $cmd -- $vfilelimit($curview)]\n+ }\n+ if {[catch {set gdtf [open $cmd r]}]} return\n \n set treepending $ids\n set treediff {}\n@@ -7617,17 +7621,7 @@ proc gettreediffline {gdtf ids} {\n \treturn [expr {$nr >= $max? 2: 1}]\n }\n close $gdtf\n- if {$limitdiffs && $vfilelimit($curview) ne {}} {\n-\tset flist {}\n-\tforeach f $treediff {\n-\t if {[path_filter $vfilelimit($curview) $f]} {\n-\t\tlappend flist $f\n-\t }\n-\t}\n-\tset treediffs($ids) $flist\n- } else {\n-\tset treediffs($ids) $treediff\n- }\n+ set treediffs($ids) $treediff\n unset treepending\n if {$cmitmode eq \"tree\" && [llength $diffids] == 1} {\n \tgettree $diffids\n-- \n1.8.2.1.1031.g2ee5873\n"},{"id":"216985","messageId":"20130511094258.GC6196@iris.ozlabs.ibm.com","threadId":"33658","inReplyTo":"1367100099-13798-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2013-05-11T09:42:58Z","receivedAt":"2013-05-11T09:42:58Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Sat, Apr 27, 2013 at 05:01:39PM -0500, Felipe Contreras wrote:\n> git diff is perfectly able to do this with '-- files', no need for\n> manual filtering.\n> \n> Signed-off-by: Felipe Contreras \n\nThanks, applied, with the commit message expanded to say that this\nmakes gettreediffs do the same as getblobdiffs.\n\nPaul.\n"},{"id":"217099","messageId":"7vmwrzu7vt.fsf@alter.siamese.dyndns.org","threadId":"33658","inReplyTo":"20130511094258.GC6196@iris.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-12T22:54:14Z","receivedAt":"2013-05-12T22:54:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Paul Mackerras writes:\n\n> On Sat, Apr 27, 2013 at 05:01:39PM -0500, Felipe Contreras wrote:\n>> git diff is perfectly able to do this with '-- files', no need for\n>> manual filtering.\n>> \n>> Signed-off-by: Felipe Contreras \n>\n> Thanks, applied, with the commit message expanded to say that this\n> makes gettreediffs do the same as getblobdiffs.\n>\n> Paul.\n\nThanks; is this the last one for this cycle and is your usual branch\nready to be pulled?\n"},{"id":"217102","messageId":"20130513003602.GA8046@iris.ozlabs.ibm.com","threadId":"33658","inReplyTo":"7vmwrzu7vt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2013-05-13T00:36:02Z","receivedAt":"2013-05-13T00:36:02Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Sun, May 12, 2013 at 03:54:14PM -0700, Junio C Hamano wrote:\n> Paul Mackerras writes:\n> \n> > On Sat, Apr 27, 2013 at 05:01:39PM -0500, Felipe Contreras wrote:\n> >> git diff is perfectly able to do this with '-- files', no need for\n> >> manual filtering.\n> >> \n> >> Signed-off-by: Felipe Contreras \n> >\n> > Thanks, applied, with the commit message expanded to say that this\n> > makes gettreediffs do the same as getblobdiffs.\n> >\n> > Paul.\n> \n> Thanks; is this the last one for this cycle and is your usual branch\n> ready to be pulled?\n\nI'm still deciding whether to put in Martin Langhoff's patch with a\nmodified label (\"changing lines matching\" rather than \"with changes\nmatching regex\"). I'm leaning towards it but was waiting a little to\nsee if anyone had comments on the wording. I'll decide by the end of\ntoday and send you a pull request either way.\n\nThanks,\nPaul.\n"},{"id":"217145","messageId":"1l2t1t0.12u9785epsqikM%lists@haller-berlin.de","threadId":"33658","inReplyTo":"20130513003602.GA8046@iris.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Stefan Haller","fromEmail":"lists@haller-berlin.de","sentAt":"2013-05-13T08:58:49Z","receivedAt":"2013-05-13T08:58:49Z","isPatch":true,"sender":{"key":"lists@haller-berlin.de","avatar":null},"body":"Paul Mackerras wrote:\n\n> On Sun, May 12, 2013 at 03:54:14PM -0700, Junio C Hamano wrote:\n>\n> > Thanks; is this the last one for this cycle and is your usual branch\n> > ready to be pulled?\n> \n> I'm still deciding whether to put in Martin Langhoff's patch with a\n> modified label (\"changing lines matching\" rather than \"with changes\n> matching regex\"). I'm leaning towards it but was waiting a little to\n> see if anyone had comments on the wording. I'll decide by the end of\n> today and send you a pull request either way.\n\nWould you also consider Tair Sabirgaliev's v2 patch for not launching\ngitk in the background on Mac? This fixes a very serious usability\nproblem.\n\n \n\nThanks,\n Stefan\n\n\n-- \nStefan Haller\nBerlin, Germany\nhttp://www.haller-berlin.de/\n"},{"id":"217150","messageId":"20130513113426.GA13543@iris.ozlabs.ibm.com","threadId":"33658","inReplyTo":"7vmwrzu7vt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2013-05-13T11:34:26Z","receivedAt":"2013-05-13T11:34:26Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Sun, May 12, 2013 at 03:54:14PM -0700, Junio C Hamano wrote:\n> \n> Thanks; is this the last one for this cycle and is your usual branch\n> ready to be pulled?\n\nIt is now; please pull from the usual place,\ngit://ozlabs.org/~paulus/gitk.git.\n\nThanks,\nPaul.\n"},{"id":"217151","messageId":"20130513113734.GB13543@iris.ozlabs.ibm.com","threadId":"33658","inReplyTo":"1l2t1t0.12u9785epsqikM%lists@haller-berlin.de","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2013-05-13T11:37:34Z","receivedAt":"2013-05-13T11:37:34Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Mon, May 13, 2013 at 10:58:49AM +0200, Stefan Haller wrote:\n> \n> Would you also consider Tair Sabirgaliev's v2 patch for not launching\n> gitk in the background on Mac? This fixes a very serious usability\n> problem.\n> \n> \n\nYes, I put it in. I didn't see it when he posted because my spam\nfilters decided it was spam. :)\n\nPaul.\n"},{"id":"217188","messageId":"7vy5bjnd7k.fsf@alter.siamese.dyndns.org","threadId":"33658","inReplyTo":"20130513113426.GA13543@iris.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: simplify file filtering","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-13T14:53:19Z","receivedAt":"2013-05-13T14:53:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Paul Mackerras writes:\n\n> On Sun, May 12, 2013 at 03:54:14PM -0700, Junio C Hamano wrote:\n>> \n>> Thanks; is this the last one for this cycle and is your usual branch\n>> ready to be pulled?\n>\n> It is now; please pull from the usual place,\n> git://ozlabs.org/~paulus/gitk.git.\n>\n> Thanks,\n\nThanks. Here is what I ended up with:\n\n Merge git://ozlabs.org/~paulus/gitk\n \n * git://ozlabs.org/~paulus/gitk:\n gitk: On OSX, bring the gitk window to front\n gitk: Add support for -G'regex' pickaxe variant\n gitk: Add menu item for reverting commits\n gitk: Simplify file filtering\n gitk: Display the date of a tag in a human-friendly way\n gitk: Improve behaviour of drop-down lists\n gitk: Move hard-coded colors to .gitk\n\n gitk-git/gitk | 254 +++++++++++++++++++++++++++++++++++++++++++++-------------\n 1 file changed, 199 insertions(+), 55 deletions(-)\n"}]}