{"thread":{"id":"9632","subject":"git-kompare","startedAt":"2007-08-24T05:40:38Z","lastAt":"2007-08-25T10:25:07Z","messageCount":5,"participants":["Jean-Marc Valin","Andy Parkins","Robin Rosenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"51420","messageId":"46CE6F56.70803@csiro.au","threadId":"9632","inReplyTo":null,"subject":"git-kompare","fromName":"Jean-Marc Valin","fromEmail":"jean-marc.valin@csiro.au","sentAt":"2007-08-24T05:40:38Z","receivedAt":"2007-08-24T05:40:38Z","isPatch":false,"sender":{"key":"jean-marc.valin@csiro.au","avatar":null},"body":"Hi,\n\nI just wrote this tiny git-kompare script that I thought some may be\ninterested in. It basically does a visual diff using kompare. If it\nweren't for bugs in kompare, the script would basically do:\n\ngit diff --unified=99999 $* | kompare -\n\nAs you can see, I really suck at shell programming, so this isn't\nintended for being merged, although probably anyone with a clue about\nshell can probably rewrite it in a slightly cleaner way. At the moment,\nthe only case it doesn't handle is when a file gets added and the\ninitial source is /dev/null.\n\nBugs it works around are:\n- Unrecognised git syntax\n(http://mail.kde.org/pipermail/kompare-devel/2006-August/000141.html\nwhich is fixed in some later version of kompare I think)\n- Kompare doesn't know about /dev/null as a file (fixed only for removal)\n- Kompare doesn't like it when the first file in the diff isn't in the\nroot of the repository.\n\nHope it's useful for someone (I really like it).\n\nCheers,\n\n\tJean-Marc\n\n\n#!/bin/sh\n(echo \"Index: a\\n--- a\\n+++ a\\n@@ -1,1 +1,1 @@\\n-\\n+\\n\"; git diff --unified=99999 $* | perl -ne 's/\\/dev\\/null/toto/; if (/^\\+\\+\\+/) {s/^\\+\\+\\+ b\\/(.*)$/+++ $1\\t(old version)/;} if (/^---/) {s/^--- a\\/(.*)$/--- $1\\t(new version)/;} print;') | kompare -\n"},{"id":"51453","messageId":"200708241813.48012.andyparkins@gmail.com","threadId":"9632","inReplyTo":"46CE6F56.70803@csiro.au","subject":"Re: git-kompare","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2007-08-24T17:13:45Z","receivedAt":"2007-08-24T17:13:45Z","isPatch":false,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"On Friday 2007, August 24, Jean-Marc Valin wrote:\n\n> (http://mail.kde.org/pipermail/kompare-devel/2006-August/000141.html\n> which is fixed in some later version of kompare I think)\n\nI was the original reporter of that bug; I have to say the kompare \ndevelopers were fairly quick on the uptake and fixed that problem with the \nnext realease of kompare - which came very soon after the report.  I just \nwaited for it to arrive in debian unstable, which also happened fairly \nquickly.  If you are seriously that far behind in your kompare version I \nstrongly suggest upgrading, I mean, if it's in debian then it's in \neverything else :-)\n\nI found it quite nostalgic seeing that report, as I made the report a few \ndays after my first use of git, which means I've just had my git \nanniversary.  How quickly time flys - I can hardly believe I ever managed \nwithout it now.\n\n\n\nAndy\n-- \nDr Andy Parkins, M Eng (hons), MIET\nandyparkins@gmail.com\n"},{"id":"51467","messageId":"200708242152.09176.robin.rosenberg.lists@dewire.com","threadId":"9632","inReplyTo":"200708241813.48012.andyparkins@gmail.com","subject":"Re: git-kompare","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2007-08-24T19:52:08Z","receivedAt":"2007-08-24T19:52:08Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"fredag 24 augusti 2007 skrev Andy Parkins:\n> On Friday 2007, August 24, Jean-Marc Valin wrote:\n> \n> > (http://mail.kde.org/pipermail/kompare-devel/2006-August/000141.html\n> > which is fixed in some later version of kompare I think)\n> \n> I was the original reporter of that bug; I have to say the kompare \n> developers were fairly quick on the uptake and fixed that problem with the \n> next realease of kompare - which came very soon after the report.  I just \nI am more of a GIT developer than a KDE developer.\n\n> waited for it to arrive in debian unstable, which also happened fairly \n> quickly.  If you are seriously that far behind in your kompare version I \n> strongly suggest upgrading, I mean, if it's in debian then it's in \n> everything else :-)\n\nAdding the patch to your version isn't hard. Just download the source package\nand add the patch in the patches section and rebuild. That's how I lived with\nthe fix until Mandriva delivered a newer KDE version. Thanks to the kdesdk src\nrpm I could rebuild the package fairly easily without dowloading, configuring\nand builing most of KDE. The src rpm declare the dependencies I need. My \nguess is that is about as easy with dpkg, ebuilds or ports.\n\n> I found it quite nostalgic seeing that report, as I made the report a few \n> days after my first use of git, which means I've just had my git \n> anniversary.  How quickly time flys - I can hardly believe I ever managed \n> without it now.\n\nThis was about two months after starting to use git in my case. My first git bug was\nencountered abour ten minutes after trying git. (Linus fixed the bug the day after).\n\n-- robin\n"},{"id":"51488","messageId":"46CF7509.5080206@csiro.au","threadId":"9632","inReplyTo":"200708242152.09176.robin.rosenberg.lists@dewire.com","subject":"Re: git-kompare","fromName":"Jean-Marc Valin","fromEmail":"jean-marc.valin@csiro.au","sentAt":"2007-08-25T00:17:13Z","receivedAt":"2007-08-25T00:17:13Z","isPatch":false,"sender":{"key":"jean-marc.valin@csiro.au","avatar":null},"body":"> Adding the patch to your version isn't hard. Just download the source package\n> and add the patch in the patches section and rebuild. That's how I lived with\n> the fix until Mandriva delivered a newer KDE version. Thanks to the kdesdk src\n> rpm I could rebuild the package fairly easily without dowloading, configuring\n> and builing most of KDE. The src rpm declare the dependencies I need. My \n> guess is that is about as easy with dpkg, ebuilds or ports.\n\nUnless I missed something, there are more things to work around than the\none that was fixed in your patch, no? For example, the fact that kompare\ndoesn't understand when the filename is /dev/null. As for upgrading\nkompare, I'm all for the idea, but the KDE folks aren't making that\neasy. The only link in the Kompare download section is for www.kde.org,\nwhich isn't making the source code any easier to find (including a 404\nlink for \"Source code\" on the front page!). Any direct link?\n\nBTW, I'm running the latest Ubuntu (Feisty) that ships with kompare 3.4.\n\n\tJean-Marc\n"},{"id":"51522","messageId":"200708251225.08141.robin.rosenberg.lists@dewire.com","threadId":"9632","inReplyTo":"46CF7509.5080206@csiro.au","subject":"Re: git-kompare","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2007-08-25T10:25:07Z","receivedAt":"2007-08-25T10:25:07Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"lördag 25 augusti 2007 skrev Jean-Marc Valin:\n> > Adding the patch to your version isn't hard. Just download the source package\n> > and add the patch in the patches section and rebuild. That's how I lived with\n> > the fix until Mandriva delivered a newer KDE version. Thanks to the kdesdk src\n> > rpm I could rebuild the package fairly easily without dowloading, configuring\n> > and builing most of KDE. The src rpm declare the dependencies I need. My \n> > guess is that is about as easy with dpkg, ebuilds or ports.\n> \n> Unless I missed something, there are more things to work around than the\n> one that was fixed in your patch, no? For example, the fact that kompare\n> doesn't understand when the filename is /dev/null. As for upgrading\n\nI'm on 3.5.7 now so I cannot easily test 3.5.6 with the patch anymore, but\non *my machine* diffs (including git diffs) with /dev/null work just fine.\n\n-- robin\n\n> kompare, I'm all for the idea, but the KDE folks aren't making that\n> easy. The only link in the Kompare download section is for www.kde.org,\n> which isn't making the source code any easier to find (including a 404\n> link for \"Source code\" on the front page!). Any direct link?\n\nI suggested *not* to upgrade completely. Go to ubunu's home page\nand look for package sources and how to modify them. Ubuntu uses\nthe same package format as Debian so instructions for Debian will\nmost likely apply for Ubuntu.\n\n- robin\n"}]}