{"thread":{"id":"535","subject":"cg-log patches","startedAt":"2005-05-08T17:35:50Z","lastAt":"2005-05-10T00:37:13Z","messageCount":17,"participants":["Sean","Marcel Holtmann","Petr Baudis","Jonas Fonseca"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2787","messageId":"1742.10.10.10.24.1115573750.squirrel@linux1","threadId":"535","inReplyTo":null,"subject":"cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-08T17:35:50Z","receivedAt":"2005-05-08T17:35:50Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"Hi Petr,\n\nA few minor cg-log patches outlined below available for you at:\nhttp://git.homelinux.com/cogito\n\n\ncommit ce5e8e645754f3051ce3b3cf87c085544339acef\n\n Permit cg-log command line options to be given in any order\n\ncommit a1c2b474ad39750a07a43ddee2682f5613624652\n\n Make sure that CC: and From: lines are picked up as a valid\n part of the sign off process and given the proper color\n\ncommit 33762f33ee87377c0cfcea51382bad04d7c9ba8d\n\n Fix cg-log -f option so that a complete list of files is\n displayed when a commit has more than one parent.\n\n Move the list of files so they're displayed after the\n commit message\n\n List the files in columns, instead of one big line of comma-\n separated files.\n\n---\ncg-log | 135\n++++++++++++++++++++++++++---------------------------------------\n 1 files changed, 56 insertions(+), 79 deletions(-)\n\nCheers,\nSean\n\n\n"},{"id":"2789","messageId":"1115574136.9031.147.camel@pegasus","threadId":"535","inReplyTo":"1742.10.10.10.24.1115573750.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-08T17:42:16Z","receivedAt":"2005-05-08T17:42:16Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Sean,\n\n> commit 33762f33ee87377c0cfcea51382bad04d7c9ba8d\n> \n> Fix cg-log -f option so that a complete list of files is\n> displayed when a commit has more than one parent.\n> \n> Move the list of files so they're displayed after the\n> commit message\n> \n> List the files in columns, instead of one big line of comma-\n> separated files.\n\nwhy don't you use diffstat for it? I think that it is more handy then\nthe list of modified files.\n\nRegards\n\nMarcel\n\n\n"},{"id":"2792","messageId":"1856.10.10.10.24.1115576809.squirrel@linux1","threadId":"535","inReplyTo":"1115574136.9031.147.camel@pegasus","subject":"Re: cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-08T18:26:49Z","receivedAt":"2005-05-08T18:26:49Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Sun, May 8, 2005 1:42 pm, Marcel Holtmann said:\n\n> why don't you use diffstat for it? I think that it is more handy then\n> the list of modified files.\n\nHi Marcel,\n\nIs a good idea, but would be a fair bit harder to generate unfortunately. \nRight now the blobs themselves don't have to be opened and inspected, just\nthe commit trees. Actually, i'm not sure exactly how you'd even go about\ngenerating a correct diffstat for commits that have multiple parents.\n\nSean\n\n\n"},{"id":"2794","messageId":"1115578807.8949.12.camel@pegasus","threadId":"535","inReplyTo":"1856.10.10.10.24.1115576809.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-08T19:00:07Z","receivedAt":"2005-05-08T19:00:07Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Sean,\n\n> > why don't you use diffstat for it? I think that it is more handy then\n> > the list of modified files.\n> \n> Is a good idea, but would be a fair bit harder to generate unfortunately. \n> Right now the blobs themselves don't have to be opened and inspected, just\n> the commit trees. Actually, i'm not sure exactly how you'd even go about\n> generating a correct diffstat for commits that have multiple parents.\n\nI am not a really good git expert, but maybe another option for it would\nbe fine.\n\nHowever there is another thing that I am missing. With Bitkeeper I was\nable to do something like \"bk changes -umarcel\" to list all changes done\nby the user \"marcel\". I like to have something similar with cg-log. Any\nideas on how to do that?\n\nRegards\n\nMarcel\n\n\n"},{"id":"2795","messageId":"20050508190109.GC9495@pasky.ji.cz","threadId":"535","inReplyTo":"1896.10.10.10.24.1115577733.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-08T19:01:09Z","receivedAt":"2005-05-08T19:01:09Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, May 08, 2005 at 08:42:13PM CEST, I got a letter\nwhere Sean told me that...\n> On Sun, May 8, 2005 2:03 pm, Petr Baudis said:\n> \n> > do you think you could also send the patches by mail, please?\n> \n> Yes, attached. But i'm hoping you'll accept them from my .git repository\n> so that I can keep my own repository consistent, without conflicts from my\n> own patches being pulled back in from you with different commit id's.\n\nDifferent commit id's shouldn't make much difference w.r.t. conflicts.\n\n> Is there a problem with just using cogito to manage the patches?\n\nNo problem if I decide to accept all of your patches. But that's what I\nneed to find out by reviewing the patches, and when I have any comments,\nI want to point them out easily in the context of the patch.\n\n From this viewpoint the cumulative patch you've sent is unfortunately\nuseless - I need it broken to the commits, in separate mails, and either\nas text/plain attachments or inline, please.\n\n> >> What do you use to publish a repository?\n> >\n> > What do you mean?\n> \n> Well, I just copied the .git directory and everything under it up to the\n> website. But I wondered if there was a cg-push or something similar\n> which would handle things a little better. No biggy.\n\nNothing like that so far. It should be possible with the ssh protocol\nrelatively easily, and doable with rsync (although the locking is going\nto be pretty be hard).\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"2804","messageId":"20050508191831.GD9495@pasky.ji.cz","threadId":"535","inReplyTo":"1115578807.8949.12.camel@pegasus","subject":"Re: cg-log patches","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-08T19:18:31Z","receivedAt":"2005-05-08T19:18:31Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, May 08, 2005 at 09:00:07PM CEST, I got a letter\nwhere Marcel Holtmann told me that...\n> Hi Sean,\n> \n> > > why don't you use diffstat for it? I think that it is more handy then\n> > > the list of modified files.\n> > \n> > Is a good idea, but would be a fair bit harder to generate unfortunately. \n> > Right now the blobs themselves don't have to be opened and inspected, just\n> > the commit trees. Actually, i'm not sure exactly how you'd even go about\n> > generating a correct diffstat for commits that have multiple parents.\n> \n> I am not a really good git expert, but maybe another option for it would\n> be fine.\n> \n> However there is another thing that I am missing. With Bitkeeper I was\n> able to do something like \"bk changes -umarcel\" to list all changes done\n> by the user \"marcel\". I like to have something similar with cg-log. Any\n> ideas on how to do that?\n\nWhat should it take in regard? Username portion of the email address?\nThe email address itself? The realname?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"2800","messageId":"2014.10.10.10.24.1115580230.squirrel@linux1","threadId":"535","inReplyTo":"20050508191831.GD9495@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-08T19:23:50Z","receivedAt":"2005-05-08T19:23:50Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Sun, May 8, 2005 3:18 pm, Petr Baudis said:\n\n>> I am not a really good git expert, but maybe another option for it would\n>> be fine.\n>>\n>> However there is another thing that I am missing. With Bitkeeper I was\n>> able to do something like \"bk changes -umarcel\" to list all changes done\n>> by the user \"marcel\". I like to have something similar with cg-log. Any\n>> ideas on how to do that?\n>\n> What should it take in regard? Username portion of the email address?\n> The email address itself? The realname?\n>\n\nAttached is a new version of cg-log that includes a -u option that takes a\nsingle parameter. Whatever you put in that parameter will be searched in\nthe author line, so it can be part or all of an authors name and/or email\naddress.\n\nSo you could do:\n\ncg-log -c -f -u petr\n\nor\n\ncg-log -uxpasky\n\nSean\n"},{"id":"2798","messageId":"20050508192536.GE9495@pasky.ji.cz","threadId":"535","inReplyTo":"2014.10.10.10.24.1115580230.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-08T19:25:36Z","receivedAt":"2005-05-08T19:25:36Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, May 08, 2005 at 09:23:50PM CEST, I got a letter\nwhere Sean told me that...\n> On Sun, May 8, 2005 3:18 pm, Petr Baudis said:\n> \n> >> I am not a really good git expert, but maybe another option for it would\n> >> be fine.\n> >>\n> >> However there is another thing that I am missing. With Bitkeeper I was\n> >> able to do something like \"bk changes -umarcel\" to list all changes done\n> >> by the user \"marcel\". I like to have something similar with cg-log. Any\n> >> ideas on how to do that?\n> >\n> > What should it take in regard? Username portion of the email address?\n> > The email address itself? The realname?\n> >\n> \n> Attached is a new version of cg-log that includes a -u option that takes a\n> single parameter. Whatever you put in that parameter will be searched in\n> the author line, so it can be part or all of an authors name and/or email\n> address.\n> \n> So you could do:\n> \n> cg-log -c -f -u petr\n> \n> or\n> \n> cg-log -uxpasky\n> \n> Sean\n\nThat sounds great. Could you please post a patch against the current\nCogito's cg-log?\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"2801","messageId":"1115580423.8949.23.camel@pegasus","threadId":"535","inReplyTo":"20050508191831.GD9495@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-08T19:27:03Z","receivedAt":"2005-05-08T19:27:03Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Petr,\n\n> > However there is another thing that I am missing. With Bitkeeper I was\n> > able to do something like \"bk changes -umarcel\" to list all changes done\n> > by the user \"marcel\". I like to have something similar with cg-log. Any\n> > ideas on how to do that?\n> \n> What should it take in regard? Username portion of the email address?\n> The email address itself? The realname?\n\ngood question. Bitkeeper was only able to handle the user part of the\naddress. Maybe we can make cg-log a little bit more intelligent. We also\nhave the author and the committer. My idea would be to use -A for the\nauthor and -C for the committer and maybe -U to search in both. If the\nvalue contains and \"@\" it should search in the email address part and\notherwise in the username portion. Some regular expression stuff like\n\"^marcel\" (case insensitive) would also be great.\n\nI have no idea how to realize it, but would be thankful for such an\noption. It is one of the last pieces that I miss.\n\nRegards\n\nMarcel\n\n\n"},{"id":"2810","messageId":"2088.10.10.10.24.1115581938.squirrel@linux1","threadId":"535","inReplyTo":"20050508192536.GE9495@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-08T19:52:18Z","receivedAt":"2005-05-08T19:52:18Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Sun, May 8, 2005 3:25 pm, Petr Baudis said:\n\n>>\n>> cg-log -c -f -u petr\n>>\n>> or\n>>\n>> cg-log -uxpasky\n>>\n>> Sean\n>\n> That sounds great. Could you please post a patch against the current\n> Cogito's cg-log?\n>\n\nHey Petr,\n\nSorry it relies on other patches in a series. If you're interested in\nthem they're available from:\n\nhttp://git.homelinux.com/cogito\n\nActually, if you look you'll see I renamed the option -a and added help so\nthat it shows up on -h or --help.\n\nCheers,\nSean\n\n\n"},{"id":"2843","messageId":"20050508234936.GA26624@diku.dk","threadId":"535","inReplyTo":"1742.10.10.10.24.1115573750.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-08T23:49:36Z","receivedAt":"2005-05-08T23:49:36Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Sean wrote Sun, May 08, 2005:\n> commit 33762f33ee87377c0cfcea51382bad04d7c9ba8d\n> \n> Fix cg-log -f option so that a complete list of files is\n> displayed when a commit has more than one parent.\n\nThis sounds great.\n\n> Move the list of files so they're displayed after the\n> commit message\n\nThe reason I put it at the top was to make it more similar to GNU-style\nchangelogs (if there is such a style).\n\n> List the files in columns, instead of one big line of comma-\n> separated files.\n\nI think that will make `-f' less usable because of the extra scrolling.\n\nAssuming use of wc will not create more dependency nightmares and the\nextra overhead is acceptable here is a patch that will wrap file listing\nlines near the 80th column.\n\nSigned-off-by: Jonas Fonseca \n\n--- d4119364a7fbf5a4b8f00f061e4f5d58fa4abd0e/cg-log (mode:100755)\n+++ uncommitted/cg-log (mode:100755)\n@@ -64,8 +64,16 @@\n \tfi\n \techo\n \t$list_cmd | while read modes type sha1s file; do\n-\t\techo -n \"$sep$file\"\n+\t\techo -n \"$sep\"\n \t\tsep=\", \"\n+\t\tif [ $(echo \"$line$sep$file\" | wc -c) -lt 75 ]; then\n+\t\t\tline=\"$line$sep$file\"\n+\t\t\techo -n \"$file\"\n+\t\telse\n+\t\t\tline=\"$file\"\n+\t\t\techo \"$coldefault\"\n+\t\t\techo -n \" $colfiles$file\"\n+\t\tfi\n \tdone\n \techo \"$coldefault:\"\n }\n\n-- \nJonas Fonseca\n"},{"id":"2856","messageId":"4302.10.10.10.24.1115610350.squirrel@linux1","threadId":"535","inReplyTo":"20050508234936.GA26624@diku.dk","subject":"Re: cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-09T03:45:50Z","receivedAt":"2005-05-09T03:45:50Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Sun, May 8, 2005 7:49 pm, Jonas Fonseca said:\n\n\nHey Jonas,\n\n>> Fix cg-log -f option so that a complete list of files is\n>> displayed when a commit has more than one parent.\n>\n> This sounds great.\n\nYou might want to rip it out and submit it, because it's not likely to see\nthe light of day otherwise.\n\n> The reason I put it at the top was to make it more similar to GNU-style\n> changelogs (if there is such a style).\n\nYeah, I felt a bit guilty sliding that shift in, really I had no rationale\nother than it looked better _to me_.\n\n> I think that will make `-f' less usable because of the extra scrolling.\n>\n> Assuming use of wc will not create more dependency nightmares and the\n> extra overhead is acceptable here is a patch that will wrap file listing\n> lines near the 80th column.\n\nYour patch will work fine but I did test my version out against the kernel\nrepo and it didn't seem to be a problem.\n\nCheers,\nSean\n\n\n"},{"id":"2871","messageId":"20050509113907.GA22830@diku.dk","threadId":"535","inReplyTo":"4302.10.10.10.24.1115610350.squirrel@linux1","subject":"Re: cg-log patches","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-09T11:39:07Z","receivedAt":"2005-05-09T11:39:07Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Sean wrote Sun, May 08, 2005:\n> On Sun, May 8, 2005 7:49 pm, Jonas Fonseca said:\n> Hey Jonas,\n\nHi Sean,\n\n> >> Fix cg-log -f option so that a complete list of files is\n> >> displayed when a commit has more than one parent.\n> >\n> > This sounds great.\n> \n> You might want to rip it out and submit it, because it's not likely to see\n> the light of day otherwise.\n\nI ripped it out and made a patch only with the fix.\n\nPasky, I also updated the line-wrapping patch if you want it.\n\n> > The reason I put it at the top was to make it more similar to GNU-style\n> > changelogs (if there is such a style).\n> \n> Yeah, I felt a bit guilty sliding that shift in, really I had no rationale\n> other than it looked better _to me_.\n\nI don't feel strong about it. I guess I have just gotten used to it that\nway.\n\n-- \nJonas Fonseca\n\n\nFix cg-log -f option so that a complete list of files is\ndisplayed when a commit has more than one parent.\n\nSigned-off-by: Sean Estabrooks \nSigned-off-by: Jonas Fonseca \n\n---\ncommit 06a6b40f8e52eff0e34706c7024b54df50abb6b9\ntree 95bc73fd188347aa294991d1c5c7cffd60422098\nparent 4ed293bc0a5ffca9683e139cad499b69a4c4d569\nauthor jonas Mon, 09 May 2005 13:23:20 +0200\ncommitter jonas Mon, 09 May 2005 13:23:20 +0200\n\n cg-log | 34 +++++++++++++++-------------------\n 1 files changed, 15 insertions(+), 19 deletions(-)\n\nIndex: cg-log\n===================================================================\n--- 00b94eea5b99d5dd1d1bbe9c9ca3502d11aec581/cg-log (mode:100755)\n+++ 95bc73fd188347aa294991d1c5c7cffd60422098/cg-log (mode:100755)\n@@ -53,17 +53,20 @@\n \n list_commit_files()\n {\n-\ttree1=\"$1\"\n-\ttree2=\"$2\"\n+\ttree=\"$1\"\n \tsep=\" * $colfiles\"\n-\t# List all files for for the initial commit\n-\tif [ -z $tree2 ]; then\n-\t\tlist_cmd=\"git-ls-tree $tree1\"\n-\telse\n-\t\tlist_cmd=\"git-diff-tree -r $tree1 $tree2\"\n-\tfi\n \techo\n-\t$list_cmd | while read modes type sha1s file; do\n+\tif [ -z $2 ]; then\n+\t\t# List all files for the initial commit\n+\t\tgit-ls-tree $tree\n+\telse\n+\t\tshift\n+\t\t# List changes from each parent\n+\t\tfor parent; do\n+\t\t\tgit-diff-tree -r $tree $parent\n+\t\tdone\n+\tfi | sort -u | \\\n+\twhile read modes type sha1s file; do\n \t\techo -n \"$sep$file\"\n \t\tsep=\", \"\n \tdone\n@@ -102,8 +105,7 @@\n \n $revls | $revsort | while read time commit parents; do\n \ttrap exit SIGPIPE\n-\ttree1=\n-\ttree2=\n+\ttrees=\n \t[ \"$revfmt\" = \"git-rev-list\" ] && commit=\"$time\"\n \tif [ $# -ne 0 ]; then\n \t\tparent=$(git-cat-file commit $commit | sed -n '2s/parent //p;2Q')\n@@ -131,17 +133,11 @@\n \t\t\t\tfi\n \t\t\t\t;;\n \t\t\t\"tree\"|\"parent\")\n-\t\t\t\tif [ -z $tree1 ]; then\n-\t\t\t\t\ttree1=$rest\n-\t\t\t\telif [ -z $tree2 ]; then\n-\t\t\t\t\ttree2=$rest\n-\t\t\t\tfi\n+\t\t\t\ttrees=\"$trees $rest\"\n \t\t\t\techo $colheader$key $rest $coldefault\n \t\t\t\t;;\n \t\t\t\"\")\n-\t\t\t\tif [ -n \"$list_files\" ]; then\n-\t\t\t\t\tlist_commit_files \"$tree1\" \"$tree2\"\n-\t\t\t\tfi\n+\t\t\t\t[ -n \"$list_files\" ] && list_commit_files $trees\n \t\t\t\techo; sed -re '\n \t\t\t\t\t/ *Signed-off-by:.*/Is//'$colsignoff'&'$coldefault'/\n \t\t\t\t\t/ *Acked-by:.*/Is//'$colsignoff'&'$coldefault'/\n\n\nWrap file listing lines near the 80th column.\n\nSigned-off-by: Jonas Fonseca \n\n---\ncommit 9d86f44f7d1eee525ed4c45731ad07b95f62dbb6\ntree ddf82a0140bdc1440eb93bcbe01e14e90e44a3e8\nparent 06a6b40f8e52eff0e34706c7024b54df50abb6b9\nauthor jonas Mon, 09 May 2005 13:27:20 +0200\ncommitter jonas Mon, 09 May 2005 13:27:20 +0200\n\n cg-log | 10 +++++++++-\n 1 files changed, 9 insertions(+), 1 deletion(-)\n\nIndex: cg-log\n===================================================================\n--- 95bc73fd188347aa294991d1c5c7cffd60422098/cg-log (mode:100755)\n+++ ddf82a0140bdc1440eb93bcbe01e14e90e44a3e8/cg-log (mode:100755)\n@@ -67,8 +67,16 @@\n \t\tdone\n \tfi | sort -u | \\\n \twhile read modes type sha1s file; do\n-\t\techo -n \"$sep$file\"\n+\t\techo -n \"$sep\"\n \t\tsep=\", \"\n+ \t\tif [ $(echo \"$line$sep$file\" | wc -c) -lt 75 ]; then\n+ \t\t\tline=\"$line$sep$file\"\n+ \t\t\techo -n \"$file\"\n+ \t\telse\n+ \t\t\tline=\"$file\"\n+ \t\t\techo \"$coldefault\"\n+ \t\t\techo -n \" $colfiles$file\"\n+ \t\tfi\n \tdone\n \techo \"$coldefault:\"\n }\n"},{"id":"2872","messageId":"20050509121435.GB18382@pasky.ji.cz","threadId":"535","inReplyTo":"20050509113907.GA22830@diku.dk","subject":"Re: cg-log patches","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-09T12:14:35Z","receivedAt":"2005-05-09T12:14:35Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Mon, May 09, 2005 at 01:39:07PM CEST, I got a letter\nwhere Jonas Fonseca told me that...\n> Fix cg-log -f option so that a complete list of files is\n> displayed when a commit has more than one parent.\n> \n> Signed-off-by: Sean Estabrooks \n> Signed-off-by: Jonas Fonseca \n\nBut that makes no sense, since each merge will have enormous amount of\nfiles listed, making no sense. E.g. each merge of Cogito with Linus will\nhave all the Cogito files listed, since they aren't in the Linus branch\n- but that's wrong, since the merge _to_ the Cogito branch concerns no\nCogito files.\n\nIn git, the parents list is unordered. But this is different in Cogito,\nwhere the first parent _is_ special. If you are merging _from_ branch B\n_to_ branch A, the order of parents will be always\n\nparent A\nparent B\n\nIn practice, it does not make too much difference, but this is one of\nthe cases where it makes difference. So I think the current behaviour is\nright.\n\nBTW, this also implies that merges\n\n A --\n \\\n B ---+--\n\nand\n\n A ---+--\n /\n B --\n\nare considered as different ones by Cogito; in git itself, you might\nmodel that as\n\n A --.\n >---\n B --'\n\nwhich is not possible in Cogito. I could imagine doing it by e.g.\npassing cg-clone multiple arguments, but I'd have to first see a\ncompelling real-world usage for this first.\n\n> Index: cg-log\n> ===================================================================\n> --- 95bc73fd188347aa294991d1c5c7cffd60422098/cg-log (mode:100755)\n> +++ ddf82a0140bdc1440eb93bcbe01e14e90e44a3e8/cg-log (mode:100755)\n> @@ -67,8 +67,16 @@\n> \t\tdone\n> \tfi | sort -u | \\\n> \twhile read modes type sha1s file; do\n> -\t\techo -n \"$sep$file\"\n> +\t\techo -n \"$sep\"\n> \t\tsep=\", \"\n> + \t\tif [ $(echo \"$line$sep$file\" | wc -c) -lt 75 ]; then\n> + \t\t\tline=\"$line$sep$file\"\n> + \t\t\techo -n \"$file\"\n> + \t\telse\n> + \t\t\tline=\"$file\"\n> + \t\t\techo \"$coldefault\"\n> + \t\t\techo -n \" $colfiles$file\"\n> + \t\tfi\n> \tdone\n> \techo \"$coldefault:\"\n> }\n\nCould we have a trailing comma at the previous line?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"2873","messageId":"20050509124100.GB22830@diku.dk","threadId":"535","inReplyTo":"20050509121435.GB18382@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-09T12:41:00Z","receivedAt":"2005-05-09T12:41:00Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Petr Baudis wrote Mon, May 09, 2005:\n> Dear diary, on Mon, May 09, 2005 at 01:39:07PM CEST, I got a letter\n> where Jonas Fonseca told me that...\n> > Fix cg-log -f option so that a complete list of files is\n> > displayed when a commit has more than one parent.\n> > \n> > Signed-off-by: Sean Estabrooks \n> > Signed-off-by: Jonas Fonseca \n> \n> But that makes no sense, since each merge will have enormous amount of\n> files listed, making no sense. E.g. each merge of Cogito with Linus will\n> have all the Cogito files listed, since they aren't in the Linus branch\n> - but that's wrong, since the merge _to_ the Cogito branch concerns no\n> Cogito files.\n>\n> In git, the parents list is unordered. But this is different in Cogito,\n> where the first parent _is_ special. If you are merging _from_ branch B\n> _to_ branch A, the order of parents will be always\n> \n> parent A\n> parent B\n\nOk, forget the patch then. I was not sure how to handle the multiple parents.\n\n> > Index: cg-log\n> > ===================================================================\n> > --- 95bc73fd188347aa294991d1c5c7cffd60422098/cg-log (mode:100755)\n> > +++ ddf82a0140bdc1440eb93bcbe01e14e90e44a3e8/cg-log (mode:100755)\n> > @@ -67,8 +67,16 @@\n> > \t\tdone\n> > \tfi | sort -u | \\\n> > \twhile read modes type sha1s file; do\n> > -\t\techo -n \"$sep$file\"\n\t\t# Always put a trailing comma\n> > +\t\techo -n \"$sep\"\n> > \t\tsep=\", \"\n> > + \t\tif [ $(echo \"$line$sep$file\" | wc -c) -lt 75 ]; then\n> > + \t\t\tline=\"$line$sep$file\"\n> > + \t\t\techo -n \"$file\"\n> > + \t\telse\n> > + \t\t\tline=\"$file\"\n> > + \t\t\techo \"$coldefault\"\n> > + \t\t\techo -n \" $colfiles$file\"\n> > + \t\tfi\n> > \tdone\n> > \techo \"$coldefault:\"\n> > }\n> \n> Could we have a trailing comma at the previous line?\n\nIt should already do that ..\n\ncommitter Petr Baudis Sun, 08 May 2005 23:54:08 +0200\n\n * cg-Xlib, cg-update, cg-seek, cg-pull, cg-tag-ls, cg-branch-ls, cg-merge,\n cg-commit, cg-tag, cg-init, cg-branch-add, cg-admin-lsobj, cg-status,\n cg-cancel, cg-admin-uncommit:\n\n-- \nJonas Fonseca\n"},{"id":"2874","messageId":"4712.10.10.10.24.1115644427.squirrel@linux1","threadId":"535","inReplyTo":"20050509121435.GB18382@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-09T13:13:47Z","receivedAt":"2005-05-09T13:13:47Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Mon, May 9, 2005 8:14 am, Petr Baudis said:\n\n> But that makes no sense, since each merge will have enormous amount of\n> files listed, making no sense. E.g. each merge of Cogito with Linus will\n> have all the Cogito files listed, since they aren't in the Linus branch\n> - but that's wrong, since the merge _to_ the Cogito branch concerns no\n> Cogito files.\n>\n> In git, the parents list is unordered. But this is different in Cogito,\n> where the first parent _is_ special. If you are merging _from_ branch B\n> _to_ branch A, the order of parents will be always\n\nBut, there are commits (even in your tree) that aren't produced by Cogito.\n And the current logic gets them wrong.\n\nLook at commit: 211232bae64bcc60bbf5d1b5e5b2344c22ed767e in your tree.\n\nThe current logic will miss the fact that one of the other parents\naltered, git-apply-patch-script. Seems better to over report, than under\nreport changes, although I agree that some way must be found to handle the\nmerge case.\n\nSean\n\n\n"},{"id":"2935","messageId":"20050510003713.GL15712@pasky.ji.cz","threadId":"535","inReplyTo":"20050509121435.GB18382@pasky.ji.cz","subject":"Re: cg-log patches","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-10T00:37:13Z","receivedAt":"2005-05-10T00:37:13Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Mon, May 09, 2005 at 02:14:35PM CEST, I got a letter\nwhere Petr Baudis told me that...\n> In git, the parents list is unordered. But this is different in Cogito,\n> where the first parent _is_ special. If you are merging _from_ branch B\n> _to_ branch A, the order of parents will be always\n> \n> parent A\n> parent B\n> \n> In practice, it does not make too much difference, but this is one of\n> the cases where it makes difference. So I think the current behaviour is\n> right.\n> \n> BTW, this also implies that merges\n> \n> A --\n> \\\n> B ---+--\n> \n> and\n> \n> A ---+--\n> /\n> B --\n> \n> are considered as different ones by Cogito\n\nOk. So you do\n\nA ---+--\n /\nB --\n\nand now merge A to B, which results in fast-forward and\n\nA ---+----\n / \\\nB -- --\n\nbut when doing cg-log in B, the merge is the wrong way around now.\n\nSean counterexample works too, it's a good thing to maintain\ncompatibility with git at this one too.\n\nStill, I would like to have the files list separated. What about one\nbullet per parent? Like\n\n * asdf, hjkl, xyzzy\n * hjkl, quux\n\nfor a regular two-parents merge.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"}]}