{"thread":{"id":"12066","subject":"Using kdiff3 to compare two different revisions of a folder","startedAt":"2008-02-13T01:44:07Z","lastAt":"2008-02-17T11:35:44Z","messageCount":7,"participants":["André Goddard Rosa","Brian Downing","Robin Rosenberg","Jan Hudec"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"68590","messageId":"b8bf37780802121744i62849a53rfa71cc0571aec3a@mail.gmail.com","threadId":"12066","inReplyTo":null,"subject":"Using kdiff3 to compare two different revisions of a folder","fromName":"André Goddard Rosa","fromEmail":"andre.goddard@gmail.com","sentAt":"2008-02-13T01:44:07Z","receivedAt":"2008-02-13T01:44:07Z","isPatch":false,"sender":{"key":"andre.goddard@gmail.com","avatar":null},"body":"Hi, all!\n\n    I would like to use kdiff3 to compare some folder like \"include\"\nbetween two different revisions.\n    It would be something like \"git diff v2.5:makefile HEAD:makefile\",\nbut for an entire folder.\n\n    Kdiff3 give me a quick glance of its nice graphical output of the\ndifferences, without have to resort to looking/parsing 'git log'\noutput.\n    For now, easiest way for me is to keep my tree replicated in two\ndifferent folders pointing to different revisions then use it.\n\n    Is there a better way to do this kind of comparison?\n\nThanks in advance,\n-- \n[]s,\nAndré Goddard\n"},{"id":"68661","messageId":"20080213174428.GN27535@lavos.net","threadId":"12066","inReplyTo":"b8bf37780802121744i62849a53rfa71cc0571aec3a@mail.gmail.com","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"Brian Downing","fromEmail":"bdowning@lavos.net","sentAt":"2008-02-13T17:44:28Z","receivedAt":"2008-02-13T17:44:28Z","isPatch":false,"sender":{"key":"bdowning@lavos.net","avatar":"https://avatars.githubusercontent.com/u/366426?v=4"},"body":"On Tue, Feb 12, 2008 at 11:44:07PM -0200, André Goddard Rosa wrote:\n>     I would like to use kdiff3 to compare some folder like \"include\"\n> between two different revisions.\n>     It would be something like \"git diff v2.5:makefile HEAD:makefile\",\n> but for an entire folder.\n> \n>     Kdiff3 give me a quick glance of its nice graphical output of the\n> differences, without have to resort to looking/parsing 'git log'\n> output.\n>     For now, easiest way for me is to keep my tree replicated in two\n> different folders pointing to different revisions then use it.\n> \n>     Is there a better way to do this kind of comparison?\n\nMaybe you want something like this?  This uses kdiff3 to compare two\nfull commits, by extracting the changed files into a temporary location.\nModifying it so it can work with path limiters and/or take arguments\nexactly like 'git diff' is left as an excercise for the reader.\n\n-bcd\n\n#!/bin/sh -e\n\n# usage: git-kdiff3 commit1 commit2\n\nSUBDIRECTORY_OK=1\n. git-sh-setup\ncd_to_toplevel\n\nO=\".git-kdiff3-tmp-$$\"\nlist=\"$O/list\"\ntrap \"rm -rf $O\" 0\nmkdir $O\n\ngit diff --name-only -z $1 $2 > $list\n\ncat $list | xargs -0 git archive --prefix=a/ $1 | tar xf - -C $O\ncat $list | xargs -0 git archive --prefix=b/ $2 | tar xf - -C $O\n\nkdiff3 $O/a $O/b\n"},{"id":"68680","messageId":"200802132338.18449.robin.rosenberg.lists@dewire.com","threadId":"12066","inReplyTo":"b8bf37780802121744i62849a53rfa71cc0571aec3a@mail.gmail.com","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-02-13T22:38:18Z","receivedAt":"2008-02-13T22:38:18Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdagen den 13 februari 2008 skrev André Goddard Rosa:\n> Hi, all!\n> \n>     I would like to use kdiff3 to compare some folder like \"include\"\n> between two different revisions.\n>     It would be something like \"git diff v2.5:makefile HEAD:makefile\",\n> but for an entire folder.\n> \n>     Kdiff3 give me a quick glance of its nice graphical output of the\n> differences, without have to resort to looking/parsing 'git log'\n> output.\n>     For now, easiest way for me is to keep my tree replicated in two\n> different folders pointing to different revisions then use it.\n> \n>     Is there a better way to do this kind of comparison?\n\nYes.\n\tgit diff <whatever options> | kompare -\n\n-- robin\n"},{"id":"68689","messageId":"b8bf37780802131636q698ebb21kc415328c04d8425d@mail.gmail.com","threadId":"12066","inReplyTo":"200802132338.18449.robin.rosenberg.lists@dewire.com","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"André Goddard Rosa","fromEmail":"andre.goddard@gmail.com","sentAt":"2008-02-14T00:36:34Z","receivedAt":"2008-02-14T00:36:34Z","isPatch":false,"sender":{"key":"andre.goddard@gmail.com","avatar":null},"body":"> >     Is there a better way to do this kind of comparison?\n>\n> Yes.\n>         git diff <whatever options> | kompare -\n>\n\nThanks, Robin! It works too.\n\n-- \n[]s,\nAndré Goddard\n"},{"id":"68690","messageId":"b8bf37780802131637t1b7ec2e6he57919fdb7760050@mail.gmail.com","threadId":"12066","inReplyTo":"20080213174428.GN27535@lavos.net","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"André Goddard Rosa","fromEmail":"andre.goddard@gmail.com","sentAt":"2008-02-14T00:37:18Z","receivedAt":"2008-02-14T00:37:18Z","isPatch":false,"sender":{"key":"andre.goddard@gmail.com","avatar":null},"body":"On Feb 13, 2008 3:44 PM, Brian Downing <bdowning@lavos.net> wrote:\n>\n> On Tue, Feb 12, 2008 at 11:44:07PM -0200, André Goddard Rosa wrote:\n> >     I would like to use kdiff3 to compare some folder like \"include\"\n> > between two different revisions.\n> >     It would be something like \"git diff v2.5:makefile HEAD:makefile\",\n> > but for an entire folder.\n> >\n> >     Kdiff3 give me a quick glance of its nice graphical output of the\n> > differences, without have to resort to looking/parsing 'git log'\n> > output.\n> >     For now, easiest way for me is to keep my tree replicated in two\n> > different folders pointing to different revisions then use it.\n> >\n> >     Is there a better way to do this kind of comparison?\n>\n> Maybe you want something like this?  This uses kdiff3 to compare two\n> full commits, by extracting the changed files into a temporary location.\n> Modifying it so it can work with path limiters and/or take arguments\n> exactly like 'git diff' is left as an excercise for the reader.\n>\n> -bcd\n>\n> #!/bin/sh -e\n>\n> # usage: git-kdiff3 commit1 commit2\n>\n> SUBDIRECTORY_OK=1\n> . git-sh-setup\n> cd_to_toplevel\n>\n> O=\".git-kdiff3-tmp-$$\"\n> list=\"$O/list\"\n> trap \"rm -rf $O\" 0\n> mkdir $O\n>\n> git diff --name-only -z $1 $2 > $list\n>\n> cat $list | xargs -0 git archive --prefix=a/ $1 | tar xf - -C $O\n> cat $list | xargs -0 git archive --prefix=b/ $2 | tar xf - -C $O\n>\n> kdiff3 $O/a $O/b\n>\n\nThanks a lot, it works like a charm! :)\n\n-- \n[]s,\nAndré Goddard\n"},{"id":"68973","messageId":"20080217105113.GC13178@efreet.light.src","threadId":"12066","inReplyTo":"b8bf37780802131636q698ebb21kc415328c04d8425d@mail.gmail.com","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"Jan Hudec","fromEmail":"bulb@ucw.cz","sentAt":"2008-02-17T10:51:13Z","receivedAt":"2008-02-17T10:51:13Z","isPatch":false,"sender":{"key":"bulb@ucw.cz","avatar":null},"body":"On Wed, Feb 13, 2008 at 22:36:34 -0200, André Goddard Rosa wrote:\n> > >     Is there a better way to do this kind of comparison?\n> >\n> > Yes.\n> >         git diff <whatever options> | kompare -\n> >\n> \n> Thanks, Robin! It works too.\n\nIt should be noted, that kompare seems to be the only graphical tool willing\nto accept patch instead of two trees. Unfortunately it does not seem possible\nto install it without KDE, not to speak about Windows (where kdiff3 works\nquite well).\n\n-- \n\t\t\t\t\t\t Jan 'Bulb' Hudec <bulb@ucw.cz>\n"},{"id":"68978","messageId":"b8bf37780802170335r5a3eeb99q40da4d89044bf9e7@mail.gmail.com","threadId":"12066","inReplyTo":"20080217105113.GC13178@efreet.light.src","subject":"Re: Using kdiff3 to compare two different revisions of a folder","fromName":"André Goddard Rosa","fromEmail":"andre.goddard@gmail.com","sentAt":"2008-02-17T11:35:44Z","receivedAt":"2008-02-17T11:35:44Z","isPatch":false,"sender":{"key":"andre.goddard@gmail.com","avatar":null},"body":"On Feb 17, 2008 8:51 AM, Jan Hudec <bulb@ucw.cz> wrote:\n> On Wed, Feb 13, 2008 at 22:36:34 -0200, André Goddard Rosa wrote:\n> > > >     Is there a better way to do this kind of comparison?\n> > >\n> > > Yes.\n> > >         git diff <whatever options> | kompare -\n> > >\n> >\n> > Thanks, Robin! It works too.\n>\n> It should be noted, that kompare seems to be the only graphical tool willing\n> to accept patch instead of two trees. Unfortunately it does not seem possible\n> to install it without KDE, not to speak about Windows (where kdiff3 works\n> quite well).\n>\n\nYes, it is true. Patch support is not yet implemented on kdiff3.\n\nBest regards,\n-- \n[]s,\nAndré Goddard\n"}]}