36477 2010-03-22 21:27:32 -0700 webkit-patch reads wrong bug url from unified diff context 2010-04-02 00:21:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 1 morrita webkit-unassigned abarth commit-queue ddkilzer eric oldest_to_newest 202908 0 morrita 2010-03-22 21:27:32 -0700 With "post-commits", webkit-patch can read wrong URL from "context" part of diff text + We expect https://bugs.webkit.org/show_bug.cgi?id=12345 to be found + but, @@ -23,4 +25,4 @@ .... It found this http://webkit.org/b/67890 instead. How to reproduce: 1. Checkout git.webkit.org tree 2. Ensure last changelog contains http://webkit.org/b/123 style bug URL 3. make change, with changelog which containshttps://bugs.webkit.org/show_bug.cgi=456 style bug URL 4. try post-commits --dry for that change Expected: - the patch would be post for Bug 456 Actual: - the patch is post for 123 A concrete example of such patch is https://bug-36338-attachments.webkit.org/attachment.cgi?id=51146 202915 1 51393 morrita 2010-03-22 21:58:56 -0700 Created attachment 51393 patch v0 202924 2 51393 eric 2010-03-22 22:47:49 -0700 Comment on attachment 51393 patch v0 This is the wrong fix. In this case you want to just use the code for pulling the bug from the ChangeLogEntry instead of the diff. This proposed change would still wrongly grab bug urls added in other parts of the diff besides the ChangeLog. I recently added a ChangeLogEntry class which exposes a bug_id() method which should fix this case. 202925 3 eric 2010-03-22 22:48:21 -0700 Thank you for the fix attempt though! I think we have at least one dup of this bug. 202937 4 morrita 2010-03-22 23:09:14 -0700 Thank you for reviewing quickly! (In reply to comment #2) > This is the wrong fix. In this case you want to just use the code for pulling > the bug from the ChangeLogEntry instead of the diff. This proposed change > would still wrongly grab bug urls added in other parts of the diff besides the > ChangeLog. Agreed. > I recently added a ChangeLogEntry class which exposes a bug_id() method which > should fix this case. I couldn't find bug_id() on ChangeLogEntry. It looks not landed yet. Would you tell me which bug contains that? I'll watch it and retry this after its landing. BTW, Bug 33471 and Bug 33197 looks similar. But I'm not sure. 206427 5 52145 abarth 2010-03-31 02:22:28 -0700 Created attachment 52145 Patch 206604 6 52145 eric 2010-03-31 11:24:06 -0700 Comment on attachment 52145 Patch I don't think it's right that commit_message_for_this_commit throws. But that's an old mistake of mine. Would be nice to have a FIXME in your try-catch, but this is fine as is. 206690 7 52145 commit-queue 2010-03-31 13:28:27 -0700 Comment on attachment 52145 Patch Clearing flags on attachment: 52145 Committed r56863: <http://trac.webkit.org/changeset/56863> 206691 8 commit-queue 2010-03-31 13:28:34 -0700 All reviewed patches have been landed. Closing bug. 207759 9 eric 2010-04-02 00:21:56 -0700 *** Bug 33471 has been marked as a duplicate of this bug. *** 51393 2010-03-22 21:58:56 -0700 2010-03-31 02:22:23 -0700 patch v0 bug-36477-20100323135854.patch text/plain 4146 morrita ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyMzQ2YTBmLi4xODU4N2Y5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MjIgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgd2Via2l0LXBhdGNoIHJlYWRzIHdyb25n IGJ1ZyB1cmwgZnJvbSB1bmlmaWVkIGRpZmYgY29udGV4dCAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDc3CisKKyAgICAgICAgTWFkZSBiZSBhd2Fy ZSBvZiBkaWZmIGZvcm1hdCB3aGVuIHBhcnNpbmcgYSBidWcgdXJsIGZyb20gdGhlIGNvbW1pdCBk aWZmLgorICAgICAgICAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2J1Z3ppbGxhLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYnVnemlsbGFfdW5pdHRlc3QucHk6CisKIDIwMTAt MDMtMjIgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVnemls bGEucHkKaW5kZXggYmUwYzcwNy4uYjE5YjcwOSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9idWd6aWxsYS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2J1Z3ppbGxhLnB5CkBAIC00NywxNCArNDcsMTYgQEAgZnJvbSB3ZWJraXRweS51c2VyIGlt cG9ydCBVc2VyCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQg QmVhdXRpZnVsU291cCwgU291cFN0cmFpbmVyCiAKIAotCi1kZWYgcGFyc2VfYnVnX2lkKG1lc3Nh Z2UpOgotICAgIG1hdGNoID0gcmUuc2VhcmNoKCJodHRwXDovL3dlYmtpdFwub3JnL2IvKD9QPGJ1 Z19pZD5cZCspIiwgbWVzc2FnZSkKK2RlZiBwYXJzZV9idWdfaWQobWVzc2FnZSwgYXNfZGlmZj1G YWxzZSk6CisgICAgIyBXaGVuIGFzX2RpZmYgPT0gVHJ1ZSwgd2UgdHJlYXQgbWVzc2FnZSBhcyB0 ZXh0IGRpZmYKKyAgICAjIGFuZCBvbmx5IHNlYXJjaCBhZ2FpbnN0IGl0cyBhZGRpdGlvbnMgKGxp bmVzIHdpdGggYmFyZ2FpbmluZyAiKyIpCisgICAgZGlmZl9wcmVmaXggPSBhc19kaWZmIGFuZCAi XlxcKy4qIiBvciAiIgorICAgIG1hdGNoID0gcmUuc2VhcmNoKGRpZmZfcHJlZml4ICsgImh0dHBc Oi8vd2Via2l0XC5vcmcvYi8oP1A8YnVnX2lkPlxkKykiLCBtZXNzYWdlLCByZS5NVUxUSUxJTkUp CiAgICAgaWYgbWF0Y2g6CiAgICAgICAgIHJldHVybiBpbnQobWF0Y2guZ3JvdXAoJ2J1Z19pZCcp KQogICAgIG1hdGNoID0gcmUuc2VhcmNoKAotICAgICAgICBCdWd6aWxsYS5idWdfc2VydmVyX3Jl Z2V4ICsgInNob3dfYnVnXC5jZ2lcP2lkPSg/UDxidWdfaWQ+XGQrKSIsCi0gICAgICAgIG1lc3Nh Z2UpCisgICAgICAgIGRpZmZfcHJlZml4ICsgQnVnemlsbGEuYnVnX3NlcnZlcl9yZWdleCArICJz aG93X2J1Z1wuY2dpXD9pZD0oP1A8YnVnX2lkPlxkKykiLAorICAgICAgICBtZXNzYWdlLCByZS5N VUxUSUxJTkUpCiAgICAgaWYgbWF0Y2g6CiAgICAgICAgIHJldHVybiBpbnQobWF0Y2guZ3JvdXAo J2J1Z19pZCcpKQogICAgIHJldHVybiBOb25lCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2J1Z3ppbGxhX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9idWd6aWxsYV91bml0dGVzdC5weQppbmRleCA1MDk1MDMyLi4zNjk5NDNjIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2J1Z3ppbGxhX3VuaXR0ZXN0LnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVnemlsbGFfdW5pdHRlc3QucHkK QEAgLTEyMCw2ICsxMjAsMjEgQEAgY2xhc3MgQnVnemlsbGFUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9uZSwgcGFyc2VfYnVnX2lkKCJodHRwOi8v d3d3LndlYmtpdC5vcmcvYi8xMjM0NSIpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhOb25l LCBwYXJzZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2N0eXBl PXhtbCZpZD0xMjM0NSIpKQogCisgICAgICAgICMgVGVzdCAiYXNfZGlmZiIgb3B0aW9uCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE5vbmUsIHBhcnNlX2J1Z19pZCgiICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNDUiLCBhc19kaWZmPVRydWUpKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwgcGFyc2VfYnVnX2lkKCIrICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0NSIsIGFzX2RpZmY9VHJ1 ZSkpCisKKyAgICAgICAgZXhhbXBsZV9kaWZmX2NvbmFpbnNfYnVnX3VybHNfd2l0aF9taXhlZF9z dHlsZSA9ICIiIgorQEAgLTEsMyArMSwyMCBAQAorKzIwMTAtMDMtMTkgIE1PUklUQSBIYWppbWUg IDxtb3JyaXRhQGdvb2dsZS5jb20+CisrICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIzNDUKKyAyMDEwLTAzLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CisgCisgICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi80NTY3OD4gU29t ZSBidWcgZGVzY3JpcHRpb24KKyIiIgorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwg cGFyc2VfYnVnX2lkKGV4YW1wbGVfZGlmZl9jb25haW5zX2J1Z191cmxzX3dpdGhfbWl4ZWRfc3R5 bGUsIGFzX2RpZmY9VHJ1ZSkpCisgICAgICAgIAorCiAgICAgX2V4YW1wbGVfYnVnID0gIiIiCiA8 P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCIgc3RhbmRhbG9uZT0ieWVzIiA/Pgog PCFET0NUWVBFIGJ1Z3ppbGxhIFNZU1RFTSAiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvYnVnemls bGEuZHRkIj4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFu ZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy91cGxv YWQucHkKaW5kZXggYmVjM2FiZi4uN2Y1ZjQxNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tYW5kcy91cGxvYWQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tYW5kcy91cGxvYWQucHkKQEAgLTI3Miw3ICsyNzIsNyBAQCBjbGFzcyBQ b3N0Q29tbWl0cyhBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgICAgICBjb21t aXRfbWVzc2FnZSA9IHRvb2wuc2NtKCkuY29tbWl0X21lc3NhZ2VfZm9yX2xvY2FsX2NvbW1pdChj b21taXRfaWQpCiAKICAgICAgICAgICAgICMgUHJlZmVyIC0tYnVnLWlkPSwgdGhlbiBhIGJ1ZyB1 cmwgaW4gdGhlIGNvbW1pdCBtZXNzYWdlLCB0aGVuIGEgYnVnIHVybCBpbiB0aGUgZW50aXJlIGNv bW1pdCBkaWZmIChpLmUuIENoYW5nZUxvZ3MpLgotICAgICAgICAgICAgYnVnX2lkID0gb3B0aW9u cy5idWdfaWQgb3IgcGFyc2VfYnVnX2lkKGNvbW1pdF9tZXNzYWdlLm1lc3NhZ2UoKSkgb3IgcGFy c2VfYnVnX2lkKHRvb2wuc2NtKCkuY3JlYXRlX3BhdGNoX2Zyb21fbG9jYWxfY29tbWl0KGNvbW1p dF9pZCkpCisgICAgICAgICAgICBidWdfaWQgPSBvcHRpb25zLmJ1Z19pZCBvciBwYXJzZV9idWdf aWQoY29tbWl0X21lc3NhZ2UubWVzc2FnZSgpKSBvciBwYXJzZV9idWdfaWQodG9vbC5zY20oKS5j cmVhdGVfcGF0Y2hfZnJvbV9sb2NhbF9jb21taXQoY29tbWl0X2lkKSwgYXNfZGlmZj1UcnVlKQog ICAgICAgICAgICAgaWYgbm90IGJ1Z19pZDoKICAgICAgICAgICAgICAgICBsb2coIlNraXBwaW5n ICVzOiBObyBidWcgaWQgZm91bmQgaW4gY29tbWl0IG9yIHNwZWNpZmllZCB3aXRoIC0tYnVnLWlk LiIgJSBjb21taXRfaWQpCiAgICAgICAgICAgICAgICAgY29udGludWUK 52145 2010-03-31 02:22:28 -0700 2010-03-31 13:28:27 -0700 Patch bug-36477-20100331022226.patch text/plain 7088 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1M2ExYmQ0Li43NTg2YTg3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMt MzEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2ggcmVhZHMgd3JvbmcgYnVn IHVybCBmcm9tIHVuaWZpZWQgZGlmZiBjb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjQ3NworCisgICAgICAgIEluc3RlYWQgb2YgdHJ5aW5n IHRvIGZpZ3VyZSBvdXQgdGhlIGJ1Z19pZCBmcm9tIHRoZSBkaWZmLCB3ZSBzaG91bGQKKyAgICAg ICAganVzdCBnZXQgdGhlIGluZm9ybWF0aW9uIGZyb20gdGhlIENoZWNrb3V0IG9iamVjdCwgd2hp Y2ggdW5kZXJzdGFuZHMKKyAgICAgICAgdGhlc2UgY29uY2VwdHMuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9hcGkucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY29tbWl0aW5mby5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWQucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisKIDIwMTAtMDMtMzEgIFNoaW5pY2hpcm8gSGFtYWppICA8 aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIHRlc3QgZml4IGZvciBy NTY4MDkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9hcGkucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9hcGkucHkKaW5kZXggOGJiY2RjYS4uOGRmYWM1ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYXBpLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weQpAQCAtNzUsNiArNzUs OSBAQCBjbGFzcyBDaGVja291dChvYmplY3QpOgogICAgICAgICAjIGVudHJpZXMgbW9yZSBkaWZm aWN1bHQgdG8gd2lyZSBpbiBpZiB3ZSBuZWVkIHRvIGRvIHRoYXQgaW4gdGhlIGZ1dHVyZS4KICAg ICAgICAgcmV0dXJuIENvbW1pdEluZm8ocmV2aXNpb24sIGNvbW1pdHRlcl9lbWFpbCwgY2hhbmdl bG9nX2RhdGEpCiAKKyAgICBkZWYgYnVnX2lkX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbik6 CisgICAgICAgIHJldHVybiBzZWxmLmNvbW1pdF9pbmZvX2Zvcl9yZXZpc2lvbihyZXZpc2lvbiku YnVnX2lkKCkKKwogICAgIGRlZiBtb2RpZmllZF9jaGFuZ2Vsb2dzKHNlbGYpOgogICAgICAgICBy ZXR1cm4gW3BhdGggZm9yIHBhdGggaW4gc2VsZi5fc2NtLmNoYW5nZWRfZmlsZXMoKSBpZiBzZWxm Ll9pc19wYXRoX3RvX2NoYW5nZWxvZyhwYXRoKV0KIApAQCAtOTYsNiArOTksMTIgQEAgY2xhc3Mg Q2hlY2tvdXQob2JqZWN0KToKICAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIHNvcnQgYW5kIGxh YmVsIHRoZSBDaGFuZ2VMb2cgbWVzc2FnZXMgbGlrZSBjb21taXQtbG9nLWVkaXRvciBkb2VzLgog ICAgICAgICByZXR1cm4gQ29tbWl0TWVzc2FnZSgiIi5qb2luKGNoYW5nZWxvZ19tZXNzYWdlcyku c3BsaXRsaW5lcygpKQogCisgICAgZGVmIGJ1Z19pZF9mb3JfdGhpc19jb21taXQoc2VsZik6Cisg ICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBwYXJzZV9idWdfaWQoc2VsZi5jb21taXRf bWVzc2FnZV9mb3JfdGhpc19jb21taXQoKSkKKyAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBl OgorICAgICAgICAgICAgcGFzcyAjIFdlIG1pZ2h0IG5vdCBoYXZlIENoYW5nZUxvZ3MuCisKICAg ICBkZWYgYXBwbHlfcGF0Y2goc2VsZiwgcGF0Y2gsIGZvcmNlPUZhbHNlKToKICAgICAgICAgIyBJ dCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhdGNoIHdhcyBub3QgbWFkZSBmcm9tIHRoZSByb290IGRp cmVjdG9yeS4KICAgICAgICAgIyBXZSBzaG91bGQgZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNl LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvY29tbWl0aW5mby5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L2NvbW1pdGluZm8ucHkKaW5kZXggYjMzYTJkNy4uMWEwYmJkNCAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY29tbWl0aW5mby5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jb21t aXRpbmZvLnB5CkBAIC0zMSw3ICszMSw2IEBACiBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJr aXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QKLWZyb20g d2Via2l0cHkuY29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgcGFyc2VfYnVnX2lkCiAKIAogY2xh c3MgQ29tbWl0SW5mbyhvYmplY3QpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkLnB5CmluZGV4IGJmOWU4ZGYuLmNiOTg0N2Eg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9k b3dubG9hZC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvZG93bmxvYWQucHkKQEAgLTM0LDcgKzM0LDYgQEAgZnJvbSBvcHRwYXJzZSBpbXBvcnQgbWFr ZV9vcHRpb24KIGltcG9ydCB3ZWJraXRweS50b29sLnN0ZXBzIGFzIHN0ZXBzCiAKIGZyb20gd2Vi a2l0cHkuY29tbW9uLmNoZWNrb3V0LmNoYW5nZWxvZyBpbXBvcnQgQ2hhbmdlTG9nLCB2aWV3X3Nv dXJjZV91cmwKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgcGFyc2Vf YnVnX2lkCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3Jp cHRFcnJvcgogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLmFic3RyYWN0c2VxdWVuY2VkY29t bWFuZCBpbXBvcnQgQWJzdHJhY3RTZXF1ZW5jZWRDb21tYW5kCiBmcm9tIHdlYmtpdHB5LnRvb2wu Y29tbWFuZHMuc3RlcHNlcXVlbmNlIGltcG9ydCBTdGVwU2VxdWVuY2UKQEAgLTg2LDcgKzg1LDcg QEAgSWYgYSBidWcgaWQgaXMgcHJvdmlkZWQsIG9yIG9uZSBjYW4gYmUgZm91bmQgaW4gdGhlIENo YW5nZUxvZyBsYW5kIHdpbGwgdXBkYXRlIHQKIAogICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxm LCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgcmV0dXJuIHsKLSAgICAgICAgICAgICJi dWdfaWQiIDogKGFyZ3MgYW5kIGFyZ3NbMF0pIG9yIHBhcnNlX2J1Z19pZCh0b29sLnNjbSgpLmNy ZWF0ZV9wYXRjaCgpKSwKKyAgICAgICAgICAgICJidWdfaWQiIDogKGFyZ3MgYW5kIGFyZ3NbMF0p IG9yIHRvb2wuY2hlY2tvdXQoKS5idWdfaWRfZm9yX3RoaXNfY29tbWl0KCkKICAgICAgICAgfQog CiAKQEAgLTI0NCwxMiArMjQzLDggQEAgY2xhc3MgTGFuZEZyb21CdWcoQWJzdHJhY3RQYXRjaExh bmRpbmdDb21tYW5kLCBQcm9jZXNzQnVnc01peGluKToKIGNsYXNzIEFic3RyYWN0Um9sbG91dFBy ZXBDb21tYW5kKEFic3RyYWN0U2VxdWVuY2VkQ29tbWFuZCk6CiAgICAgYXJndW1lbnRfbmFtZXMg PSAiUkVWSVNJT04gUkVBU09OIgogCi0gICAgZGVmIF9wYXJzZV9idWdfaWRfZnJvbV9yZXZpc2lv bl9kaWZmKHNlbGYsIHJldmlzaW9uKToKLSAgICAgICAgb3JpZ2luYWxfZGlmZiA9IHNlbGYudG9v bC5zY20oKS5kaWZmX2Zvcl9yZXZpc2lvbihyZXZpc2lvbikKLSAgICAgICAgcmV0dXJuIHBhcnNl X2J1Z19pZChvcmlnaW5hbF9kaWZmKQotCiAgICAgZGVmIF9idWdfaWRfZm9yX3JldmlzaW9uKHNl bGYsIHJldmlzaW9uKToKLSAgICAgICAgYnVnX2lkID0gc2VsZi5fcGFyc2VfYnVnX2lkX2Zyb21f cmV2aXNpb25fZGlmZihyZXZpc2lvbikKKyAgICAgICAgYnVnX2lkID0gc2VsZi50b29sLmNoZWNr b3V0KCkuYnVnX2lkX2Zvcl9yZXZpc2lvbihyZXZpc2lvbikKICAgICAgICAgaWYgYnVnX2lkOgog ICAgICAgICAgICAgbG9nKCJQcmVwYXJpbmcgcm9sbG91dCBmb3IgYnVnICVzLiIgJSBidWdfaWQp CiAgICAgICAgICAgICByZXR1cm4gYnVnX2lkCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weQppbmRleCA5MTk3Zjc5Li43ZDg5YmNh IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv dXBsb2FkLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy91cGxvYWQucHkKQEAgLTE0NCwxNSArMTQ0LDE0IEBAIGNsYXNzIEFic3RyYWN0UGF0Y2hVcGxv YWRpbmdDb21tYW5kKEFic3RyYWN0U2VxdWVuY2VkQ29tbWFuZCk6CiAgICAgICAgICMgUGVyZmVy IGEgYnVnIGlkIHBhc3NlZCBhcyBhbiBhcmd1bWVudCBvdmVyIGEgYnVnIHVybCBpbiB0aGUgZGlm ZiAoaS5lLiBDaGFuZ2VMb2dzKS4KICAgICAgICAgYnVnX2lkID0gYXJncyBhbmQgYXJnc1swXQog ICAgICAgICBpZiBub3QgYnVnX2lkOgotICAgICAgICAgICAgc3RhdGVbImRpZmYiXSA9IHRvb2wu c2NtKCkuY3JlYXRlX3BhdGNoKCkKLSAgICAgICAgICAgIGJ1Z19pZCA9IHBhcnNlX2J1Z19pZChz dGF0ZVsiZGlmZiJdKQorICAgICAgICAgICAgYnVnX2lkID0gdG9vbC5jaGVja291dCgpLmJ1Z19p ZF9mb3JfdGhpc19jb21taXQoKQogICAgICAgICByZXR1cm4gYnVnX2lkCiAKICAgICBkZWYgX3By ZXBhcmVfc3RhdGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAgICAgIHN0YXRlID0g e30KICAgICAgICAgc3RhdGVbImJ1Z19pZCJdID0gc2VsZi5fYnVnX2lkKGFyZ3MsIHRvb2wsIHN0 YXRlKQogICAgICAgICBpZiBub3Qgc3RhdGVbImJ1Z19pZCJdOgotICAgICAgICAgICAgZXJyb3Io Ik5vIGJ1ZyBpZCBwYXNzZWQgYW5kIG5vIGJ1ZyB1cmwgZm91bmQgaW4gZGlmZi4iKQorICAgICAg ICAgICAgZXJyb3IoIk5vIGJ1ZyBpZCBwYXNzZWQgYW5kIG5vIGJ1ZyB1cmwgZm91bmQgaW4gQ2hh bmdlTG9ncy4iKQogICAgICAgICByZXR1cm4gc3RhdGUKIAogCkBAIC0yODgsNiArMjg3LDcgQEAg Y2xhc3MgUG9zdENvbW1pdHMoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgogICAgICAgICAg ICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmX2ZpbGUsIGRlc2NyaXB0 aW9uLCBjb21tZW50X3RleHQsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldywgbWFya19m b3JfY29tbWl0X3F1ZXVlPW9wdGlvbnMucmVxdWVzdF9jb21taXQpCiAKIAorIyBGSVhNRTogVGhp cyBjb21tYW5kIG5lZWRzIHRvIGJlIGJyb3VnaHQgaW50byB0aGUgbW9kZXJuIGFnZSB3aXRoIHN0 ZXBzIGFuZCBDb21taXRJbmZvLgogY2xhc3MgTWFya0J1Z0ZpeGVkKEFic3RyYWN0RGVjbGFyYXRp dmVDb21tYW5kKToKICAgICBuYW1lID0gIm1hcmstYnVnLWZpeGVkIgogICAgIGhlbHBfdGV4dCA9 ICJNYXJrIHRoZSBzcGVjaWZpZWQgYnVnIGFzIGZpeGVkIgpAQCAtMzAxLDYgKzMwMSw3IEBAIGNs YXNzIE1hcmtCdWdGaXhlZChBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgIF0K ICAgICAgICAgQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQuX19pbml0X18oc2VsZiwgb3B0aW9u cz1vcHRpb25zKQogCisgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGJlIHVzaW5nIGNoZWNrb3V0KCku Y2hhbmdlbG9nX2VudHJpZXNfZm9yX3JldmlzaW9uKC4uLikgaW5zdGVhZCBoZXJlLgogICAgIGRl ZiBfZmV0Y2hfY29tbWl0X2xvZyhzZWxmLCB0b29sLCBzdm5fcmV2aXNpb24pOgogICAgICAgICBp ZiBub3Qgc3ZuX3JldmlzaW9uOgogICAgICAgICAgICAgcmV0dXJuIHRvb2wuc2NtKCkubGFzdF9z dm5fY29tbWl0X2xvZygpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvbW9ja3Rvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9j a3Rvb2wucHkKaW5kZXggMWRkMjdlZC4uZDBkMWNkMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQpAQCAtMzc4LDYgKzM3OCw5IEBAIGNsYXNzIE1v Y2tDaGVja291dChvYmplY3QpOgogICAgICAgICAgICAgInJldmlld2VyIjogc2VsZi5fY29tbWl0 dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoIkRhcmluIEFkbGVyIiksCiAgICAgICAgIH0pCiAK KyAgICBkZWYgYnVnX2lkX2Zvcl9yZXZpc2lvbihzZWxmLCBzdm5fcmV2aXNpb24pOgorICAgICAg ICByZXR1cm4gMTIzNDUKKwogICAgIGRlZiBtb2RpZmllZF9jaGFuZ2Vsb2dzKHNlbGYpOgogICAg ICAgICAjIElkZWFsbHkgd2UnZCByZXR1cm4gc29tZXRoaW5nIG1vcmUgaW50ZXJlc3RpbmcgaGVy ZS4gIFRoZSBwcm9ibGVtIGlzCiAgICAgICAgICMgdGhhdCBMYW5kRGlmZiB3aWxsIHRyeSB0byBh Y3R1YWxseSByZWFkIHRoZSBwYXRjaCBmcm9tIGRpc2shCkBAIC0zOTIsNiArMzk1LDcgQEAgY2xh c3MgTW9ja0NoZWNrb3V0KG9iamVjdCk6CiAgICAgZGVmIGFwcGx5X3JldmVyc2VfZGlmZihzZWxm LCByZXZpc2lvbik6CiAgICAgICAgIHBhc3MKIAorCiBjbGFzcyBNb2NrVXNlcihvYmplY3QpOgog CiAgICAgQHN0YXRpY21ldGhvZAo=