27754 2009-07-27 20:43:48 -0700 commit-log-editor does not produce a git commit log that is git friendly. 2009-08-07 11:14:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pdherbemont webkit-unassigned abarth ddkilzer efidler eric manyoso mjs oldest_to_newest 135114 0 pdherbemont 2009-07-27 20:43:48 -0700 commit-log-editor does not produce a git commit that is git friendly. git will always use the first line of the commit as a convenient short log. Having the date and the committer at this place is not convenient. Moreover we don't need the ident. A more suitable format would be: " <short bug description> <bug link> <reviewed by > <More description> <Function description> " 135115 1 33598 pdherbemont 2009-07-27 20:49:25 -0700 Created attachment 33598 commit-log-editor does not produce a git commit log that is git friendly. https://bugs.webkit.org/show_bug.cgi?id=27754 Reviewed by NOBODY (OOPS!). We make sure we end up with: - A first paragraph describing the bug. - The Reviewed By line - The rest of the commit We get rid of the date given that this is part of the commit info in a more precise maneer, and also the author of the patch, as this is also part of the commit information. Given that subversion doesn't support different committer and author info, the line would have to be added manually. * Scripts/commit-log-editor: --- 2 files changed, 51 insertions(+), 1 deletions(-) 135120 2 33601 pdherbemont 2009-07-27 21:25:19 -0700 Created attachment 33601 commit-log-editor does not produce a git commit log that is git friendly. https://bugs.webkit.org/show_bug.cgi?id=27754 Reviewed by NOBODY (OOPS!). We make sure we end up with: - A first paragraph describing the bug. - The Reviewed By line. - An eventual Patch By line if author and committer doesn't match. - The rest of the commit. * Scripts/commit-log-editor: --- 2 files changed, 66 insertions(+), 2 deletions(-) 135124 3 33602 pdherbemont 2009-07-27 21:35:58 -0700 Created attachment 33602 commit-log-editor does not produce a git commit log that is git friendly. https://bugs.webkit.org/show_bug.cgi?id=27754 Reviewed by NOBODY (OOPS!). We make sure we end up with: - A first paragraph describing the bug. It is eventually prefixed by "WebKit: <line>" or "WebCore: <line>". This used to be "WebCore:\n\n<line>". - The Reviewed By line. - An eventual Patch By line if author and committer doesn't match. - The rest of the commit. * Scripts/commit-log-editor: --- 2 files changed, 69 insertions(+), 3 deletions(-) 135266 4 eric 2009-07-28 10:47:50 -0700 I'm confused. Don't we need "svn friendly" commit logs anyway? The git commit log is turned into the svn commit log during git svn dcommit... 135276 5 pdherbemont 2009-07-28 10:59:51 -0700 (In reply to comment #4) > I'm confused. Don't we need "svn friendly" commit logs anyway? The git commit > log is turned into the svn commit log during git svn dcommit... Right. This will alter the way commit log are in svn commit log message as well. I have seen some commit log formatted that way [1], and I liked it. I think it's "svn friendly" as well. We could probably change the name of the bug to reflect that. [1] http://trac.webkit.org/changeset/46449 135572 6 manyoso 2009-07-29 06:27:49 -0700 I'm only Ok with this if it is the same for svn. If we're going to change the commit log messages then we should do the same for whatever scm we're using. That said, even were we to do this for svn too, I'm not sure I like it as the whole idea is for the commit messages to exactly reflect the ChangeLog format. Rather, I'd like to revisit this after Maciej's patch process plan is completed and we can look into changing to another scm from svn (aka Git) I think this discussion would be moot given such an eventuality as git would allow us to get rid of ChangeLog's altogether. We could then revisit the format... 135628 7 pdherbemont 2009-07-29 10:43:20 -0700 (In reply to comment #6) > I'm only Ok with this if it is the same for svn. If we're going to change the > commit log messages then we should do the same for whatever scm we're using. It's actually independent from the SCM. > That said, even were we to do this for svn too, I'm not sure I like it as the > whole idea is for the commit messages to exactly reflect the ChangeLog format. The problem with ChangeLog format is indentation and the first line, which is a duplication of what is already in the commit meta data. Where it has to retain the same info, its presentation has to be different. How ChangeLog are currently formatted is not well suited for commit log. I believe this is because the first approximation it to simply copy the ChangeLog content. I don't think this approximation is enough. > Rather, I'd like to revisit this after Maciej's patch process plan is completed > and we can look into changing to another scm from svn (aka Git) I think this > discussion would be moot given such an eventuality as git would allow us to get > rid of ChangeLog's altogether. We could then revisit the format... I am afraid that such a plan is bound to take much more time than what is expected :) But that decision seems to be wise though. Pierre. 136098 8 ddkilzer 2009-07-30 21:55:35 -0700 I do something similar now by hand where I extract common lines from the top of each ChangeLog and put them above each subsection: <http://trac.webkit.org/changeset/45750> I think we should change prepare-ChangeLog to add a line like this before the "Reviewed by" line: <http://webkit.org/b/00000> Enter one-line bug description here Reviewed by NOBODY(OOPS!). Then these two common lines could be extracted from each ChangeLog entry when the commit message is generated. (I was also thinking that the "00000" could be a place-holder that bugzilla-tool replaces when it lands bugs like it does for the reviewer.) 137749 9 33602 eric 2009-08-06 19:40:54 -0700 Comment on attachment 33602 commit-log-editor does not produce a git commit log that is git friendly. So sad! We have some parsing code like this in our python modules... Seems we really should just re-write commit-log-editor in python (at least then we could unit test it!) Seems fine to me. :) You might want to post to webkit-dev too so you can enjoy some quality bike-shedding... Glad to see more folks working on our tools. I would strongly encourage you to think about moving more of this code over to python in the future as our scripts seem to be moving that way. :) 137821 10 abarth 2009-08-07 01:09:11 -0700 Pierre, are you a committer? I don't see you listed at <https://trac.webkit.org/wiki/WebKit%20Team>. In it's current state, no one will land this patch for you because it's assigned to you. If you'd like it landed, you can set the commit-queue flag to ? and/or reset the assignee to the default using the "Assigned To" field. 137825 11 pdherbemont 2009-08-07 01:14:30 -0700 (In reply to comment #10) > Pierre, are you a committer? I don't see you listed at > <https://trac.webkit.org/wiki/WebKit%20Team>. In it's current state, no one > will land this patch for you because it's assigned to you. If you'd like it > landed, you can set the commit-queue flag to ? and/or reset the assignee to the > default using the "Assigned To" field. I should be able to commit. I'll add myself to that page, thanks Adam! 137890 12 eric 2009-08-07 08:20:46 -0700 You'll also want to add yourself to WebKitTools/Scripts/modules/committers.py I'll ask Adele about updating the committer invite letter. Or maybe I'll just add a wiki page about being a new committer. 137943 13 pdherbemont 2009-08-07 10:06:45 -0700 (In reply to comment #12) > You'll also want to add yourself to WebKitTools/Scripts/modules/committers.py For some reasons I can't commit anymore from here. While this is sorted out I'll let someone apply the patch. Pierre. 137952 14 33602 eric 2009-08-07 10:21:58 -0700 Comment on attachment 33602 commit-log-editor does not produce a git commit log that is git friendly. If you're not in committers.py, your setting commit-queue will fail. :) 137957 15 abarth 2009-08-07 10:25:48 -0700 (In reply to comment #14) > (From update of attachment 33602 [details]) > If you're not in committers.py, your setting commit-queue will fail. :) I just added him. :) 137988 16 33602 abarth 2009-08-07 11:14:44 -0700 Comment on attachment 33602 commit-log-editor does not produce a git commit log that is git friendly. Clearing review flag on attachment: 33602 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/commit-log-editor Committed r46899 M WebKitTools/ChangeLog M WebKitTools/Scripts/commit-log-editor r46899 = 29faa92e5a1dd16dabeb13fb4acf53a3b1b8b2c0 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46899 137989 17 abarth 2009-08-07 11:14:49 -0700 All reviewed patches have been landed. Closing bug. 33598 2009-07-27 20:49:25 -0700 2009-07-27 21:25:17 -0700 commit-log-editor does not produce a git commit log that is git friendly. bug-27754-20090727204924.patch text/plain 2884 pdherbemont ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4OWIzYjQ2Li4zMDY5MTQ2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMDktMDct MjcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRv ciBkb2VzIG5vdCBwcm9kdWNlIGEgZ2l0IGNvbW1pdCBsb2cgdGhhdCBpcyBnaXQgZnJpZW5kbHku CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc1NAor CisgICAgICAgIFdlIG1ha2Ugc3VyZSB3ZSBlbmQgdXAgd2l0aDoKKyAgICAgICAgLSBBIGZpcnN0 IHBhcmFncmFwaCBkZXNjcmliaW5nIHRoZSBidWcuCisgICAgICAgIC0gVGhlIFJldmlld2VkIEJ5 IGxpbmUKKyAgICAgICAgLSBUaGUgcmVzdCBvZiB0aGUgY29tbWl0CisKKyAgICAgICAgV2UgZ2V0 IHJpZCBvZiB0aGUgZGF0ZSBnaXZlbiB0aGF0IHRoaXMgaXMgcGFydCBvZiB0aGUgY29tbWl0IGlu Zm8KKyAgICAgICAgaW4gYSBtb3JlIHByZWNpc2UgbWFuZWVyLCBhbmQgYWxzbyB0aGUgYXV0aG9y IG9mIHRoZSBwYXRjaCwKKyAgICAgICAgYXMgdGhpcyBpcyBhbHNvIHBhcnQgb2YgdGhlIGNvbW1p dCBpbmZvcm1hdGlvbi4gR2l2ZW4gdGhhdCBzdWJ2ZXJzaW9uCisgICAgICAgIGRvZXNuJ3Qgc3Vw cG9ydCBkaWZmZXJlbnQgY29tbWl0dGVyIGFuZCBhdXRob3IgaW5mbywgdGhlIGxpbmUKKyAgICAg ICAgd291bGQgaGF2ZSB0byBiZSBhZGRlZCBtYW51YWxseS4KKworICAgICAgICAqIFNjcmlwdHMv Y29tbWl0LWxvZy1lZGl0b3I6CisKKzIwMDktMDctMjcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBk aGVyYmVtb250QGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4K IAogICAgICAgICAiYnVnemlsbGEtdG9vbCBwb3N0LWNvbW1pdCBoZWFkIiBkb2Vzbid0IHdvcmsg YmVjYXVzZSBpdCBjYW4ndCBmaW5kIHRoZSBidWcgaWQgZnJvbSB0aGUgY29tbWl0IGxvYWQuCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgppbmRleCBmZjFlODQ3Li4xNjk4YzQ0IDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKQEAgLTEzMywxOCArMTMzLDQ4IEBA IGZvciBteSAkY2hhbmdlTG9nIChAY2hhbmdlTG9ncykgewogICAgIG9wZW4gQ0hBTkdFTE9HLCAk Y2hhbmdlTG9nIG9yIGRpZSAiQ2FuJ3Qgb3BlbiAkY2hhbmdlTG9nIjsKICAgICBteSAkY29udGVu dHMgPSAiIjsKICAgICBteSAkYmxhbmtMaW5lcyA9ICIiOworICAgIG15ICRyZXZpZXdlZEJ5TGlu ZSA9ICIiOworICAgIG15ICRsaW5lQ291bnQgPSAwOwogICAgIHdoaWxlICg8Q0hBTkdFTE9HPikg ewogICAgICAgICBpZiAoL15cUy8pIHsKICAgICAgICAgICAgIGxhc3QgaWYgJGNvbnRlbnRzOwog ICAgICAgICB9CiAgICAgICAgIGlmICgvXFMvKSB7CisgICAgICAgICAgICBteSAkcHJldmlvdXNM aW5lV2FzQmxhbmsgPSAxIGlmICRibGFua0xpbmVzIGVxICJcbiI7CiAgICAgICAgICAgICAkY29u dGVudHMgLj0gJGJsYW5rTGluZXMgaWYgJGNvbnRlbnRzOwogICAgICAgICAgICAgJGJsYW5rTGlu ZXMgPSAiIjsKLSAgICAgICAgICAgICRjb250ZW50cyAuPSAkXzsKKworICAgICAgICAgICAgbXkg JGxpbmUgPSAkXzsKKworICAgICAgICAgICAgIyBSZW1vdmUgaWRlbnRhdGlvbiBzcGFjZXMKKyAg ICAgICAgICAgICRsaW5lID1+IHMvXlxzezh9Ly87CisKKyAgICAgICAgICAgICMgU2F2ZSB0aGUg cmV2aWV3ZWQgYnkgbGluZQorICAgICAgICAgICAgaWYgKCRsaW5lID1+IG0vXlJldmlld2VkIGJ5 IC4qLykgeworICAgICAgICAgICAgICAgICRyZXZpZXdlZEJ5TGluZSA9ICRsaW5lOworICAgICAg ICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICMgUmVtb3ZlIHRo ZSBkYXRlIGxpbmUKKyAgICAgICAgICAgIGlmICgkbGluZSA9fiBtL15bMC05XXs0fS1bMC05XXsy fS1bMC05XXsyfS8gJiYgJGxpbmVDb3VudCA9PSAwKSB7CisgICAgICAgICAgICAgICAgbmV4dDsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgIyBBdHRlbXB0IHRvIGluc2VydCB0aGUgInJl dmlld2VkIGJ5IiBsaW5lLCBhZnRlciB0aGUgZmlyc3QgYmxhbmsgbGluZS4KKyAgICAgICAgICAg IGlmICgkcHJldmlvdXNMaW5lV2FzQmxhbmsgJiYgJHJldmlld2VkQnlMaW5lICYmICRsaW5lQ291 bnQgPiAwKSB7CisgICAgICAgICAgICAgICAgJGNvbnRlbnRzIC49ICRyZXZpZXdlZEJ5TGluZSAu ICJcbiI7CisgICAgICAgICAgICAgICAgJHJldmlld2VkQnlMaW5lID0gIiI7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgICRsaW5lQ291bnQrKzsKKyAgICAgICAgICAgICRjb250ZW50cyAu PSAkbGluZTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICRibGFua0xpbmVzIC49ICRf OwogICAgICAgICB9CiAgICAgfQorICAgIGlmICgkcmV2aWV3ZWRCeUxpbmUpIHsKKyAgICAgICAg JGNvbnRlbnRzIC49ICJcbiIuJHJldmlld2VkQnlMaW5lOworICAgIH0KICAgICBjbG9zZSBDSEFO R0VMT0c7CiAKICAgICAkY2hhbmdlTG9nID0gRmlsZTo6U3BlYy0+YWJzMnJlbChGaWxlOjpTcGVj LT5yZWwyYWJzKCRjaGFuZ2VMb2cpLCAkdG9wTGV2ZWwpOw== 33601 2009-07-27 21:25:19 -0700 2009-07-27 21:35:56 -0700 commit-log-editor does not produce a git commit log that is git friendly. bug-27754-20090727212519.patch text/plain 3484 pdherbemont ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4OWIzYjQ2Li5mNDI5ZGIxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMDktMDct MjcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRv ciBkb2VzIG5vdCBwcm9kdWNlIGEgZ2l0IGNvbW1pdCBsb2cgdGhhdCBpcyBnaXQgZnJpZW5kbHku CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc1NAor CisgICAgICAgIFdlIG1ha2Ugc3VyZSB3ZSBlbmQgdXAgd2l0aDoKKyAgICAgICAgLSBBIGZpcnN0 IHBhcmFncmFwaCBkZXNjcmliaW5nIHRoZSBidWcuCisgICAgICAgIC0gVGhlIFJldmlld2VkIEJ5 IGxpbmUuCisgICAgICAgIC0gQW4gZXZlbnR1YWwgUGF0Y2ggQnkgbGluZSBpZiBhdXRob3IgYW5k IGNvbW1pdHRlciBkb2Vzbid0IG1hdGNoLgorICAgICAgICAtIFRoZSByZXN0IG9mIHRoZSBjb21t aXQuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yOgorCisyMDA5LTA3LTI3 ICBQaWVycmUgZCdIZXJiZW1vbnQgIDxwZGhlcmJlbW9udEBhcHBsZS5jb20+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCiAKICAgICAgICAgImJ1Z3ppbGxhLXRvb2wgcG9zdC1j b21taXQgaGVhZCIgZG9lc24ndCB3b3JrIGJlY2F1c2UgaXQgY2FuJ3QgZmluZCB0aGUgYnVnIGlk IGZyb20gdGhlIGNvbW1pdCBsb2FkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9j b21taXQtbG9nLWVkaXRvciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IK aW5kZXggZmYxZTg0Ny4uYjI2MzA3NyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9j b21taXQtbG9nLWVkaXRvcgorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRp dG9yCkBAIC0xMzMsMTggKzEzMyw2NyBAQCBmb3IgbXkgJGNoYW5nZUxvZyAoQGNoYW5nZUxvZ3Mp IHsKICAgICBvcGVuIENIQU5HRUxPRywgJGNoYW5nZUxvZyBvciBkaWUgIkNhbid0IG9wZW4gJGNo YW5nZUxvZyI7CiAgICAgbXkgJGNvbnRlbnRzID0gIiI7CiAgICAgbXkgJGJsYW5rTGluZXMgPSAi IjsKKyAgICBteSAkcmV2aWV3ZWRCeUxpbmUgPSAiIjsKKyAgICBteSAkbGluZUNvdW50ID0gMDsK KyAgICBteSAkZGF0ZSA9ICIiOworICAgIG15ICRhdXRob3IgPSAiIjsKKyAgICBteSAkZW1haWwg PSAiIjsKKyAgICBteSAkaGFzQXV0aG9ySW5mb1RvV3JpdGUgPSAwOwogICAgIHdoaWxlICg8Q0hB TkdFTE9HPikgewogICAgICAgICBpZiAoL15cUy8pIHsKICAgICAgICAgICAgIGxhc3QgaWYgJGNv bnRlbnRzOwogICAgICAgICB9CiAgICAgICAgIGlmICgvXFMvKSB7Ci0gICAgICAgICAgICAkY29u dGVudHMgLj0gJGJsYW5rTGluZXMgaWYgJGNvbnRlbnRzOworICAgICAgICAgICAgbXkgJHByZXZp b3VzTGluZVdhc0JsYW5rID0gMSB1bmxlc3MgJGJsYW5rTGluZXMgZXEgIiI7CisgICAgICAgICAg ICBteSAkbGluZSA9ICRfOworICAgICAgICAgICAgbXkgJGN1cnJlbnRMaW5lQmxhbmtMaW5lcyA9 ICRibGFua0xpbmVzOwogICAgICAgICAgICAgJGJsYW5rTGluZXMgPSAiIjsKLSAgICAgICAgICAg ICRjb250ZW50cyAuPSAkXzsKKworICAgICAgICAgICAgIyBSZW1vdmUgaWRlbnRhdGlvbiBzcGFj ZXMKKyAgICAgICAgICAgICRsaW5lID1+IHMvXlxzezh9Ly87CisKKyAgICAgICAgICAgICMgU2F2 ZSB0aGUgcmV2aWV3ZWQgYnkgbGluZQorICAgICAgICAgICAgaWYgKCRsaW5lID1+IG0vXlJldmll d2VkIGJ5IC4qLykgeworICAgICAgICAgICAgICAgICRyZXZpZXdlZEJ5TGluZSA9ICRsaW5lOwor ICAgICAgICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICMgR3Jh YiB0aGUgYXV0aG9yIGFuZCB0aGUgZGF0ZSBsaW5lCisgICAgICAgICAgICBpZiAoJGxpbmUgPX4g bS9eKFswLTldezR9LVswLTldezJ9LVswLTldezJ9KVxzKyguKlteXHNdKVxzKzwoLiopPi8gJiYg JGxpbmVDb3VudCA9PSAwKSB7CisgICAgICAgICAgICAgICAgJGRhdGUgPSAkMTsKKyAgICAgICAg ICAgICAgICAkYXV0aG9yID0gJDI7CisgICAgICAgICAgICAgICAgJGVtYWlsID0gJDM7CisgICAg ICAgICAgICAgICAgJGhhc0F1dGhvckluZm9Ub1dyaXRlID0gMTsKKyAgICAgICAgICAgICAgICBu ZXh0OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAkY29udGVudHMgLj0gJGN1cnJlbnRM aW5lQmxhbmtMaW5lcyBpZiAkY29udGVudHM7CisKKyAgICAgICAgICAgICMgQXR0ZW1wdCB0byBp bnNlcnQgdGhlICJwYXRjaCBieSIgbGluZSwgYWZ0ZXIgdGhlIGZpcnN0IGJsYW5rIGxpbmUuCisg ICAgICAgICAgICBpZiAoJHByZXZpb3VzTGluZVdhc0JsYW5rICYmICRoYXNBdXRob3JJbmZvVG9X cml0ZSAmJiAkbGluZUNvdW50ID4gMCkgeworICAgICAgICAgICAgICAgIG15ICRhdXRob3JBbmRD b21taXR0ZXJBcmVTYW1lUGVyc29uID0gJGVtYWlsIGVxICRFTlZ7J0VNQUlMX0FERFJFU1MnfTsK KyAgICAgICAgICAgICAgICBpZiAoISRhdXRob3JBbmRDb21taXR0ZXJBcmVTYW1lUGVyc29uKSB7 CisgICAgICAgICAgICAgICAgICAgICRjb250ZW50cyAuPSAiUGF0Y2ggYnkgJGF1dGhvciA8JGVt YWlsPiBvbiAkZGF0ZVxuIjsKKyAgICAgICAgICAgICAgICAgICAgJGhhc0F1dGhvckluZm9Ub1dy aXRlID0gMDsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg ICMgQXR0ZW1wdCB0byBpbnNlcnQgdGhlICJyZXZpZXdlZCBieSIgbGluZSwgYWZ0ZXIgdGhlIGZp cnN0IGJsYW5rIGxpbmUuCisgICAgICAgICAgICBpZiAoJHByZXZpb3VzTGluZVdhc0JsYW5rICYm ICRyZXZpZXdlZEJ5TGluZSAmJiAkbGluZUNvdW50ID4gMCkgeworICAgICAgICAgICAgICAgICRj b250ZW50cyAuPSAkcmV2aWV3ZWRCeUxpbmUgLiAiXG4iOworICAgICAgICAgICAgICAgICRyZXZp ZXdlZEJ5TGluZSA9ICIiOworICAgICAgICAgICAgfQorCisKKyAgICAgICAgICAgICRsaW5lQ291 bnQrKzsKKyAgICAgICAgICAgICRjb250ZW50cyAuPSAkbGluZTsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgICRibGFua0xpbmVzIC49ICRfOwogICAgICAgICB9CiAgICAgfQorICAgIGlm ICgkcmV2aWV3ZWRCeUxpbmUpIHsKKyAgICAgICAgJGNvbnRlbnRzIC49ICJcbiIuJHJldmlld2Vk QnlMaW5lOworICAgIH0KICAgICBjbG9zZSBDSEFOR0VMT0c7CiAKICAgICAkY2hhbmdlTG9nID0g RmlsZTo6U3BlYy0+YWJzMnJlbChGaWxlOjpTcGVjLT5yZWwyYWJzKCRjaGFuZ2VMb2cpLCAkdG9w TGV2ZWwpOw== 33602 2009-07-27 21:35:58 -0700 2009-08-07 11:14:44 -0700 commit-log-editor does not produce a git commit log that is git friendly. bug-27754-20090727213558.patch text/plain 4049 pdherbemont ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4OWIzYjQ2Li41YWMzNTVjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDktMDct MjcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRv ciBkb2VzIG5vdCBwcm9kdWNlIGEgZ2l0IGNvbW1pdCBsb2cgdGhhdCBpcyBnaXQgZnJpZW5kbHku CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc1NAor CisgICAgICAgIFdlIG1ha2Ugc3VyZSB3ZSBlbmQgdXAgd2l0aDoKKyAgICAgICAgLSBBIGZpcnN0 IHBhcmFncmFwaCBkZXNjcmliaW5nIHRoZSBidWcuIEl0IGlzIGV2ZW50dWFsbHkgcHJlZml4ZWQg YnkKKyAgICAgICAgIldlYktpdDogPGxpbmU+IiBvciAiV2ViQ29yZTogPGxpbmU+Ii4gVGhpcyB1 c2VkIHRvIGJlCisgICAgICAgICJXZWJDb3JlOlxuXG48bGluZT4iLgorICAgICAgICAtIFRoZSBS ZXZpZXdlZCBCeSBsaW5lLgorICAgICAgICAtIEFuIGV2ZW50dWFsIFBhdGNoIEJ5IGxpbmUgaWYg YXV0aG9yIGFuZCBjb21taXR0ZXIgZG9lc24ndCBtYXRjaC4KKyAgICAgICAgLSBUaGUgcmVzdCBv ZiB0aGUgY29tbWl0LgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcjoKKwor MjAwOS0wNy0yNyAgUGllcnJlIGQnSGVyYmVtb250ICA8cGRoZXJiZW1vbnRAYXBwbGUuY29tPgor CiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgogCiAgICAgICAgICJidWd6aWxsYS10 b29sIHBvc3QtY29tbWl0IGhlYWQiIGRvZXNuJ3Qgd29yayBiZWNhdXNlIGl0IGNhbid0IGZpbmQg dGhlIGJ1ZyBpZCBmcm9tIHRoZSBjb21taXQgbG9hZC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1s b2ctZWRpdG9yCmluZGV4IGZmMWU4NDcuLjM5MWY3MjcgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21t aXQtbG9nLWVkaXRvcgpAQCAtMTMzLDE4ICsxMzMsNjcgQEAgZm9yIG15ICRjaGFuZ2VMb2cgKEBj aGFuZ2VMb2dzKSB7CiAgICAgb3BlbiBDSEFOR0VMT0csICRjaGFuZ2VMb2cgb3IgZGllICJDYW4n dCBvcGVuICRjaGFuZ2VMb2ciOwogICAgIG15ICRjb250ZW50cyA9ICIiOwogICAgIG15ICRibGFu a0xpbmVzID0gIiI7CisgICAgbXkgJHJldmlld2VkQnlMaW5lID0gIiI7CisgICAgbXkgJGxpbmVD b3VudCA9IDA7CisgICAgbXkgJGRhdGUgPSAiIjsKKyAgICBteSAkYXV0aG9yID0gIiI7CisgICAg bXkgJGVtYWlsID0gIiI7CisgICAgbXkgJGhhc0F1dGhvckluZm9Ub1dyaXRlID0gMDsKICAgICB3 aGlsZSAoPENIQU5HRUxPRz4pIHsKICAgICAgICAgaWYgKC9eXFMvKSB7CiAgICAgICAgICAgICBs YXN0IGlmICRjb250ZW50czsKICAgICAgICAgfQogICAgICAgICBpZiAoL1xTLykgewotICAgICAg ICAgICAgJGNvbnRlbnRzIC49ICRibGFua0xpbmVzIGlmICRjb250ZW50czsKKyAgICAgICAgICAg IG15ICRwcmV2aW91c0xpbmVXYXNCbGFuayA9IDEgdW5sZXNzICRibGFua0xpbmVzIGVxICIiOwor ICAgICAgICAgICAgbXkgJGxpbmUgPSAkXzsKKyAgICAgICAgICAgIG15ICRjdXJyZW50TGluZUJs YW5rTGluZXMgPSAkYmxhbmtMaW5lczsKICAgICAgICAgICAgICRibGFua0xpbmVzID0gIiI7Ci0g ICAgICAgICAgICAkY29udGVudHMgLj0gJF87CisKKyAgICAgICAgICAgICMgUmVtb3ZlIGlkZW50 YXRpb24gc3BhY2VzCisgICAgICAgICAgICAkbGluZSA9fiBzL15cc3s4fS8vOworCisgICAgICAg ICAgICAjIFNhdmUgdGhlIHJldmlld2VkIGJ5IGxpbmUKKyAgICAgICAgICAgIGlmICgkbGluZSA9 fiBtL15SZXZpZXdlZCBieSAuKi8pIHsKKyAgICAgICAgICAgICAgICAkcmV2aWV3ZWRCeUxpbmUg PSAkbGluZTsKKyAgICAgICAgICAgICAgICBuZXh0OworICAgICAgICAgICAgfQorCisgICAgICAg ICAgICAjIEdyYWIgdGhlIGF1dGhvciBhbmQgdGhlIGRhdGUgbGluZQorICAgICAgICAgICAgaWYg KCRsaW5lID1+IG0vXihbMC05XXs0fS1bMC05XXsyfS1bMC05XXsyfSlccysoLipbXlxzXSlccys8 KC4qKT4vICYmICRsaW5lQ291bnQgPT0gMCkgeworICAgICAgICAgICAgICAgICRkYXRlID0gJDE7 CisgICAgICAgICAgICAgICAgJGF1dGhvciA9ICQyOworICAgICAgICAgICAgICAgICRlbWFpbCA9 ICQzOworICAgICAgICAgICAgICAgICRoYXNBdXRob3JJbmZvVG9Xcml0ZSA9IDE7CisgICAgICAg ICAgICAgICAgbmV4dDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgJGNvbnRlbnRzIC49 ICRjdXJyZW50TGluZUJsYW5rTGluZXMgaWYgJGNvbnRlbnRzOworCisgICAgICAgICAgICAjIEF0 dGVtcHQgdG8gaW5zZXJ0IHRoZSAicGF0Y2ggYnkiIGxpbmUsIGFmdGVyIHRoZSBmaXJzdCBibGFu ayBsaW5lLgorICAgICAgICAgICAgaWYgKCRwcmV2aW91c0xpbmVXYXNCbGFuayAmJiAkaGFzQXV0 aG9ySW5mb1RvV3JpdGUgJiYgJGxpbmVDb3VudCA+IDApIHsKKyAgICAgICAgICAgICAgICBteSAk YXV0aG9yQW5kQ29tbWl0dGVyQXJlU2FtZVBlcnNvbiA9ICRlbWFpbCBlcSAkRU5WeydFTUFJTF9B RERSRVNTJ307CisgICAgICAgICAgICAgICAgaWYgKCEkYXV0aG9yQW5kQ29tbWl0dGVyQXJlU2Ft ZVBlcnNvbikgeworICAgICAgICAgICAgICAgICAgICAkY29udGVudHMgLj0gIlBhdGNoIGJ5ICRh dXRob3IgPCRlbWFpbD4gb24gJGRhdGVcbiI7CisgICAgICAgICAgICAgICAgICAgICRoYXNBdXRo b3JJbmZvVG9Xcml0ZSA9IDA7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAjIEF0dGVtcHQgdG8gaW5zZXJ0IHRoZSAicmV2aWV3ZWQgYnkiIGxpbmUsIGFm dGVyIHRoZSBmaXJzdCBibGFuayBsaW5lLgorICAgICAgICAgICAgaWYgKCRwcmV2aW91c0xpbmVX YXNCbGFuayAmJiAkcmV2aWV3ZWRCeUxpbmUgJiYgJGxpbmVDb3VudCA+IDApIHsKKyAgICAgICAg ICAgICAgICAkY29udGVudHMgLj0gJHJldmlld2VkQnlMaW5lIC4gIlxuIjsKKyAgICAgICAgICAg ICAgICAkcmV2aWV3ZWRCeUxpbmUgPSAiIjsKKyAgICAgICAgICAgIH0KKworCisgICAgICAgICAg ICAkbGluZUNvdW50Kys7CisgICAgICAgICAgICAkY29udGVudHMgLj0gJGxpbmU7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAkYmxhbmtMaW5lcyAuPSAkXzsKICAgICAgICAgfQogICAg IH0KKyAgICBpZiAoJHJldmlld2VkQnlMaW5lKSB7CisgICAgICAgICRjb250ZW50cyAuPSAiXG4i LiRyZXZpZXdlZEJ5TGluZTsKKyAgICB9CiAgICAgY2xvc2UgQ0hBTkdFTE9HOwogCiAgICAgJGNo YW5nZUxvZyA9IEZpbGU6OlNwZWMtPmFiczJyZWwoRmlsZTo6U3BlYy0+cmVsMmFicygkY2hhbmdl TG9nKSwgJHRvcExldmVsKTsKQEAgLTE5MSw3ICsyNDAsNyBAQCBpZiAoaXNHaXQoKSAmJiBzY2Fs YXIga2V5cyAlY2hhbmdlTG9nU29ydCA9PSAwKSB7CiAgICAgICAgIGlmIChrZXlzICVjaGFuZ2VM b2dTb3J0ID4gMSkgewogICAgICAgICAgICAgcHJpbnQgTkVXTE9HIG5vcm1hbGl6ZUxpbmVFbmRp bmdzKCJcbiIsICRlbmRsKSBpZiAhJGZpcnN0OwogICAgICAgICAgICAgJGZpcnN0ID0gMDsKLSAg ICAgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiJGxhYmVsOlxuXG4i LCAkZW5kbCk7CisgICAgICAgICAgICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3Mo IiRsYWJlbDogIiwgJGVuZGwpOwogICAgICAgICB9CiAgICAgICAgIHByaW50IE5FV0xPRyBub3Jt YWxpemVMaW5lRW5kaW5ncygkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSwgJGVuZGwpOwogICAg IH0=