49471 2010-11-12 13:39:49 -0800 webkit-patch land-cowboy (and other commands) should display the committed SVN revision after landing a patch 2010-11-12 16:00:55 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip abarth commit-queue eric oldest_to_newest 308748 0 mihaip 2010-11-12 13:39:49 -0800 webkit-patch land-cowboy (and other commands) should display the committed SVN revision after landing a patch 308754 1 73771 mihaip 2010-11-12 13:44:47 -0800 Created attachment 73771 Patch 308795 2 73771 abarth 2010-11-12 15:01:16 -0800 Comment on attachment 73771 Patch Nice. I figured cowboys didn't care what rev they landed as. :) 308798 3 mihaip 2010-11-12 15:09:20 -0800 (In reply to comment #2) > (From update of attachment 73771 [details]) > Nice. I figured cowboys didn't care what rev they landed as. :) I've been keeping a log of all that I've had to do as WebKit gardener this week, having revision links is useful :) 308805 4 73771 commit-queue 2010-11-12 15:20:05 -0800 Comment on attachment 73771 Patch Rejecting patch 73771 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 73771]" exit_code: 1 Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=73771&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=49471&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Updating working directory Processing patch 73771 from bug 49471. ERROR: /Projects/CommitQueue/WebKitTools/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/5719027 308815 5 mihaip 2010-11-12 15:54:33 -0800 Committed r71954: <http://trac.webkit.org/changeset/71954> 308818 6 mihaip 2010-11-12 15:57:01 -0800 (In reply to comment #4) > Rejecting patch 73771 from commit-queue. I mistakenly took out the "Reviewed by NOBODY (OOPS!)." so the cq couldn't fix up the ChangeLog. I did it locally, and landed the patch. Though I now see that webkit-patch land outputs the revision twice, the second time presumably because it's outputting the comment that it's adding to the bug. Will fix. $ webkit-patch land Parsing ChangeLog: /Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/ChangeLog Fetching: https://bugs.webkit.org/show_bug.cgi?id=49471&ctype=xml Guessing "Adam Barth" as reviewer from attachment 73771 on bug 49471. Parsing ChangeLog: /Users/mihaip/Developer/source/chromium1/src/third_party/WebKit/WebKitTools/ChangeLog Committed r71954: <http://trac.webkit.org/changeset/71954> Updating bug 49471 Logging in as mihaip@chromium.org... Closing bug 49471 as fixed Committed r71954: <http://trac.webkit.org/changeset/71954> 308821 7 abarth 2010-11-12 16:00:14 -0800 > Though I now see that webkit-patch land outputs the revision twice, the second time presumably because it's outputting the comment that it's adding to the bug. Will fix. Yep. :) We have a couple other "duplicate output" bugs. 308822 8 abarth 2010-11-12 16:00:55 -0800 I should also say that your patch is correct in that it outputs the revision from the right piece of code. The other place we're output it is wrong. 73771 2010-11-12 13:44:47 -0800 2010-11-12 15:20:05 -0800 Patch bug-49471-20101112134446.patch text/plain 6710 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhOTk2MDNmOGRkNDNhZWRiZmJiOWNlYjc2NzFiNmU1MTc1ZGQ4MzUyLi45NzY3MTNm NWU4OTdmZDgyMjhiOWRjMjczYWE5NThjMDU1MTUzMzVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMTEtMTIgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgd2Via2l0LXBhdGNoIGxhbmQtY293Ym95IChhbmQgb3RoZXIgY29tbWFuZHMpIHNob3Vs ZCBkaXNwbGF5IHRoZSBjb21taXR0ZWQgU1ZOIHJldmlzaW9uIGFmdGVyIGxhbmRpbmcgYSBwYXRj aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk0NzEK KworICAgICAgICBSaWdodCBub3cgdGhlcmUncyBubyBpbmRpY2F0aW9uIG9mIGEgc3VjY2Vzc2Z1 bCBjb21taXQuCisgICAgICAgIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9kb3dubG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc3RlcHMvY29tbWl0LnB5OgorCiAyMDEwLTExLTEyICBUb255IENoYW5nICA8dG9ueUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5p dHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93 bmxvYWRfdW5pdHRlc3QucHkKaW5kZXggYmZjYTEzOTlmNDA2OTBkNDI2MmRkN2EwN2MyNzkzN2Y5 MTU0ZjA3YS4uOWNhMzQzYjJiNzI5ZTZmNzRiNGQyNDA2MTlmMWYxNGU4N2E1NDg3NyAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2Fk X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9kb3dubG9hZF91bml0dGVzdC5weQpAQCAtOTUsNyArOTUsNyBAQCBjbGFzcyBEb3dubG9h ZENvbW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRl X291dHB1dHMoQXBwbHlGcm9tQnVnKCksIFs0Ml0sIG9wdGlvbnM9b3B0aW9ucywgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X2xhbmRfZGlmZihzZWxmKToK LSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIkJ1aWxkaW5nIFdlYktpdFxuUnVubmluZyBQeXRo b24gdW5pdCB0ZXN0c1xuUnVubmluZyBQZXJsIHVuaXQgdGVzdHNcblJ1bm5pbmcgSmF2YVNjcmlw dENvcmUgdGVzdHNcblJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0c1xuVXBkYXRpbmcgYnVnIDQyXG4i CisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJCdWlsZGluZyBXZWJLaXRcblJ1bm5pbmcgUHl0 aG9uIHVuaXQgdGVzdHNcblJ1bm5pbmcgUGVybCB1bml0IHRlc3RzXG5SdW5uaW5nIEphdmFTY3Jp cHRDb3JlIHRlc3RzXG5SdW5uaW5nIHJ1bi13ZWJraXQtdGVzdHNcbkNvbW1pdHRlZCByNDk4MjQ6 IDxodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80OTgyND5cblVwZGF0aW5nIGJ1ZyA0 MlxuIgogICAgICAgICBtb2NrX3Rvb2wgPSBNb2NrVG9vbCgpCiAgICAgICAgIG1vY2tfdG9vbC5z Y20oKS5jcmVhdGVfcGF0Y2ggPSBNb2NrKCkKICAgICAgICAgbW9ja190b29sLmNoZWNrb3V0KCku bW9kaWZpZWRfY2hhbmdlbG9ncyA9IE1vY2socmV0dXJuX3ZhbHVlPVtdKQpAQCAtMTA1LDcgKzEw NSw3IEBAIGNsYXNzIERvd25sb2FkQ29tbWFuZHNUZXN0KENvbW1hbmRzVGVzdCk6CiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobW9ja190b29sLmNoZWNrb3V0KCkubW9kaWZpZWRfY2hhbmdlbG9n cy5jYWxsX2NvdW50LCAxKQogCiAgICAgZGVmIHRlc3RfbGFuZF9yZWRfYnVpbGRlcnMoc2VsZik6 Ci0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICdcbldBUk5JTkc6IEJ1aWxkZXJzIFsiQnVpbGRl cjIiXSBhcmUgcmVkLCBwbGVhc2Ugd2F0Y2ggeW91ciBjb21taXQgY2FyZWZ1bGx5LlxuU2VlIGh0 dHA6Ly9kdW1teV9idWlsZGJvdF9ob3N0L2NvbnNvbGU/Y2F0ZWdvcnk9Y29yZVxuXG5CdWlsZGlu ZyBXZWJLaXRcblJ1bm5pbmcgUHl0aG9uIHVuaXQgdGVzdHNcblJ1bm5pbmcgUGVybCB1bml0IHRl c3RzXG5SdW5uaW5nIEphdmFTY3JpcHRDb3JlIHRlc3RzXG5SdW5uaW5nIHJ1bi13ZWJraXQtdGVz dHNcblVwZGF0aW5nIGJ1ZyA0MlxuJworICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAnXG5XQVJO SU5HOiBCdWlsZGVycyBbIkJ1aWxkZXIyIl0gYXJlIHJlZCwgcGxlYXNlIHdhdGNoIHlvdXIgY29t bWl0IGNhcmVmdWxseS5cblNlZSBodHRwOi8vZHVtbXlfYnVpbGRib3RfaG9zdC9jb25zb2xlP2Nh dGVnb3J5PWNvcmVcblxuQnVpbGRpbmcgV2ViS2l0XG5SdW5uaW5nIFB5dGhvbiB1bml0IHRlc3Rz XG5SdW5uaW5nIFBlcmwgdW5pdCB0ZXN0c1xuUnVubmluZyBKYXZhU2NyaXB0Q29yZSB0ZXN0c1xu UnVubmluZyBydW4td2Via2l0LXRlc3RzXG5Db21taXR0ZWQgcjQ5ODI0OiA8aHR0cDovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvNDk4MjQ+XG5VcGRhdGluZyBidWcgNDJcbicKICAgICAgICAg bW9ja190b29sID0gTW9ja1Rvb2woKQogICAgICAgICBtb2NrX3Rvb2wuYnVpbGRib3QubGlnaHRf dHJlZV9vbl9maXJlKCkKICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKExhbmQo KSwgWzQyXSwgb3B0aW9ucz1zZWxmLl9kZWZhdWx0X29wdGlvbnMoKSwgZXhwZWN0ZWRfc3RkZXJy PWV4cGVjdGVkX3N0ZGVyciwgdG9vbD1tb2NrX3Rvb2wpCkBAIC0xMjgsNiArMTI4LDcgQEAgUnVu bmluZyBQeXRob24gdW5pdCB0ZXN0cwogUnVubmluZyBQZXJsIHVuaXQgdGVzdHMKIFJ1bm5pbmcg SmF2YVNjcmlwdENvcmUgdGVzdHMKIFJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cworQ29tbWl0dGVk IHI0OTgyNDogPGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ5ODI0PgogTm90IGNs b3NpbmcgYnVnIDQyIGFzIGF0dGFjaG1lbnQgMTk3IGhhcyByZXZpZXc9Ky4gIEFzc3VtaW5nIHRo ZXJlIGFyZSBtb3JlIHBhdGNoZXMgdG8gbGFuZCBmcm9tIHRoaXMgYnVnLgogIiIiCiAgICAgICAg IHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhMYW5kQXR0YWNobWVudCgpLCBbMTk3XSwgb3B0 aW9ucz1zZWxmLl9kZWZhdWx0X29wdGlvbnMoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikKQEAgLTE0Myw2ICsxNDQsNyBAQCBSdW5uaW5nIFB5dGhvbiB1bml0IHRlc3RzCiBSdW5u aW5nIFBlcmwgdW5pdCB0ZXN0cwogUnVubmluZyBKYXZhU2NyaXB0Q29yZSB0ZXN0cwogUnVubmlu ZyBydW4td2Via2l0LXRlc3RzCitDb21taXR0ZWQgcjQ5ODI0OiA8aHR0cDovL3RyYWMud2Via2l0 Lm9yZy9jaGFuZ2VzZXQvNDk4MjQ+CiBOb3QgY2xvc2luZyBidWcgNDIgYXMgYXR0YWNobWVudCAx OTcgaGFzIHJldmlldz0rLiAgQXNzdW1pbmcgdGhlcmUgYXJlIG1vcmUgcGF0Y2hlcyB0byBsYW5k IGZyb20gdGhpcyBidWcuCiBVcGRhdGluZyB3b3JraW5nIGRpcmVjdG9yeQogUHJvY2Vzc2luZyBw YXRjaCAxMjggZnJvbSBidWcgNDIuCkBAIC0xNTEsNiArMTUzLDcgQEAgUnVubmluZyBQeXRob24g dW5pdCB0ZXN0cwogUnVubmluZyBQZXJsIHVuaXQgdGVzdHMKIFJ1bm5pbmcgSmF2YVNjcmlwdENv cmUgdGVzdHMKIFJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cworQ29tbWl0dGVkIHI0OTgyNDogPGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ5ODI0PgogTm90IGNsb3NpbmcgYnVnIDQy IGFzIGF0dGFjaG1lbnQgMTk3IGhhcyByZXZpZXc9Ky4gIEFzc3VtaW5nIHRoZXJlIGFyZSBtb3Jl IHBhdGNoZXMgdG8gbGFuZCBmcm9tIHRoaXMgYnVnLgogIiIiCiAgICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhMYW5kRnJvbUJ1ZygpLCBbNDJdLCBvcHRpb25zPXNlbGYuX2RlZmF1 bHRfb3B0aW9ucygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQpAQCAtMTgxLDcg KzE4NCw3IEBAIHdoZXJlIEFUVEFDSE1FTlRfSUQgaXMgdGhlIElEIG9mIHRoaXMgYXR0YWNobWVu dC4KICAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKENyZWF0ZVJvbGxvdXQoKSwg Wzg1MiwgIlJlYXNvbiJdLCBvcHRpb25zPXNlbGYuX2RlZmF1bHRfb3B0aW9ucygpLCBleHBlY3Rl ZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRlc3Rfcm9sbG91dChzZWxmKToK LSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIlByZXBhcmluZyByb2xsb3V0IGZvciBidWcgNDIu XG5VcGRhdGluZyB3b3JraW5nIGRpcmVjdG9yeVxuUnVubmluZyBwcmVwYXJlLUNoYW5nZUxvZ1xu TU9DSzogdXNlci5vcGVuX3VybDogZmlsZTovLy4uLlxuQnVpbGRpbmcgV2ViS2l0XG4iCisgICAg ICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJQcmVwYXJpbmcgcm9sbG91dCBmb3IgYnVnIDQyLlxuVXBk YXRpbmcgd29ya2luZyBkaXJlY3RvcnlcblJ1bm5pbmcgcHJlcGFyZS1DaGFuZ2VMb2dcbk1PQ0s6 IHVzZXIub3Blbl91cmw6IGZpbGU6Ly8uLi5cbkJ1aWxkaW5nIFdlYktpdFxuQ29tbWl0dGVkIHI0 OTgyNDogPGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ5ODI0PlxuIgogICAgICAg ICBleHBlY3RlZF9zdGRvdXQgPSAiV2FzIHRoYXQgZGlmZiBjb3JyZWN0P1xuIgogICAgICAgICBz ZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoUm9sbG91dCgpLCBbODUyLCAiUmVhc29uIl0sIG9w dGlvbnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9z dGRvdXQsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jb21taXQucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY29tbWl0LnB5CmluZGV4IDhmNzBiODFm ZGE4MTdmNjg5NjQ1YmQzNWU4ODcxZWY0YWI3ZWMzOTEuLjVjNmJkYjdkNDYzYTJkMjBlNDA3NmEz MzUzZGNhYmY0NjkxZDMxOGEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9jb21taXQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3N0ZXBzL2NvbW1pdC5weQpAQCAtMjYsNyArMjYsOSBAQAogIyAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UK ICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KIAorZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuY2hhbmdlbG9n IGltcG9ydCB2aWV3X3NvdXJjZV91cmwKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNj bSBpbXBvcnQgQXV0aGVudGljYXRpb25FcnJvciwgQW1iaWd1b3VzQ29tbWl0RXJyb3IKK2Zyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGxvZwogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZy b20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBVc2VyCiBmcm9tIHdlYmtpdHB5 LnRvb2wuc3RlcHMuYWJzdHJhY3RzdGVwIGltcG9ydCBBYnN0cmFjdFN0ZXAKQEAgLTYxLDcgKzYz LDExIEBAIGNsYXNzIENvbW1pdChBYnN0cmFjdFN0ZXApOgogICAgICAgICAgICAgbnVtX3RyaWVz ICs9IDEKIAogICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHNlbGYuX3N0YXRlWyJj b21taXRfdGV4dCJdID0gc2VsZi5fdG9vbC5zY20oKS5jb21taXRfd2l0aF9tZXNzYWdlKHNlbGYu X2NvbW1pdF9tZXNzYWdlLCBnaXRfY29tbWl0PXNlbGYuX29wdGlvbnMuZ2l0X2NvbW1pdCwgdXNl cm5hbWU9dXNlcm5hbWUsIGZvcmNlX3NxdWFzaD1mb3JjZV9zcXVhc2gpCisgICAgICAgICAgICAg ICAgc2NtID0gc2VsZi5fdG9vbC5zY20oKQorICAgICAgICAgICAgICAgIGNvbW1pdF90ZXh0ID0g c2NtLmNvbW1pdF93aXRoX21lc3NhZ2Uoc2VsZi5fY29tbWl0X21lc3NhZ2UsIGdpdF9jb21taXQ9 c2VsZi5fb3B0aW9ucy5naXRfY29tbWl0LCB1c2VybmFtZT11c2VybmFtZSwgZm9yY2Vfc3F1YXNo PWZvcmNlX3NxdWFzaCkKKyAgICAgICAgICAgICAgICBzdm5fcmV2aXNpb24gPSBzY20uc3ZuX3Jl dmlzaW9uX2Zyb21fY29tbWl0X3RleHQoY29tbWl0X3RleHQpCisgICAgICAgICAgICAgICAgbG9n KCJDb21taXR0ZWQgciVzOiA8JXM+IiAlIChzdm5fcmV2aXNpb24sIHZpZXdfc291cmNlX3VybChz dm5fcmV2aXNpb24pKSkKKyAgICAgICAgICAgICAgICBzZWxmLl9zdGF0ZVsiY29tbWl0X3RleHQi XSA9IGNvbW1pdF90ZXh0CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBleGNl cHQgQW1iaWd1b3VzQ29tbWl0RXJyb3IsIGU6CiAgICAgICAgICAgICAgICAgaWYgc2VsZi5fdG9v bC51c2VyLmNvbmZpcm0oc2VsZi5fY29tbWl0X3dhcm5pbmcoZSkpOgo=