110356 2013-02-20 10:46:27 -0800 Parse author names with commas in ChangeLogs 2013-04-10 00:36:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109303 1 tony tony abarth cgarcia dpranke eric webkit.review.bot oldest_to_newest 837568 0 tony 2013-02-20 10:46:27 -0800 Parse author names with commas in ChangeLogs 837574 1 189339 tony 2013-02-20 10:48:57 -0800 Created attachment 189339 Patch 837575 2 tony 2013-02-20 10:49:25 -0800 This is kind of gross, alternate suggestions welcome. 837576 3 tony 2013-02-20 10:50:06 -0800 You can see the failure on https://bugs.webkit.org/show_bug.cgi?id=109303 . 837618 4 189339 dpranke 2013-02-20 11:52:16 -0800 Comment on attachment 189339 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189339&action=review > Tools/ChangeLog:8 > + Paweł's name has a comma in it, which was confusing the ChangeLog parser. interesting that this is showing up as \u212b (angstrom sign) rather than \u0142 (latin small l with stroke) in the bugzilla diff. What is it in the file? Perhaps there's a separate bug for some character encoding conversion here? > Tools/Scripts/webkitpy/common/checkout/changelog.py:150 > + return names It looks like this function is used in two places, in the author text and in the reviewer text. If I'm correctly understanding this patch, this will work for the author_text case (where we want name_and_email=True), but I think if Pawel put his full name as one of the reviewers, we'd probably still be stuck? Also, it seems like maybe we should just split this into two different functions, and maybe define the regex as a constant or something. Combining them into one function makes it hard to follow (especially lines 148-149). 837643 5 189354 tony 2013-02-20 12:15:33 -0800 Created attachment 189354 Patch 837645 6 tony 2013-02-20 12:16:15 -0800 (In reply to comment #4) > (From update of attachment 189339 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189339&action=review > > > Tools/ChangeLog:8 > > + Paweł's name has a comma in it, which was confusing the ChangeLog parser. > > interesting that this is showing up as \u212b (angstrom sign) rather than \u0142 (latin small l with stroke) in the bugzilla diff. What is it in the file? Perhaps there's a separate bug for some character encoding conversion here? This is a bug in PrettyPatch.rb. The ruby script isn't unicode aware. > > Tools/Scripts/webkitpy/common/checkout/changelog.py:150 > > + return names > > It looks like this function is used in two places, in the author text and in the reviewer text. If I'm correctly understanding this patch, this will work for the author_text case (where we want name_and_email=True), but I think if Pawel put his full name as one of the reviewers, we'd probably still be stuck? That's true, it will fail for reviewers. I'm OK with punting this problem until Pawel becomes a reviewer. > Also, it seems like maybe we should just split this into two different functions, and maybe define the regex as a constant or something. Combining them into one function makes it hard to follow (especially lines 148-149). Done. 837713 7 189366 tony 2013-02-20 13:44:31 -0800 Created attachment 189366 Patch for landing 837715 8 dpranke 2013-02-20 13:45:06 -0800 (In reply to comment #6) > (In reply to comment #4) > > (From update of attachment 189339 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=189339&action=review > > > > > Tools/ChangeLog:8 > > > + Paweł's name has a comma in it, which was confusing the ChangeLog parser. > > > > interesting that this is showing up as \u212b (angstrom sign) rather than \u0142 (latin small l with stroke) in the bugzilla diff. What is it in the file? Perhaps there's a separate bug for some character encoding conversion here? > > This is a bug in PrettyPatch.rb. The ruby script isn't unicode aware. > Is there a bug filed for that? > > > Tools/Scripts/webkitpy/common/checkout/changelog.py:150 > > > + return names > > > > It looks like this function is used in two places, in the author text and in the reviewer text. If I'm correctly understanding this patch, this will work for the author_text case (where we want name_and_email=True), but I think if Pawel put his full name as one of the reviewers, we'd probably still be stuck? > > That's true, it will fail for reviewers. I'm OK with punting this problem until Pawel becomes a reviewer. > > > Also, it seems like maybe we should just split this into two different functions, and maybe define the regex as a constant or something. Combining them into one function makes it hard to follow (especially lines 148-149). > > Done. As we discussed over IM, I think there are three problems here: there's the obvious one (we can't handle phajdan.jr's name), and two less obvious ones: 1) We don't expect the parser to be able to handle all possible combinations of stuff, and when it does fail to parse, the CQ chokes on this rather than failing semi-robustly somehow. We should file a bug to fix this. 2) The existing approach uses very complicated (IMO) regexps and a couple of ad-hoc workarounds to try and do the best it can. The code is unmaintainable (to me) and this patch makes it slightly worse. The only way I personally would fix this bug is to throw out the code and rewrite it to use a proper parser, but that's a lot more work. I don't want to require it now, so I've r+'ed this patch (so that we can handle phajdan.jr in the meantime), but we should file a separate bug to rework this code to make it more maintainable and/or correct. does that capture everything? 837733 9 189366 webkit.review.bot 2013-02-20 14:05:32 -0800 Comment on attachment 189366 Patch for landing Clearing flags on attachment: 189366 Committed r143504: <http://trac.webkit.org/changeset/143504> 837734 10 webkit.review.bot 2013-02-20 14:05:37 -0800 All reviewed patches have been landed. Closing bug. 837744 11 tony 2013-02-20 14:13:31 -0800 https://bugs.webkit.org/show_bug.cgi?id=110380 filed for (1). 872633 12 cgarcia 2013-04-10 00:36:29 -0700 *** Bug 84582 has been marked as a duplicate of this bug. *** 189339 2013-02-20 10:48:57 -0800 2013-02-20 12:15:30 -0800 Patch bug-110356-20130220104519.patch text/plain 3602 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmM0OTU0NTkzMDM2YWE4MjVjYmRjNGU2YzUyNzY1NjUx MGNmMjIwMy4uMDY0MDBkYzRjNzkwZmU0MzhjNDdlMTM5ZmJkZDUzZmQwNGYyM2Q4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEzLTAyLTIwICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUGFyc2UgYXV0aG9yIG5hbWVzIHdpdGggY29tbWFzIGluIENoYW5nZUxvZ3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM1NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhd2XFgidzIG5hbWUgaGFz IGEgY29tbWEgaW4gaXQsIHdoaWNoIHdhcyBjb25mdXNpbmcgdGhlIENoYW5nZUxvZyBwYXJzZXIu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cu cHk6CisgICAgICAgIChDaGFuZ2VMb2dFbnRyeS5fc3BsaXRfY29udHJpYnV0b3JfbmFtZXMpOiBB ZGQgYW4gb3B0aW9uYWwgcGFyYW0sIG5hbWVfYW5kX2VtYWlsLCB0aGF0IHJlcXVpcmVzIHRoYXQg d2Ugc3BsaXQgYWZ0ZXIgPiB1c2VkIHRvIGVuZCBlbWFpbCBhZGRyZXNzZXMuCisgICAgICAgIChD aGFuZ2VMb2dFbnRyeS5fcGFyc2VfYXV0aG9yX3RleHQpOiBQYXNzIG5hbWVfYW5kX2VtYWlsPVRy dWUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9n X3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9wYXJzZV9hdXRob3JzKTogVGVzdCBjYXNlIHdp dGggUGF3ZcWCJ3MgbmFtZS4KKwogMjAxMy0wMi0xOSAgUm91c2xhbiBTb2xvbWFraGluICA8cm91 c2xhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBTZXJ2ZSBzcGVsbGNoZWNr IHN1Z2dlc3Rpb25zIGZvciBlZGl0aW5nL3NwZWxsaW5nL3NwZWxsaW5nLWNoYW5nZWQtdGV4dC5o dG1sIGZyb20gY2FjaGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2NoYW5nZWxvZy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L2NoYW5nZWxvZy5weQppbmRleCA1YjYwYzJmNGI1ZGEyMjJiNzQxZTkxY2Q5Y2QyNzU4 Y2M4NmRhZjJmLi4zYWMxYThjNDlmOGQ4OWJmOTc5YmM1MDMyMDFlMzIxOTRiNzUwYjhkIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9n LnB5CkBAIC0xNDAsOCArMTQwLDE0IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9iamVjdCk6CiAg ICAgICAgIHJldHVybiByZXZpZXdlcl90ZXh0LCByZXZpZXdlcl9saXN0CiAKICAgICBAY2xhc3Nt ZXRob2QKLSAgICBkZWYgX3NwbGl0X2NvbnRyaWJ1dG9yX25hbWVzKGNscywgdGV4dCk6Ci0gICAg ICAgIHJldHVybiByZS5zcGxpdChyJ1xzKig/OiwoPzpccythbmRccyt8Jik/fCg/Ol58XHMrKWFu ZFxzK3wmJnxbLysmXSlccyonLCB0ZXh0KQorICAgIGRlZiBfc3BsaXRfY29udHJpYnV0b3JfbmFt ZXMoY2xzLCB0ZXh0LCBuYW1lX2FuZF9lbWFpbD1GYWxzZSk6CisgICAgICAgIHJlZ2V4ID0gcidc cyooPzosKD86XHMrYW5kXHMrfCYpP3woPzpefFxzKylhbmRccyt8JiZ8Wy8rJl0pXHMqJworICAg ICAgICBpZiBuYW1lX2FuZF9lbWFpbDoKKyAgICAgICAgICAgIHJlZ2V4ID0gJz4nICsgcmVnZXgK KyAgICAgICAgbmFtZXMgPSByZS5zcGxpdChyZWdleCwgdGV4dCkKKyAgICAgICAgaWYgbmFtZV9h bmRfZW1haWwgYW5kIGxlbihuYW1lcykgPiAxOgorICAgICAgICAgICAgbmFtZXMgPSBbbmFtZSAr ICI+IiBmb3IgbmFtZSBpbiBuYW1lc1s6LTFdXSArIFtuYW1lc1stMV1dCisgICAgICAgIHJldHVy biBuYW1lcwogCiAgICAgZGVmIF9mdXp6X21hdGNoX3Jldmlld2VycyhzZWxmLCByZXZpZXdlcnNf dGV4dF9saXN0KToKICAgICAgICAgaWYgbm90IHJldmlld2Vyc190ZXh0X2xpc3Q6CkBAIC0xNTks NyArMTY1LDcgQEAgY2xhc3MgQ2hhbmdlTG9nRW50cnkob2JqZWN0KToKICAgICBkZWYgX3BhcnNl X2F1dGhvcl90ZXh0KGNscywgdGV4dCk6CiAgICAgICAgIGlmIG5vdCB0ZXh0OgogICAgICAgICAg ICAgcmV0dXJuIFtdCi0gICAgICAgIGF1dGhvcnMgPSBjbHMuX3NwbGl0X2NvbnRyaWJ1dG9yX25h bWVzKHRleHQpCisgICAgICAgIGF1dGhvcnMgPSBjbHMuX3NwbGl0X2NvbnRyaWJ1dG9yX25hbWVz KHRleHQsIG5hbWVfYW5kX2VtYWlsPVRydWUpCiAgICAgICAgIGFzc2VydChhdXRob3JzIGFuZCBs ZW4oYXV0aG9ycykgPj0gMSkKICAgICAgICAgcmV0dXJuIFtjbHMuX3BhcnNlX2F1dGhvcl9uYW1l X2FuZF9lbWFpbChhdXRob3IpIGZvciBhdXRob3IgaW4gYXV0aG9yc10KIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nX3Vu aXR0ZXN0LnB5CmluZGV4IDM4ZWYyOTBjMTQzYmE1N2ViZjk2NzQyYjk1ZGI0ZWJjM2JiN2FmMjku LjkxNTU3ZTA2MGJkM2U1MDRjM2E4Nzk3YmI1MjM4ZWEzMGUwMDUwOWQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZ191bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2df dW5pdHRlc3QucHkKQEAgLTQ1Myw2ICs0NTMsOCBAQCBjbGFzcyBDaGFuZ2VMb2dUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIFsoJ05ldyBDb250cmlidXRvcicsICduZXdAd2Vi a2l0Lm9yZycpLCAoJ05vb2InLCAnbm9vYkB3ZWJraXQub3JnJyldKQogICAgICAgICBzZWxmLl9h c3NlcnRfcGFyc2VfYXV0aG9ycygnQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPiAmJiBC ZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPicsCiAgICAgICAgICAgICBbKCdB ZGFtIEJhcnRoJywgJ2FiYXJ0aEB3ZWJraXQub3JnJyksICgnQmVuamFtaW4gUG91bGFpbicsICdi cG91bGFpbkBhcHBsZS5jb20nKV0pCisgICAgICAgIHNlbGYuX2Fzc2VydF9wYXJzZV9hdXRob3Jz KHUnUGF3ZVx1MDE0MiBIYWpkYW4sIEpyLiAgPHBoYWpkYW4uanJAY2hyb21pdW0ub3JnPicsCisg ICAgICAgICAgICBbKHUnUGF3ZVx1MDE0MiBIYWpkYW4sIEpyLicsIHUncGhhamRhbi5qckBjaHJv bWl1bS5vcmcnKV0pCiAKICAgICBkZWYgX2Fzc2VydF9oYXNfdmFsaWRfcmV2aWV3ZXIoc2VsZiwg cmV2aWV3ZXJfbGluZSwgZXhwZWN0ZWQpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYu X2VudHJ5X3dpdGhfcmV2aWV3ZXIocmV2aWV3ZXJfbGluZSkuaGFzX3ZhbGlkX3Jldmlld2VyKCks IGV4cGVjdGVkKQo= 189354 2013-02-20 12:15:33 -0800 2013-02-20 13:44:28 -0800 Patch bug-110356-20130220121154.patch text/plain 4789 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjYyZjE0MDA2ZGQ2MGJmZmZkNDk1NzA4MGFhNDAxN2Q4 NTZkOWJlNS4uZTBiZjllZjIwZTYwZGE4ZGQzMDZhMDNiYjhjMDM2NTJkOTQwMjM2OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTAyLTIwICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUGFyc2UgYXV0aG9yIG5hbWVzIHdpdGggY29tbWFzIGluIENoYW5nZUxvZ3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM1NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhd2XFgidzIG5hbWUgaGFz IGEgY29tbWEgaW4gaXQsIHdoaWNoIHdhcyBjb25mdXNpbmcgdGhlIENoYW5nZUxvZyBwYXJzZXIu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cu cHk6CisgICAgICAgIChDaGFuZ2VMb2dFbnRyeSk6IE1vdmUgbmFtZSBzcGxpdHRpbmcgcmVnZXhw IGludG8gYSBjb25zdGFudC4KKyAgICAgICAgKENoYW5nZUxvZ0VudHJ5Ll9wYXJzZV9yZXZpZXdl cl90ZXh0KTogVXNlIF9zcGxpdF9yZXZpZXdlcl9uYW1lcy4KKyAgICAgICAgKENoYW5nZUxvZ0Vu dHJ5Ll9zcGxpdF9yZXZpZXdlcl9uYW1lcyk6IFJlbmFtZSB0byBiZSBtb3JlIHNwZWNpZmljLgor ICAgICAgICAoQ2hhbmdlTG9nRW50cnkuX3NwbGl0X2F1dGhvcl9uYW1lc193aXRoX2VtYWlscyk6 IFJlbmFtZSB0byBiZSBtb3JlIHNwZWNpZmljIGFuZCByZXF1aXJlIGVtYWlscy4KKyAgICAgICAg KENoYW5nZUxvZ0VudHJ5Ll9wYXJzZV9hdXRob3JfdGV4dCk6IFVzZSBfc3BsaXRfYXV0aG9yX25h bWVzX3dpdGhfZW1haWxzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L2NoYW5nZWxvZ191bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfcGFyc2VfYXV0aG9ycyk6 IFRlc3QgY2FzZSB3aXRoIFBhd2XFgidzIG5hbWUuCisKIDIwMTMtMDItMjAgIEpvY2hlbiBFaXNp bmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSB1c2UgYSBX ZWJUZXN0UHJveHlCYXNlIHBvaW50ZXIgdG8gaWRlbnRpZnkgdGhlIHdpbmRvdyB3ZSBuZWVkIHRo ZSBoaXN0b3J5IGZvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvY2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvY2hhbmdlbG9nLnB5CmluZGV4IDViNjBjMmY0YjVkYTIyMmI3NDFlOTFjZDljZDI3NThj Yzg2ZGFmMmYuLmU5MjdiMzM5OGNmMzBhYzE3ODNhNTI3Y2FlMGUwOTA5ZThhMmUyMmUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cu cHkKQEAgLTEwNCw2ICsxMDQsOCBAQCBjbGFzcyBDaGFuZ2VMb2dFbnRyeShvYmplY3QpOgogICAg ICMgZS5nLiBnaXQtc3ZuLWlkOiBodHRwOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJr aXQvdHJ1bmtAOTYxNjEgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCiAgICAg c3ZuX2lkX3JlZ2V4cCA9IHInZ2l0LXN2bi1pZDogaHR0cDovL3N2bi53ZWJraXQub3JnL3JlcG9z aXRvcnkvd2Via2l0L3RydW5rQCg/UDxzdm5pZD5cZCspICcKIAorICAgIHNwbGl0X25hbWVzX3Jl Z2V4cCA9IHInXHMqKD86LCg/OlxzK2FuZFxzK3wmKT98KD86XnxccyspYW5kXHMrfCYmfFsvKyZd KVxzKicKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb250ZW50cywgY29tbWl0dGVyX2xpc3Q9 Q29tbWl0dGVyTGlzdCgpLCByZXZpc2lvbj1Ob25lKToKICAgICAgICAgc2VsZi5fY29udGVudHMg PSBjb250ZW50cwogICAgICAgICBzZWxmLl9jb21taXR0ZXJfbGlzdCA9IGNvbW1pdHRlcl9saXN0 CkBAIC0xMzEsNyArMTMzLDcgQEAgY2xhc3MgQ2hhbmdlTG9nRW50cnkob2JqZWN0KToKICAgICAg ICAgaWYgbm90IGxlbihyZXZpZXdlcl90ZXh0KToKICAgICAgICAgICAgIHJldHVybiBOb25lLCBO b25lCiAKLSAgICAgICAgcmV2aWV3ZXJfbGlzdCA9IENoYW5nZUxvZ0VudHJ5Ll9zcGxpdF9jb250 cmlidXRvcl9uYW1lcyhyZXZpZXdlcl90ZXh0KQorICAgICAgICByZXZpZXdlcl9saXN0ID0gQ2hh bmdlTG9nRW50cnkuX3NwbGl0X3Jldmlld2VyX25hbWVzKHJldmlld2VyX3RleHQpCiAKICAgICAg ICAgIyBHZXQgcmlkIG9mICJyZXZpZXdlcnMiIGxpa2UgImV2ZW4gdGhvdWdoIHRoaXMgaXMganVz dCBhLi4uIiBpbiAiUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZywgZXZlbiB0aG91Z2ggdGhpcyBpcyBq dXN0IGEuLi4iCiAgICAgICAgICMgYW5kICJ3aG8gd3JvdGUgdGhlIG9yaWdpbmFsIGNvZGUiIGlu ICJOb2FtIFJvc2VudGhhbCwgd2hvIHdyb3RlIHRoZSBvcmlnaW5hbCBjb2RlIgpAQCAtMTQwLDgg KzE0MiwxNiBAQCBjbGFzcyBDaGFuZ2VMb2dFbnRyeShvYmplY3QpOgogICAgICAgICByZXR1cm4g cmV2aWV3ZXJfdGV4dCwgcmV2aWV3ZXJfbGlzdAogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVm IF9zcGxpdF9jb250cmlidXRvcl9uYW1lcyhjbHMsIHRleHQpOgotICAgICAgICByZXR1cm4gcmUu c3BsaXQocidccyooPzosKD86XHMrYW5kXHMrfCYpP3woPzpefFxzKylhbmRccyt8JiZ8Wy8rJl0p XHMqJywgdGV4dCkKKyAgICBkZWYgX3NwbGl0X3Jldmlld2VyX25hbWVzKGNscywgdGV4dCk6Cisg ICAgICAgIHJldHVybiByZS5zcGxpdChDaGFuZ2VMb2dFbnRyeS5zcGxpdF9uYW1lc19yZWdleHAs IHRleHQpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgX3NwbGl0X2F1dGhvcl9uYW1lc193 aXRoX2VtYWlscyhjbHMsIHRleHQpOgorICAgICAgICByZWdleCA9ICc+JyArIENoYW5nZUxvZ0Vu dHJ5LnNwbGl0X25hbWVzX3JlZ2V4cAorICAgICAgICBuYW1lcyA9IHJlLnNwbGl0KHJlZ2V4LCB0 ZXh0KQorICAgICAgICBpZiBsZW4obmFtZXMpID4gMToKKyAgICAgICAgICAgIG5hbWVzID0gW25h bWUgKyAiPiIgZm9yIG5hbWUgaW4gbmFtZXNbOi0xXV0gKyBbbmFtZXNbLTFdXQorICAgICAgICBy ZXR1cm4gbmFtZXMKIAogICAgIGRlZiBfZnV6el9tYXRjaF9yZXZpZXdlcnMoc2VsZiwgcmV2aWV3 ZXJzX3RleHRfbGlzdCk6CiAgICAgICAgIGlmIG5vdCByZXZpZXdlcnNfdGV4dF9saXN0OgpAQCAt MTU5LDcgKzE2OSw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9iamVjdCk6CiAgICAgZGVmIF9w YXJzZV9hdXRob3JfdGV4dChjbHMsIHRleHQpOgogICAgICAgICBpZiBub3QgdGV4dDoKICAgICAg ICAgICAgIHJldHVybiBbXQotICAgICAgICBhdXRob3JzID0gY2xzLl9zcGxpdF9jb250cmlidXRv cl9uYW1lcyh0ZXh0KQorICAgICAgICBhdXRob3JzID0gY2xzLl9zcGxpdF9hdXRob3JfbmFtZXNf d2l0aF9lbWFpbHModGV4dCkKICAgICAgICAgYXNzZXJ0KGF1dGhvcnMgYW5kIGxlbihhdXRob3Jz KSA+PSAxKQogICAgICAgICByZXR1cm4gW2Nscy5fcGFyc2VfYXV0aG9yX25hbWVfYW5kX2VtYWls KGF1dGhvcikgZm9yIGF1dGhvciBpbiBhdXRob3JzXQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2dfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2dfdW5pdHRlc3QucHkK aW5kZXggMzhlZjI5MGMxNDNiYTU3ZWJmOTY3NDJiOTVkYjRlYmMzYmI3YWYyOS4uOTE1NTdlMDYw YmQzZTUwNGMzYTg3OTdiYjUyMzhlYTMwZTAwNTA5ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nX3VuaXR0ZXN0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZ191bml0dGVzdC5w eQpAQCAtNDUzLDYgKzQ1Myw4IEBAIGNsYXNzIENoYW5nZUxvZ1Rlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICAgICAgWygnTmV3IENvbnRyaWJ1dG9yJywgJ25ld0B3ZWJraXQub3JnJyks ICgnTm9vYicsICdub29iQHdlYmtpdC5vcmcnKV0pCiAgICAgICAgIHNlbGYuX2Fzc2VydF9wYXJz ZV9hdXRob3JzKCdBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+ICYmIEJlbmphbWluIFBv dWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+JywKICAgICAgICAgICAgIFsoJ0FkYW0gQmFydGgn LCAnYWJhcnRoQHdlYmtpdC5vcmcnKSwgKCdCZW5qYW1pbiBQb3VsYWluJywgJ2Jwb3VsYWluQGFw cGxlLmNvbScpXSkKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3BhcnNlX2F1dGhvcnModSdQYXdlXHUw MTQyIEhhamRhbiwgSnIuICA8cGhhamRhbi5qckBjaHJvbWl1bS5vcmc+JywKKyAgICAgICAgICAg IFsodSdQYXdlXHUwMTQyIEhhamRhbiwgSnIuJywgdSdwaGFqZGFuLmpyQGNocm9taXVtLm9yZycp XSkKIAogICAgIGRlZiBfYXNzZXJ0X2hhc192YWxpZF9yZXZpZXdlcihzZWxmLCByZXZpZXdlcl9s aW5lLCBleHBlY3RlZCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5fZW50cnlfd2l0 aF9yZXZpZXdlcihyZXZpZXdlcl9saW5lKS5oYXNfdmFsaWRfcmV2aWV3ZXIoKSwgZXhwZWN0ZWQp Cg== 189366 2013-02-20 13:44:31 -0800 2013-02-20 14:05:32 -0800 Patch for landing bug-110356-20130220134053.patch text/plain 5021 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjYyZjE0MDA2ZGQ2MGJmZmZkNDk1NzA4MGFhNDAxN2Q4 NTZkOWJlNS4uM2MxZmIzNzAzNTFlY2EwNWU2YWIzZDE2NDQwYTU5NmZmODFlMDhjYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTAyLTIwICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUGFyc2UgYXV0aG9yIG5hbWVzIHdpdGggY29tbWFzIGluIENoYW5nZUxvZ3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM1NgorCisgICAgICAg IFJldmlld2VkIGJ5IERpcmsgUHJhbmtlLgorCisgICAgICAgIFBhd2XFgidzIG5hbWUgaGFzIGEg Y29tbWEgaW4gaXQsIHdoaWNoIHdhcyBjb25mdXNpbmcgdGhlIENoYW5nZUxvZyBwYXJzZXIuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHk6 CisgICAgICAgIChDaGFuZ2VMb2dFbnRyeSk6IE1vdmUgbmFtZSBzcGxpdHRpbmcgcmVnZXhwIGlu dG8gYSBjb25zdGFudC4KKyAgICAgICAgKENoYW5nZUxvZ0VudHJ5Ll9wYXJzZV9yZXZpZXdlcl90 ZXh0KTogVXNlIF9zcGxpdF9yZXZpZXdlcl9uYW1lcy4KKyAgICAgICAgKENoYW5nZUxvZ0VudHJ5 Ll9zcGxpdF9yZXZpZXdlcl9uYW1lcyk6IFJlbmFtZSB0byBiZSBtb3JlIHNwZWNpZmljLgorICAg ICAgICAoQ2hhbmdlTG9nRW50cnkuX3NwbGl0X2F1dGhvcl9uYW1lc193aXRoX2VtYWlscyk6IFJl bmFtZSB0byBiZSBtb3JlIHNwZWNpZmljIGFuZCByZXF1aXJlIGVtYWlscy4KKyAgICAgICAgKENo YW5nZUxvZ0VudHJ5Ll9wYXJzZV9hdXRob3JfdGV4dCk6IFVzZSBfc3BsaXRfYXV0aG9yX25hbWVz X3dpdGhfZW1haWxzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L2NoYW5nZWxvZ191bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfcGFyc2VfYXV0aG9ycyk6IFRl c3QgY2FzZSB3aXRoIFBhd2XFgidzIG5hbWUuCisKIDIwMTMtMDItMjAgIEpvY2hlbiBFaXNpbmdl ciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSB1c2UgYSBXZWJU ZXN0UHJveHlCYXNlIHBvaW50ZXIgdG8gaWRlbnRpZnkgdGhlIHdpbmRvdyB3ZSBuZWVkIHRoZSBo aXN0b3J5IGZvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvY2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvY2hhbmdlbG9nLnB5CmluZGV4IDViNjBjMmY0YjVkYTIyMmI3NDFlOTFjZDljZDI3NThjYzg2 ZGFmMmYuLmU5MjdiMzM5OGNmMzBhYzE3ODNhNTI3Y2FlMGUwOTA5ZThhMmUyMmUgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHkK QEAgLTEwNCw2ICsxMDQsOCBAQCBjbGFzcyBDaGFuZ2VMb2dFbnRyeShvYmplY3QpOgogICAgICMg ZS5nLiBnaXQtc3ZuLWlkOiBodHRwOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQv dHJ1bmtAOTYxNjEgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCiAgICAgc3Zu X2lkX3JlZ2V4cCA9IHInZ2l0LXN2bi1pZDogaHR0cDovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRv cnkvd2Via2l0L3RydW5rQCg/UDxzdm5pZD5cZCspICcKIAorICAgIHNwbGl0X25hbWVzX3JlZ2V4 cCA9IHInXHMqKD86LCg/OlxzK2FuZFxzK3wmKT98KD86XnxccyspYW5kXHMrfCYmfFsvKyZdKVxz KicKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb250ZW50cywgY29tbWl0dGVyX2xpc3Q9Q29t bWl0dGVyTGlzdCgpLCByZXZpc2lvbj1Ob25lKToKICAgICAgICAgc2VsZi5fY29udGVudHMgPSBj b250ZW50cwogICAgICAgICBzZWxmLl9jb21taXR0ZXJfbGlzdCA9IGNvbW1pdHRlcl9saXN0CkBA IC0xMzEsNyArMTMzLDcgQEAgY2xhc3MgQ2hhbmdlTG9nRW50cnkob2JqZWN0KToKICAgICAgICAg aWYgbm90IGxlbihyZXZpZXdlcl90ZXh0KToKICAgICAgICAgICAgIHJldHVybiBOb25lLCBOb25l CiAKLSAgICAgICAgcmV2aWV3ZXJfbGlzdCA9IENoYW5nZUxvZ0VudHJ5Ll9zcGxpdF9jb250cmli dXRvcl9uYW1lcyhyZXZpZXdlcl90ZXh0KQorICAgICAgICByZXZpZXdlcl9saXN0ID0gQ2hhbmdl TG9nRW50cnkuX3NwbGl0X3Jldmlld2VyX25hbWVzKHJldmlld2VyX3RleHQpCiAKICAgICAgICAg IyBHZXQgcmlkIG9mICJyZXZpZXdlcnMiIGxpa2UgImV2ZW4gdGhvdWdoIHRoaXMgaXMganVzdCBh Li4uIiBpbiAiUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZywgZXZlbiB0aG91Z2ggdGhpcyBpcyBqdXN0 IGEuLi4iCiAgICAgICAgICMgYW5kICJ3aG8gd3JvdGUgdGhlIG9yaWdpbmFsIGNvZGUiIGluICJO b2FtIFJvc2VudGhhbCwgd2hvIHdyb3RlIHRoZSBvcmlnaW5hbCBjb2RlIgpAQCAtMTQwLDggKzE0 MiwxNiBAQCBjbGFzcyBDaGFuZ2VMb2dFbnRyeShvYmplY3QpOgogICAgICAgICByZXR1cm4gcmV2 aWV3ZXJfdGV4dCwgcmV2aWV3ZXJfbGlzdAogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9z cGxpdF9jb250cmlidXRvcl9uYW1lcyhjbHMsIHRleHQpOgotICAgICAgICByZXR1cm4gcmUuc3Bs aXQocidccyooPzosKD86XHMrYW5kXHMrfCYpP3woPzpefFxzKylhbmRccyt8JiZ8Wy8rJl0pXHMq JywgdGV4dCkKKyAgICBkZWYgX3NwbGl0X3Jldmlld2VyX25hbWVzKGNscywgdGV4dCk6CisgICAg ICAgIHJldHVybiByZS5zcGxpdChDaGFuZ2VMb2dFbnRyeS5zcGxpdF9uYW1lc19yZWdleHAsIHRl eHQpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgX3NwbGl0X2F1dGhvcl9uYW1lc193aXRo X2VtYWlscyhjbHMsIHRleHQpOgorICAgICAgICByZWdleCA9ICc+JyArIENoYW5nZUxvZ0VudHJ5 LnNwbGl0X25hbWVzX3JlZ2V4cAorICAgICAgICBuYW1lcyA9IHJlLnNwbGl0KHJlZ2V4LCB0ZXh0 KQorICAgICAgICBpZiBsZW4obmFtZXMpID4gMToKKyAgICAgICAgICAgIG5hbWVzID0gW25hbWUg KyAiPiIgZm9yIG5hbWUgaW4gbmFtZXNbOi0xXV0gKyBbbmFtZXNbLTFdXQorICAgICAgICByZXR1 cm4gbmFtZXMKIAogICAgIGRlZiBfZnV6el9tYXRjaF9yZXZpZXdlcnMoc2VsZiwgcmV2aWV3ZXJz X3RleHRfbGlzdCk6CiAgICAgICAgIGlmIG5vdCByZXZpZXdlcnNfdGV4dF9saXN0OgpAQCAtMTU5 LDcgKzE2OSw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9iamVjdCk6CiAgICAgZGVmIF9wYXJz ZV9hdXRob3JfdGV4dChjbHMsIHRleHQpOgogICAgICAgICBpZiBub3QgdGV4dDoKICAgICAgICAg ICAgIHJldHVybiBbXQotICAgICAgICBhdXRob3JzID0gY2xzLl9zcGxpdF9jb250cmlidXRvcl9u YW1lcyh0ZXh0KQorICAgICAgICBhdXRob3JzID0gY2xzLl9zcGxpdF9hdXRob3JfbmFtZXNfd2l0 aF9lbWFpbHModGV4dCkKICAgICAgICAgYXNzZXJ0KGF1dGhvcnMgYW5kIGxlbihhdXRob3JzKSA+ PSAxKQogICAgICAgICByZXR1cm4gW2Nscy5fcGFyc2VfYXV0aG9yX25hbWVfYW5kX2VtYWlsKGF1 dGhvcikgZm9yIGF1dGhvciBpbiBhdXRob3JzXQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2dfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2dfdW5pdHRlc3QucHkKaW5k ZXggMzhlZjI5MGMxNDNiYTU3ZWJmOTY3NDJiOTVkYjRlYmMzYmI3YWYyOS4uMDViMjFlMGQzM2Vk ZTZjNjg5YTE0M2JlYjRmMTc3MTJkZTRhYmUyNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZ191bml0dGVzdC5weQpA QCAtNDUzLDYgKzQ1MywxMCBAQCBjbGFzcyBDaGFuZ2VMb2dUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgICAgIFsoJ05ldyBDb250cmlidXRvcicsICduZXdAd2Via2l0Lm9yZycpLCAo J05vb2InLCAnbm9vYkB3ZWJraXQub3JnJyldKQogICAgICAgICBzZWxmLl9hc3NlcnRfcGFyc2Vf YXV0aG9ycygnQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPiAmJiBCZW5qYW1pbiBQb3Vs YWluICA8YnBvdWxhaW5AYXBwbGUuY29tPicsCiAgICAgICAgICAgICBbKCdBZGFtIEJhcnRoJywg J2FiYXJ0aEB3ZWJraXQub3JnJyksICgnQmVuamFtaW4gUG91bGFpbicsICdicG91bGFpbkBhcHBs ZS5jb20nKV0pCisgICAgICAgIHNlbGYuX2Fzc2VydF9wYXJzZV9hdXRob3JzKHUnUGF3ZVx1MDE0 MiBIYWpkYW4sIEpyLiAgPHBoYWpkYW4uanJAY2hyb21pdW0ub3JnPicsCisgICAgICAgICAgICBb KHUnUGF3ZVx1MDE0MiBIYWpkYW4sIEpyLicsIHUncGhhamRhbi5qckBjaHJvbWl1bS5vcmcnKV0p CisgICAgICAgIHNlbGYuX2Fzc2VydF9wYXJzZV9hdXRob3JzKHUnUGF3ZVx1MDE0MiBIYWpkYW4s IEpyLiAgPHBoYWpkYW4uanJAY2hyb21pdW0ub3JnPiwgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPicsCisgICAgICAgICAgICBbKHUnUGF3ZVx1MDE0MiBIYWpkYW4sIEpyLicsIHUncGhh amRhbi5qckBjaHJvbWl1bS5vcmcnKSwgKHUnQWRhbSBCYXJ0aCcsIHUnYWJhcnRoQHdlYmtpdC5v cmcnKV0pCiAKICAgICBkZWYgX2Fzc2VydF9oYXNfdmFsaWRfcmV2aWV3ZXIoc2VsZiwgcmV2aWV3 ZXJfbGluZSwgZXhwZWN0ZWQpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuX2VudHJ5 X3dpdGhfcmV2aWV3ZXIocmV2aWV3ZXJfbGluZSkuaGFzX3ZhbGlkX3Jldmlld2VyKCksIGV4cGVj dGVkKQo=