{"thread":{"id":"3364","subject":"contrib/ area","startedAt":"2006-02-17T11:07:33Z","lastAt":"2006-02-21T07:43:32Z","messageCount":14,"participants":["Junio C Hamano","Alexandre Julliard","Martin Langhoff","Aneesh Kumar","Sam Vilain","Ben Clifford","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16309","messageId":"7vmzgq451m.fsf@assigned-by-dhcp.cox.net","threadId":"3364","inReplyTo":null,"subject":"contrib/ area","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-17T11:07:33Z","receivedAt":"2006-02-17T11:07:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"As some of you may be aware, I've added contrib/ area to git.git\nrepository. Currently there are git-svn from Eric and gitview\nfrom Aneesh.\n\nThe intention is to keep interesting tools around git, maybe\neven experimental ones, to give users an easier access to them,\nand to give tools wider exposure, so that they can be improved\nfaster.\n\nI am expecting not to touch them myself that much. As far as my\nday-to-day operation is concerned, contrib/git-svn is owned by\nEric and contrib/gitview by Aneesh. I am willing to help if\nusers of these components and the contrib/ subtree \"owners\" have\ntechnical/design issues to resolve, but the initiative to fix\nand/or enhance things _must_ be on the side of the subtree\nowners. IOW, I won't be actively looking for bugs and rooms for\nenhancements in them as the git maintainer -- I may only do so\njust as one of the users when I want to scratch my own itch. If\nyou have patches to things in contrib/ area, the patch should be\nfirst sent to the primary author, and then the primary author\nshould ack and forward it to me (git pull request is nicer).\nThis is the same way as how I treated gitk, so you know the\ndrill.\n\nI expect that things that start their life in the contrib/ area\nto graduate out of contrib/ once they mature, either by becoming\nprojects on their own, or moving to the toplevel directory. On\nthe other hand, I expect I'll be proposing removal of disused\nand inactive ones from time to time.\n\nBy the way, I have to admit that merging these two were a bit\npainful for me. They came as text attachments to e-mail\nmessages, and I ended up hand committing with --author flag,\nwhile fixing up whitespaces in them [*1*]. I do not want to do\nthat again. So if you have new things to add to the contrib/\narea, please first propose it on the list, and after a list\ndiscussion proves there are some general interests (it does not\nhave to be a list-wide consensus for a tool targeted to a\nrelatively narrow audience -- for example I do not work with\nprojects whose upstream is svn, so I have no use for git-svn\nmyself), submit a patch to create a subdirectory of contrib/ and\nput your stuff there.\n\nOne final request to Aneesh. Could you send a patch to add a\nbit of blurb and introductory text in contrib/gitview/README,\nplease? As it stands, it would be hard to get as much exposure\nas we had hoped by just having it in git.git repository.\n\n[Footnote]\n\n*1* I _am_ picky about whitespaces, and I would encourage people\nto enable the pre-commit example hook.\n"},{"id":"16312","messageId":"873biikx6k.fsf@wine.dyndns.org","threadId":"3364","inReplyTo":"7vmzgq451m.fsf@assigned-by-dhcp.cox.net","subject":"Re: contrib/ area","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-02-17T12:05:23Z","receivedAt":"2006-02-17T12:05:23Z","isPatch":false,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Junio C Hamano writes:\n\n> By the way, I have to admit that merging these two were a bit\n> painful for me. They came as text attachments to e-mail\n> messages, and I ended up hand committing with --author flag,\n> while fixing up whitespaces in them [*1*]. I do not want to do\n> that again. So if you have new things to add to the contrib/\n> area, please first propose it on the list, and after a list\n> discussion proves there are some general interests (it does not\n> have to be a list-wide consensus for a tool targeted to a\n> relatively narrow audience -- for example I do not work with\n> projects whose upstream is svn, so I have no use for git-svn\n> myself), submit a patch to create a subdirectory of contrib/ and\n> put your stuff there.\n\nIs there interest in an emacs interface for git? I posted a first\nversion (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\nsome time ago, I'd be happy to send you a patch with my latest version\nif you want to include it.\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"16313","messageId":"46a038f90602170424u59f84ac8l1311d80cd7251394@mail.gmail.com","threadId":"3364","inReplyTo":"873biikx6k.fsf@wine.dyndns.org","subject":"Re: contrib/ area","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-02-17T12:24:55Z","receivedAt":"2006-02-17T12:24:55Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 2/18/06, Alexandre Julliard wrote:\n> Is there interest in an emacs interface for git? I posted a first\n> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\n> some time ago, I'd be happy to send you a patch with my latest version\n> if you want to include it.\n\nYes, please. I'd really like to see it help handle conflicts, and\nprovide multi-pane views during merges. We are in love with emacs diff\nmode for conflict resolution when you end up with .rej files, but it\ndoesn't kick in properly with the inline conflict markers :-(\n\ncheers,\n\n\nm\n"},{"id":"16314","messageId":"cc723f590602170436l5b33ae6s1780c3c8d6383627@mail.gmail.com","threadId":"3364","inReplyTo":"7vmzgq451m.fsf@assigned-by-dhcp.cox.net","subject":"Re: contrib/ area","fromName":"Aneesh Kumar","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-02-17T12:36:41Z","receivedAt":"2006-02-17T12:36:41Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"On 2/17/06, Junio C Hamano wrote:\n>\n>\n> One final request to Aneesh. Could you send a patch to add a\n> bit of blurb and introductory text in contrib/gitview/README,\n> please? As it stands, it would be hard to get as much exposure\n> as we had hoped by just having it in git.git repository.\n>\n\n\nAttaching below the same in the form of patch generated by git format-patch\n\n-aneesh\n\n\nFrom nobody Mon Sep 17 00:00:00 2001\nFrom: Aneesh Kumar K.V \nDate: Fri Feb 17 18:18:36 2006 +0530\nSubject: Add a README for gitview\n\n---\n\n contrib/gitview/gitview.txt | 38 ++++++++++++++++++++++++++++++++++++++\n 1 files changed, 38 insertions(+), 0 deletions(-)\n create mode 100644 contrib/gitview/gitview.txt\n\n36acfaffcbb86bb4c8d2634ea84306a451a9c19b\ndiff --git a/contrib/gitview/gitview.txt b/contrib/gitview/gitview.txt\nnew file mode 100644\nindex 0000000..171295a\n--- /dev/null\n+++ b/contrib/gitview/gitview.txt\n@@ -0,0 +1,38 @@\n+gitview(1)\n+==========\n+\n+NAME\n+----\n+gitview - A GTK based repository browser for git\n+\n+SYNOPSIS\n+--------\n+'gitview' [options] [args]\n+\n+DESCRIPTION\n+---------\n+\n+Dependencies\n+\n+* Python 2.4\n+* PyGTK 2.8 or later\n+* PyCairo 1.0 or later\n+\n+OPTIONS\n+------\n+\t--without-diff\n+\t\tIf the user doesn't want to list the commit diffs in the main window. This may speed up the repository browsing.\n+\n+\t\n+\t\tAll the valid option for git-rev-list(1)\n+\n+EXAMPLES\n+------\n+\tgitview v2.6.12.. include/scsi drivers/scsi\n+\t Show as the changes since version v2.6.12 that changed any file in the include/scsi\n+\t or drivers/scsi subdirectories\n+\n+\tgitk --since=2.weeks.ago\n+\t Show the changes during the last two weeks \n+\n+\t\n-- \n1.2.0-dirty\n\n"},{"id":"16359","messageId":"7vu0axupnx.fsf@assigned-by-dhcp.cox.net","threadId":"3364","inReplyTo":"873biikx6k.fsf@wine.dyndns.org","subject":"Re: contrib/ area","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-18T06:49:54Z","receivedAt":"2006-02-18T06:49:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexandre Julliard writes:\n\n> Is there interest in an emacs interface for git? I posted a first\n> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\n> some time ago, I'd be happy to send you a patch with my latest version\n> if you want to include it.\n\nMartin already said he wants it, and I would second that. VC\nbackend is one of the things I kept in the TODO list for quite a\nwhile (I think since early September 2005)...\n"},{"id":"16360","messageId":"7voe15upnl.fsf@assigned-by-dhcp.cox.net","threadId":"3364","inReplyTo":"cc723f590602170436l5b33ae6s1780c3c8d6383627@mail.gmail.com","subject":"Re: contrib/ area","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-18T06:50:06Z","receivedAt":"2006-02-18T06:50:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Aneesh Kumar writes:\n\n> Attaching below the same in the form of patch generated by git format-patch\n\nI'll let it pass this time, but you forgot a sign-off and\nperhaps forgot to read Documentation/SubmittingPatches ;-).\n"},{"id":"16372","messageId":"cc723f590602180038i4186b38axa1cc7e06be385da0@mail.gmail.com","threadId":"3364","inReplyTo":"7voe15upnl.fsf@assigned-by-dhcp.cox.net","subject":"Re: contrib/ area","fromName":"Aneesh Kumar","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-02-18T08:38:06Z","receivedAt":"2006-02-18T08:38:06Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"On 2/18/06, Junio C Hamano wrote:\n> Aneesh Kumar writes:\n>\n> > Attaching below the same in the form of patch generated by git format-patch\n>\n> I'll let it pass this time, but you forgot a sign-off and\n> perhaps forgot to read Documentation/SubmittingPatches ;-).\n>\n>\n\nHow about sending the patches as attachment below. I am not sure how\nto inline patches in gmail.\n\n-aneesh\n\n\n>From nobody Mon Sep 17 00:00:00 2001\nFrom: Aneesh Kumar K.V \nDate: Sat Feb 18 13:54:50 2006 +0530\nSubject: Fix a typo\nSigned-off-by: Aneesh Kumar K.V \n\n---\n\n contrib/gitview/gitview.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n3cca8b8cf1840cf7179ffc89ce52fe2c012beaf6\ndiff --git a/contrib/gitview/gitview.txt b/contrib/gitview/gitview.txt\nindex 171295a..fcf759c 100644\n--- a/contrib/gitview/gitview.txt\n+++ b/contrib/gitview/gitview.txt\n@@ -32,7 +32,7 @@ EXAMPLES\n \t Show as the changes since version v2.6.12 that changed any file in the include/scsi\n \t or drivers/scsi subdirectories\n \n-\tgitk --since=2.weeks.ago\n+\tgitview --since=2.weeks.ago\n \t Show the changes during the last two weeks \n \n \t\n-- \n1.2.1.g45d2-dirty\n\n"},{"id":"16375","messageId":"7v1wy1qbt2.fsf@assigned-by-dhcp.cox.net","threadId":"3364","inReplyTo":"cc723f590602180038i4186b38axa1cc7e06be385da0@mail.gmail.com","subject":"Re: contrib/ area","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-18T09:02:49Z","receivedAt":"2006-02-18T09:02:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aneesh Kumar\" writes:\n\n> How about sending the patches as attachment below. I am not sure how\n> to inline patches in gmail.\n\nFor some reason, attachment is usually frowned upon, but if you\ncannot do anything else, then at least please do _not_ hide the\ncommit log message in the attachment.\n\nThe short description of the patch should be on the Subject:\nline. Make sure it makes sense if your short description\nappeared in \"git log --pretty=short\" output without the rest of\nthe commit log message. \"Fix a typo\" is an example of bad\ndescription -- you cannot tell typo in what part of the tree was\nfixed by the commit.\n\nAnd the rest of the log message, including the sign-off,\nshould be in the main text. Also short administrative message\nshould come *after* the three-dash separators.\n\nSo, I would have done the message I am replying to like this:\n\n***\tFrom: \"Aneesh Kumar\" \n\tTo: gitster\n\tcc: git@vger.kernel.org\n Subject: gitview: typofix in documentation\n***\tDate: Sat Feb 18 13:54:50 2006 +0530\n\n\tI forgot to change the name of the program when I copy &\n\tpasted.\n\n\tSigned-off-by: An Ku \n\n\t---\n\n On 2/18/06, Junio C Hamano wrote:\n > Aneesh Kumar writes:\n >\n > > Attaching below the same in the form of patch genera...\n >\n > I'll let it pass this time, but you forgot a sign-off ...\n > perhaps forgot to read Documentation/SubmittingPatches...\n >\n\n How about sending the patches as attachment below. I am not\n sure how to inline patches in gmail.\n\n -aneesh\n\n\t[git-diff output comes here, preferrably inline but\n\t otherwise as a text/plain attachment.]\n\nLet your MUA fill in *** lines. You _could_ override them with\nthe first lines of the _body_ of your message like this if you\nreally need it. Most of the time you shouldn't care.\n\n\n***\tFrom: \"Aneesh Kumar\" \n\tTo: gitster\n\tcc: git@vger.kernel.org\n Subject: gitview: typofix in documentation\n***\tDate: Sat Feb 18 13:54:50 2006 +0530\n\n\tFrom: \"An Ku\" \n Date: Fri Feb 17 10:00:00 2006 +0530\n\n\tI forgot to change the name of the program when I copy &\n\tpasted.\n\n\tSigned-off-by: An Ku \n\n\t---\n\t...\n"},{"id":"16388","messageId":"87r760k3xe.fsf@wine.dyndns.org","threadId":"3364","inReplyTo":"7vu0axupnx.fsf@assigned-by-dhcp.cox.net","subject":"Re: contrib/ area","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-02-18T16:49:33Z","receivedAt":"2006-02-18T16:49:33Z","isPatch":false,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Junio C Hamano writes:\n\n> Alexandre Julliard writes:\n>\n>> Is there interest in an emacs interface for git? I posted a first\n>> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\n>> some time ago, I'd be happy to send you a patch with my latest version\n>> if you want to include it.\n>\n> Martin already said he wants it, and I would second that. VC\n> backend is one of the things I kept in the TODO list for quite a\n> while (I think since early September 2005)...\n\nActually the interface I wrote (patch in separate mail) is not an\nemacs VC backend, it's a project tree browser similar to pcl-cvs. It's\nIMO a much better fit to the git philosophy than the per-file VC\nhooks. But I'm planning to add VC backend support eventually...\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"16423","messageId":"43F8E0B8.20508@vilain.net","threadId":"3364","inReplyTo":"873biikx6k.fsf@wine.dyndns.org","subject":"Re: contrib/ area","fromName":"Sam Vilain","fromEmail":"sam@vilain.net","sentAt":"2006-02-19T21:18:48Z","receivedAt":"2006-02-19T21:18:48Z","isPatch":false,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Alexandre Julliard wrote:\n> Is there interest in an emacs interface for git? I posted a first\n> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\n> some time ago, I'd be happy to send you a patch with my latest version\n> if you want to include it.\n\nOut of interest, why did you choose not to make this a vc- plug-in?\n\nSam.\n"},{"id":"16425","messageId":"87lkw7dnd1.fsf@wine.dyndns.org","threadId":"3364","inReplyTo":"43F8E0B8.20508@vilain.net","subject":"Re: contrib/ area","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-02-19T21:56:10Z","receivedAt":"2006-02-19T21:56:10Z","isPatch":false,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Sam Vilain writes:\n\n> Alexandre Julliard wrote:\n>> Is there interest in an emacs interface for git? I posted a first\n>> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)\n>> some time ago, I'd be happy to send you a patch with my latest version\n>> if you want to include it.\n>\n> Out of interest, why did you choose not to make this a vc- plug-in?\n\nFor the same reason that there are both vc-cvs and pcl-cvs modes, they\nare completely different approaches to the user interface. The VC mode\nis purely file-oriented, and is very limited in its ability to handle\nproject-wide changes. It has its uses, but IMO there's no way to\nexploit the full capabilities of a tool like git (or even CVS) with\nthe VC interface.\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"16487","messageId":"Pine.OSX.4.64.0602201737260.16179@piva.hawaga.org.uk","threadId":"3364","inReplyTo":"7vmzgq451m.fsf@assigned-by-dhcp.cox.net","subject":"Re: contrib/ area","fromName":"Ben Clifford","fromEmail":"benc@hawaga.org.uk","sentAt":"2006-02-21T01:41:50Z","receivedAt":"2006-02-21T01:41:50Z","isPatch":false,"sender":{"key":"benc@hawaga.org.uk","avatar":"https://gravatar.com/avatar/c7ce083471287f8e77b69dd147f757799d1efdd740727fd7e3003f33e88be898?d=mp&s=160"},"body":"\n\n> As some of you may be aware, I've added contrib/ area to git.git\n> repository. Currently there are git-svn from Eric and gitview\n> from Aneesh.\n>\n> The intention is to keep interesting tools around git, maybe\n> even experimental ones, to give users an easier access to them,\n> and to give tools wider exposure, so that they can be improved\n> faster.\n\nI have been keeping some (lazily-maintained) bash completion code at:\n\nhttp://www.hawaga.org.uk/ben/tech/gitcompletion/\n\nIt isn't clear to me whether it should stay there or be merged into \ngit/contrib/.\n\nCogito has the cogito bits of the above already included.\n\nStg doesn't.\n\nThe path of least resistence for me is to keep it at the above \nhawaga.org.uk URL, but it may be that some people would prefer it in the \nmain repos.\n\nBen\n\n-- \n"},{"id":"16489","messageId":"7v64n95pnm.fsf@assigned-by-dhcp.cox.net","threadId":"3364","inReplyTo":"Pine.OSX.4.64.0602201737260.16179@piva.hawaga.org.uk","subject":"Re: contrib/ area","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-21T03:58:21Z","receivedAt":"2006-02-21T03:58:21Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ben Clifford writes:\n\n> I have been keeping some (lazily-maintained) bash completion code at:\n>\n> http://www.hawaga.org.uk/ben/tech/gitcompletion/\n>\n> It isn't clear to me whether it should stay there or be merged into\n> git/contrib/.\n> ...\n> The path of least resistence for me is to keep it at the above\n> hawaga.org.uk URL, but it may be that some people would prefer it in\n> the main repos.\n\nI am OK either way. They are small enough to be in contrib/\narea, and bash users may appreciate easier availability. What I\nwould _refuse_ to do is to maintain code for other people ;-).\nAs long as you or somebody else is going to keep them updated as\nneeded, I do not mind carrying them in contrib/.\n\nAs a practice for doing \"even cooler merge\", I did the\nfollowing, to see if I can treat it just like I treat gitk.\n\n (1) give you a topic branch.\n $ git checkout -b bc/completion master\n\n (2) fetch your tip\n $ git fetch http://www.hawaga.org.uk/gitcompletion.git/\n\n (3) for a practice of a later \"renaming\" merge, pretend you were\n one rev behind than you actually are.\n $ COMMIT=`git rev-parse FETCH_HEAD^`\n\n (4) extract things under contrib/completion/\n $ git read-tree $COMMIT\n $ git checkout-index --prefix=contrib/completion/ -a\n\n (5) throw the index away, and add the files back into the real index.\n $ git reset\n $ git add contrib/completion\n\n (6) write the result of \"even cooler merge\" out, with a merge\n commit message:\n $ T=`git-write-tree`\n $ sed -e 's/^[0-9a-f]*/'$COMMIT/ <.git/FETCH_HEAD |\n git-fmt-merge-msg |\n git commit-tree $T -p `git rev-parse HEAD` -p $COMMIT\n\n (7) a practice of later merge\n $ git pull -s recursive http://www.hawaga.org.uk/gitcompletion.git/\n\nThe result is sitting at the tip of \"pu\" branch.\n"},{"id":"16493","messageId":"20060221074332.GK9573@pasky.or.cz","threadId":"3364","inReplyTo":"b7bc5ebe0602202110l53418b32q@mail.gmail.com","subject":"Re: contrib/ area","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-02-21T07:43:32Z","receivedAt":"2006-02-21T07:43:32Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Tue, Feb 21, 2006 at 06:10:05AM CET, I got a letter\nwhere Ben Clifford said that...\n> > As a practice for doing \"even cooler merge\", I did the\n> > following, to see if I can treat it just like I treat gitk.\n> \n> neat.\n> \n> one thing that bothers me a bit about that is that the cogito code\n> then ends up in both the git and cogito repositories (actually the way\n> its done manually for cogito contrib/ at the moment bothers me\n> anyway).\n\nWell, in the long term, Jonas is working on a bash completion generated\nautomagically from the cg sources (anything maintained externally is bad\n'coz it gets out of sync, mm'kay? ;).\n\nIn the short term, I can just accept patches from you - they do not even\nneed to get the filenames right, I can rewrite that. You see, I don't\nhave the cool recursive merge strategy so merging into a subdirectory is\npainful (and that bothers me too; we'll see yet).\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nOf the 3 great composers Mozart tells us what it's like to be human,\nBeethoven tells us what it's like to be Beethoven and Bach tells us\nwhat it's like to be the universe. -- Douglas Adams\n"}]}