47866 2010-10-18 17:56:44 -0700 Implement webkit-patch suggest-reviewers 2010-10-19 08:05:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue eric ojan oldest_to_newest 295872 0 abarth 2010-10-18 17:56:44 -0700 Implement webkit-patch suggest-reviewers 295876 1 71109 abarth 2010-10-18 18:00:06 -0700 Created attachment 71109 Patch 295881 2 71109 eric 2010-10-18 18:08:04 -0700 Comment on attachment 71109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71109&action=review Looks good to me. I'm glad you beat me to it. Nicely done. :) > WebKitTools/Scripts/webkitpy/common/checkout/api.py:118 > + def suggested_reviewers(self, git_commit): I guess I figured Checkout would have had a more generic API (like the CommitInfos for the last N revisions), but OK. 295889 3 71109 commit-queue 2010-10-18 18:28:47 -0700 Comment on attachment 71109 Patch Rejecting patch 71109 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 71109]" exit_code: 2 Cleaning working directory Updating working directory Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=71109&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=47866&ctype=xml Processing 1 patch from 1 bug. Processing patch 71109 from bug 47866. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/4414082 295894 4 71109 abarth 2010-10-18 18:47:31 -0700 Comment on attachment 71109 Patch Oh noes! Darn you commit-cluster! 295929 5 71109 commit-queue 2010-10-18 19:44:41 -0700 Comment on attachment 71109 Patch Clearing flags on attachment: 71109 Committed r70020: <http://trac.webkit.org/changeset/70020> 295930 6 commit-queue 2010-10-18 19:44:47 -0700 All reviewed patches have been landed. Closing bug. 296190 7 ojan 2010-10-19 07:59:55 -0700 This is a great start. I was imagining that the way we'd implement this was to look at the annotate for the file at the lines modified and use those as the reviewers. That's what I do when I do it manually. WDYT? 296193 8 eric 2010-10-19 08:05:43 -0700 (In reply to comment #7) > This is a great start. I was imagining that the way we'd implement this was to look at the annotate for the file at the lines modified and use those as the reviewers. That's what I do when I do it manually. WDYT? Yup. We could do that. That's what I originally started to do (and have a half-patch for). But this solution is much simpler and gets us 90% of the way there it seems. IF we're going to look at the individual lines, either we have to create a diff and use DiffParser, or we have to find some way to get modified line ranges out of git/svn w/o creating a patch. The annotate step after that is easy. 71109 2010-10-18 18:00:06 -0700 2010-10-18 19:44:41 -0700 Patch bug-47866-20101018180005.patch text/plain 8973 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0MTI3ODdkMGRjOGFjODgzNjY4MWFmNmJlZTFiZjdhYTlkODgyMzU2Li5kNDk1ZTIy ZGU1YjA3YmJhZDI2N2M3MWVmNjMyYmZkZjlhZDdkMTRjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjcgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBJbXBsZW1l bnQgd2Via2l0LXBhdGNoIHN1Z2dlc3QtcmV2aWV3ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzg2NgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvYXBpLnB5OgorICAgICAgICAgICAgLSBUaGUgbWFpbiBsb2dp Yy4gIFdlIGxvb2sgYXQgdGhlIGxhc3QgZml2ZSBjaGFuZ2VzIHRvIGVhY2gKKyAgICAgICAgICAg ICAgbW9kaWZpZWQgKG5vbi1DaGFuZ2VMb2cpIGZpbGUgYW5kIGNvbGxlY3QgdXAgdGhlIHJldmll d2VycyBvZgorICAgICAgICAgICAgICB0aG9zZSBjaGFuZ2VzIGFzIHdlbGwgYXMgdGhlIGF1dGhv cnMgb2YgdGhvc2UgY2hhbmdlcyB3aG8gYXJlCisgICAgICAgICAgICAgIHJldmlld2Vycy4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9hcGlfdW5pdHRlc3QucHk6 CisgICAgICAgICAgICAtIFRlc3QgdGhlIGxvZ2ljIHdpdGggc29tZSBmdW4gbW9ja3MuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5OgorICAgICAgICAg ICAgLSBGaXggYSBidWcgd2hlbiB5b3UgaGF2ZSBsb2NhbCBnaXQgY29tbWl0cy4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHk6CisgICAg ICAgICAgICAtIFRlc3QgdGhhdCB0aGUgYnVnIGlzIGZpeGVkLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzLnB5OgorICAgICAgICAgICAgLSBBZGQgdGhl IHF1ZXJ5LgorCisyMDEwLTEwLTE4ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgc2NtLnB5IHNo b3VsZCBiZSBhYmxlIHRlbGwgdXMgd2hhdCByZXZpc2lvbnMgbWFkZSBjaGFuZ2VzIHRvIGEgZ2l2 ZW4gZmlsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDc4NjMKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvYXBpLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvYXBpLnB5CmluZGV4IGNhMjhlMzIzMzI1ODcyZGNlYzAxZDEzYWQxNjdmNTI1YmY3NzZk MjMuLmUwNDA0ODgxYmU1MzEzZWE2YWZkNWE2ZmQ2OTM1YWY2MmNlYTQ3ZjggMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weQorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9hcGkucHkKQEAg LTgzLDEzICs4MywxOSBAQCBjbGFzcyBDaGVja291dChvYmplY3QpOgogICAgIGRlZiBidWdfaWRf Zm9yX3JldmlzaW9uKHNlbGYsIHJldmlzaW9uKToKICAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0 X2luZm9fZm9yX3JldmlzaW9uKHJldmlzaW9uKS5idWdfaWQoKQogCi0gICAgZGVmIG1vZGlmaWVk X2NoYW5nZWxvZ3Moc2VsZiwgZ2l0X2NvbW1pdCk6CisgICAgZGVmIF9tb2RpZmllZF9maWxlc19t YXRjaGluZ19wcmVkaWNhdGUoc2VsZiwgZ2l0X2NvbW1pdCwgcHJlZGljYXRlKToKICAgICAgICAg IyBTQ00gcmV0dXJucyBwYXRocyByZWxhdGl2ZSB0byBzY20uY2hlY2tvdXRfcm9vdAogICAgICAg ICAjIENhbGxlcnMgKGVzcGVjaWFsbHkgdGhvc2UgdXNpbmcgdGhlIENoYW5nZUxvZyBjbGFzcykg bWF5CiAgICAgICAgICMgZXhwZWN0IGFic29sdXRlIHBhdGhzLCBzbyB0aGlzIG1ldGhvZCByZXR1 cm5zIGFic29sdXRlIHBhdGhzLgogICAgICAgICBjaGFuZ2VkX2ZpbGVzID0gc2VsZi5fc2NtLmNo YW5nZWRfZmlsZXMoZ2l0X2NvbW1pdCkKICAgICAgICAgYWJzb2x1dGVfcGF0aHMgPSBbb3MucGF0 aC5qb2luKHNlbGYuX3NjbS5jaGVja291dF9yb290LCBwYXRoKSBmb3IgcGF0aCBpbiBjaGFuZ2Vk X2ZpbGVzXQotICAgICAgICByZXR1cm4gW3BhdGggZm9yIHBhdGggaW4gYWJzb2x1dGVfcGF0aHMg aWYgc2VsZi5faXNfcGF0aF90b19jaGFuZ2Vsb2cocGF0aCldCisgICAgICAgIHJldHVybiBbcGF0 aCBmb3IgcGF0aCBpbiBhYnNvbHV0ZV9wYXRocyBpZiBwcmVkaWNhdGUocGF0aCldCisKKyAgICBk ZWYgbW9kaWZpZWRfY2hhbmdlbG9ncyhzZWxmLCBnaXRfY29tbWl0KToKKyAgICAgICAgcmV0dXJu IHNlbGYuX21vZGlmaWVkX2ZpbGVzX21hdGNoaW5nX3ByZWRpY2F0ZShnaXRfY29tbWl0LCBzZWxm Ll9pc19wYXRoX3RvX2NoYW5nZWxvZykKKworICAgIGRlZiBtb2RpZmllZF9ub25fY2hhbmdlbG9n cyhzZWxmLCBnaXRfY29tbWl0KToKKyAgICAgICAgcmV0dXJuIHNlbGYuX21vZGlmaWVkX2ZpbGVz X21hdGNoaW5nX3ByZWRpY2F0ZShnaXRfY29tbWl0LCBsYW1iZGEgcGF0aDogbm90IHNlbGYuX2lz X3BhdGhfdG9fY2hhbmdlbG9nKHBhdGgpKQogCiAgICAgZGVmIGNvbW1pdF9tZXNzYWdlX2Zvcl90 aGlzX2NvbW1pdChzZWxmLCBnaXRfY29tbWl0KToKICAgICAgICAgY2hhbmdlbG9nX3BhdGhzID0g c2VsZi5tb2RpZmllZF9jaGFuZ2Vsb2dzKGdpdF9jb21taXQpCkBAIC0xMDksNiArMTE1LDE0IEBA IGNsYXNzIENoZWNrb3V0KG9iamVjdCk6CiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBzb3J0 IGFuZCBsYWJlbCB0aGUgQ2hhbmdlTG9nIG1lc3NhZ2VzIGxpa2UgY29tbWl0LWxvZy1lZGl0b3Ig ZG9lcy4KICAgICAgICAgcmV0dXJuIENvbW1pdE1lc3NhZ2UoIiIuam9pbihjaGFuZ2Vsb2dfbWVz c2FnZXMpLnNwbGl0bGluZXMoKSkKIAorICAgIGRlZiBzdWdnZXN0ZWRfcmV2aWV3ZXJzKHNlbGYs IGdpdF9jb21taXQpOgorICAgICAgICBjaGFuZ2VkX2ZpbGVzID0gc2VsZi5tb2RpZmllZF9ub25f Y2hhbmdlbG9ncyhnaXRfY29tbWl0KQorICAgICAgICByZXZpc2lvbnMgPSBzZXQoc3VtKG1hcChz ZWxmLl9zY20ucmV2aXNpb25zX2NoYW5naW5nX2ZpbGUsIGNoYW5nZWRfZmlsZXMpLCBbXSkpCisg ICAgICAgIGNvbW1pdF9pbmZvcyA9IHNldChtYXAoc2VsZi5jb21taXRfaW5mb19mb3JfcmV2aXNp b24sIHJldmlzaW9ucykpCisgICAgICAgIHJldmlld2VycyA9IFtjb21taXRfaW5mby5yZXZpZXdl cigpIGZvciBjb21taXRfaW5mbyBpbiBjb21taXRfaW5mb3MgaWYgY29tbWl0X2luZm8ucmV2aWV3 ZXIoKV0KKyAgICAgICAgcmV2aWV3ZXJzLmV4dGVuZChbY29tbWl0X2luZm8uYXV0aG9yKCkgZm9y IGNvbW1pdF9pbmZvIGluIGNvbW1pdF9pbmZvcyBpZiBjb21taXRfaW5mby5hdXRob3IoKSBhbmQg Y29tbWl0X2luZm8uYXV0aG9yKCkuY2FuX3Jldmlld10pCisgICAgICAgIHJldHVybiBzb3J0ZWQo c2V0KHJldmlld2VycykpCisKICAgICBkZWYgYnVnX2lkX2Zvcl90aGlzX2NvbW1pdChzZWxmLCBn aXRfY29tbWl0KToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgcmV0dXJuIHBhcnNlX2J1Z19p ZChzZWxmLmNvbW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdChnaXRfY29tbWl0KS5tZXNzYWdl KCkpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9hcGlfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9hcGlfdW5pdHRlc3QucHkKaW5kZXggZmRmZDg3OThkZDVjYjk3ZTNlMWM1YTI5 NmE2YzA2MGJiM2MxNmM5My4uZDdiZDk1ZTFkODk1MzE4YmFjNTQ4NmJjOTU5Njk1Yjg4MjFmNWY2 NSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvYXBpX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L2FwaV91bml0dGVzdC5weQpAQCAtMTczLDMgKzE3MywyNCBAQCBjbGFzcyBD aGVja291dFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBjaGVja291dCA9IENoZWNr b3V0KHNjbSkKICAgICAgICAgZXhwZWN0ZWRfY2hhbmdsb2dzID0gWyIvZm9vL2Jhci9DaGFuZ2VM b2ciLCAiL2Zvby9iYXIvcmVsYXRpdmUvcGF0aC9DaGFuZ2VMb2ciXQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGNoZWNrb3V0Lm1vZGlmaWVkX2NoYW5nZWxvZ3MoZ2l0X2NvbW1pdD1Ob25lKSwg ZXhwZWN0ZWRfY2hhbmdsb2dzKQorCisgICAgZGVmIHRlc3Rfc3VnZ2VzdGVkX3Jldmlld2Vycyhz ZWxmKToKKyAgICAgICAgZGVmIG1vY2tfY2hhbmdlbG9nX2VudHJpZXNfZm9yX3JldmlzaW9uKHJl dmlzaW9uKToKKyAgICAgICAgICAgIGlmIHJldmlzaW9uICUgMiA9PSAwOgorICAgICAgICAgICAg ICAgIHJldHVybiBbQ2hhbmdlTG9nRW50cnkoX2NoYW5nZWxvZzFlbnRyeTEpXQorICAgICAgICAg ICAgcmV0dXJuIFtDaGFuZ2VMb2dFbnRyeShfY2hhbmdlbG9nMWVudHJ5MildCisKKyAgICAgICAg ZGVmIG1vY2tfcmV2aXNpb25zX2NoYW5naW5nX2ZpbGUocGF0aCwgbGltaXQ9NSk6CisgICAgICAg ICAgICBpZiBwYXRoLmVuZHN3aXRoKCJDaGFuZ2VMb2ciKToKKyAgICAgICAgICAgICAgICByZXR1 cm4gWzNdCisgICAgICAgICAgICByZXR1cm4gWzQsIDhdCisKKyAgICAgICAgc2NtID0gTW9jaygp CisgICAgICAgIHNjbS5jaGVja291dF9yb290ID0gIi9mb28vYmFyIgorICAgICAgICBzY20uY2hh bmdlZF9maWxlcyA9IGxhbWJkYSBnaXRfY29tbWl0OiBbImZpbGUxIiwgImZpbGUyIiwgInJlbGF0 aXZlL3BhdGgvQ2hhbmdlTG9nIl0KKyAgICAgICAgc2NtLnJldmlzaW9uc19jaGFuZ2luZ19maWxl ID0gbW9ja19yZXZpc2lvbnNfY2hhbmdpbmdfZmlsZQorICAgICAgICBjaGVja291dCA9IENoZWNr b3V0KHNjbSkKKyAgICAgICAgY2hlY2tvdXQuY2hhbmdlbG9nX2VudHJpZXNfZm9yX3JldmlzaW9u ID0gbW9ja19jaGFuZ2Vsb2dfZW50cmllc19mb3JfcmV2aXNpb24KKyAgICAgICAgcmV2aWV3ZXJz ID0gY2hlY2tvdXQuc3VnZ2VzdGVkX3Jldmlld2VycyhnaXRfY29tbWl0PU5vbmUpCisgICAgICAg IHJldmlld2VyX25hbWVzID0gW3Jldmlld2VyLmZ1bGxfbmFtZSBmb3IgcmV2aWV3ZXIgaW4gcmV2 aWV3ZXJzXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJldmlld2VyX25hbWVzLCBbdSdUb3Ig QXJuZSBWZXN0Ylx4ZjgnXSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbS5weQppbmRleCA2YzJjMTg5MzNkZmE1MDE2NWE5YjEwMjcxZWM3 NTNhM2NhNWFjMDZhLi5hNzEyMDFlMmIzNDAwOGMyMGEwMTMyMjMwOGIwN2U3NWFlNzRmYjIzIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtLnB5CkBAIC02NjgsNyArNjY4LDcgQEAgY2xhc3MgR2l0KFNDTSk6CiAKICAgICBkZWYgcmV2 aXNpb25zX2NoYW5naW5nX2ZpbGUoc2VsZiwgcGF0aCwgbGltaXQ9NSk6CiAgICAgICAgIGNvbW1p dF9pZHMgPSBzZWxmLnJ1bihbImdpdCIsICJsb2ciLCAiLS1wcmV0dHk9Zm9ybWF0OiVIIiwgIi0l cyIgJSBsaW1pdCwgcGF0aF0pLnNwbGl0bGluZXMoKQotICAgICAgICByZXR1cm4gbWFwKHNlbGYu c3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCwgY29tbWl0X2lkcykKKyAgICAgICAgcmV0dXJu IGZpbHRlcihsYW1iZGEgcmV2aXNpb246IHJldmlzaW9uLCBtYXAoc2VsZi5zdm5fcmV2aXNpb25f ZnJvbV9naXRfY29tbWl0LCBjb21taXRfaWRzKSkKIAogICAgIGRlZiBjb25mbGljdGVkX2ZpbGVz KHNlbGYpOgogICAgICAgICAjIFdlIGRvIG5vdCBuZWVkIHRvIHBhc3MgZGVjb2RlX291dHB1dCBm b3IgdGhpcyBkaWZmIGNvbW1hbmQKQEAgLTcwNiw3ICs3MDYsMTAgQEAgY2xhc3MgR2l0KFNDTSk6 CiAgICAgICAgIHJldHVybiBnaXRfY29tbWl0CiAKICAgICBkZWYgc3ZuX3JldmlzaW9uX2Zyb21f Z2l0X2NvbW1pdChzZWxmLCBjb21taXRfaWQpOgotICAgICAgICByZXR1cm4gaW50KHNlbGYucnVu KFsnZ2l0JywgJ3N2bicsICdmaW5kLXJldicsIGNvbW1pdF9pZF0pLnJzdHJpcCgpKQorICAgICAg ICB0cnk6CisgICAgICAgICAgICByZXR1cm4gaW50KHNlbGYucnVuKFsnZ2l0JywgJ3N2bicsICdm aW5kLXJldicsIGNvbW1pdF9pZF0pLnJzdHJpcCgpKQorICAgICAgICBleGNlcHQgVmFsdWVFcnJv ciwgZToKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgY29udGVudHNfYXRfcmV2 aXNpb24oc2VsZiwgcGF0aCwgcmV2aXNpb24pOgogICAgICAgICAiIiJSZXR1cm5zIGEgYnl0ZSBh cnJheSAoc3RyKCkpIGNvbnRhaW5pbmcgdGhlIGNvbnRlbnRzCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3Qu cHkKaW5kZXggZWQ4ZjAwOTcwYTI4OWZjYmEzYzkzM2YyZjM4OWZlODg0ZDhjYTI1Yy4uMWNmZWVl ODE4OTRhYjk4ZWRhYmZhNzA3NjYzODMyNmU3YjgyMjdjZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVz dC5weQpAQCAtOTcxLDYgKzk3MSwxMCBAQCBjbGFzcyBHaXRTVk5UZXN0KFNDTVRlc3QpOgogICAg ICAgICBzZWxmLnNjbS5jb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2UoImFub3RoZXIgdGVzdCBj b21taXQiKQogICAgICAgICBzZWxmLl90d29fbG9jYWxfY29tbWl0cygpCiAKKyAgICBkZWYgdGVz dF9yZXZpc2lvbnNfY2hhbmdpbmdfZmlsZXNfd2l0aF9sb2NhbF9jb21taXQoc2VsZik6CisgICAg ICAgIHNlbGYuX29uZV9sb2NhbF9jb21taXQoKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhz ZWxmLnNjbS5yZXZpc2lvbnNfY2hhbmdpbmdfZmlsZSgndGVzdF9maWxlX2NvbW1pdDEnKSwgW10p CisKICAgICBkZWYgdGVzdF9jb21taXRfd2l0aF9tZXNzYWdlKHNlbGYpOgogICAgICAgICBzZWxm Ll9vbmVfbG9jYWxfY29tbWl0X3BsdXNfd29ya2luZ19jb3B5X2NoYW5nZXMoKQogICAgICAgICBz Y20gPSBkZXRlY3Rfc2NtX3N5c3RlbShzZWxmLmdpdF9jaGVja291dF9wYXRoKQpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpp bmRleCA0NzhmYWMyYzE0NWVjZjJiNjEzODdjOThjYWU4NDQxZDE2OGMwMWQyLi4xNmRkYzJjODM3 ZTEyNmNlZjBkMTQ1Mjk5N2JiYzM0ZDA4OTRiMDMzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtMzAsNiArMzAs OCBAQAogCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogCitpbXBvcnQgd2Via2l0 cHkudG9vbC5zdGVwcyBhcyBzdGVwcworCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5j b21taXRpbmZvIGltcG9ydCBDb21taXRJbmZvCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcu Y29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdAogZnJvbSB3ZWJraXRweS5jb21tb24ubmV0 LmJ1aWxkYm90IGltcG9ydCBCdWlsZEJvdApAQCAtNDEsNiArNDMsMjEgQEAgZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQgbG9nCiBmcm9tIHdlYmtp dHB5LmxheW91dF90ZXN0cyBpbXBvcnQgcG9ydAogCiAKK2NsYXNzIFN1Z2dlc3RSZXZpZXdlcnMo QWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgorICAgIG5hbWUgPSAic3VnZ2VzdC1yZXZpZXdl cnMiCisgICAgaGVscF90ZXh0ID0gIlN1Z2dlc3QgcmV2aWV3ZXJzIGZvciBhIHBhdGNoIGJhc2Vk IG9uIHJlY2VudCBjaGFuZ2VzIHRvIHRoZSBtb2RpZmllZCBmaWxlcy4iCisKKyAgICBkZWYgX19p bml0X18oc2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBbCisgICAgICAgICAgICBzdGVwcy5PcHRp b25zLmdpdF9jb21taXQsCisgICAgICAgIF0KKyAgICAgICAgQWJzdHJhY3REZWNsYXJhdGl2ZUNv bW1hbmQuX19pbml0X18oc2VsZiwgb3B0aW9ucz1vcHRpb25zKQorCisgICAgZGVmIGV4ZWN1dGUo c2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIHJldmlld2VycyA9IHRvb2wuY2hl Y2tvdXQoKS5zdWdnZXN0ZWRfcmV2aWV3ZXJzKG9wdGlvbnMuZ2l0X2NvbW1pdCkKKyAgICAgICAg cHJpbnQgIlxuIi5qb2luKFtyZXZpZXdlci5mdWxsX25hbWUgZm9yIHJldmlld2VyIGluIHJldmll d2Vyc10pCisKKwogY2xhc3MgQnVnc1RvQ29tbWl0KEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5k KToKICAgICBuYW1lID0gImJ1Z3MtdG8tY29tbWl0IgogICAgIGhlbHBfdGV4dCA9ICJMaXN0IGJ1 Z3MgaW4gdGhlIGNvbW1pdC1xdWV1ZSIK