208138 2020-02-24 08:33:01 -0800 [ews] commit-queue should check that patch have appropriate review flag 2020-03-18 08:07:09 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209231 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue jbedard webkit-bug-importer oldest_to_newest 1622174 0 aakash_jain 2020-02-24 08:33:01 -0800 In addition to checking cq+ flag, commit-queue should also check that patch have appropriate review flag (i.e.: r+ or no review flags). Patches with r- or r? should be rejected by commit-queue. This is the same behavior as old EWS. 1622183 1 391548 aakash_jain 2020-02-24 08:49:46 -0800 Created attachment 391548 Patch 1622184 2 aakash_jain 2020-02-24 08:51:04 -0800 Sample runs: https://ews-build.webkit-uat.org/#/builders/26/builds/762 https://ews-build.webkit-uat.org/#/builders/26/builds/750 1622200 3 391548 jbedard 2020-02-24 09:28:31 -0800 Comment on attachment 391548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391548&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:390 > + self.setProperty('patch_author', patch_author) This doesn't seem to match the changelog, it looks like it's only patch_author and not commuter and reviewer as well. > Tools/BuildSlaveSupport/ews-build/steps.py:431 > + self.addURL('Reviewed by: {}'.format(patch_reviewer), '') What does 'addURL' do? I don't see a URL in this line. 1622203 4 jbedard 2020-02-24 09:29:29 -0800 (In reply to Aakash Jain from comment #2) > Sample runs: > https://ews-build.webkit-uat.org/#/builders/26/builds/762 > https://ews-build.webkit-uat.org/#/builders/26/builds/750 You can review your own patch!?! I've never tried that, I would expect commit queue to reject such a patch. 1622224 5 391548 aakash_jain 2020-02-24 10:26:45 -0800 Comment on attachment 391548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391548&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:390 >> + self.setProperty('patch_author', patch_author) > > This doesn't seem to match the changelog, it looks like it's only patch_author and not commuter and reviewer as well. patch_committer and patch_reviewer are set in subsequent methods. >> Tools/BuildSlaveSupport/ews-build/steps.py:431 >> + self.addURL('Reviewed by: {}'.format(patch_reviewer), '') > > What does 'addURL' do? I don't see a URL in this line. It adds information with a clickable url next to the build step. e.g.: see https://ews-build.webkit-uat.org/#/builders/26/builds/765 We want to display this information (about patch author/reviewer), but don't really need to link to a url. > You can review your own patch!?! > I've never tried that, I would expect commit queue to reject such a patch. Updated code rejects such patches. 1622226 6 391555 aakash_jain 2020-02-24 10:30:10 -0800 Created attachment 391555 Patch 1622228 7 aakash_jain 2020-02-24 10:31:21 -0800 Sample run for rejecting patches r+ed by patch author: https://ews-build.webkit-uat.org/#/builders/26/builds/767 1622420 8 391555 commit-queue 2020-02-24 16:55:59 -0800 Comment on attachment 391555 Patch Clearing flags on attachment: 391555 Committed r257284: <https://trac.webkit.org/changeset/257284> 1622421 9 commit-queue 2020-02-24 16:56:00 -0800 All reviewed patches have been landed. Closing bug. 1622422 10 webkit-bug-importer 2020-02-24 16:56:14 -0800 <rdar://problem/59747195> 391548 2020-02-24 08:49:46 -0800 2020-02-24 10:30:07 -0800 Patch bug-208138-20200224114945.patch text/plain 4083 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzIwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTAyLTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIGNoZWNrIHRoYXQgcGF0Y2gg aGF2ZSBhcHByb3ByaWF0ZSByZXZpZXcgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHk6CisgICAgICAgIChCdWd6aWxsYU1peGluLl9pc19wYXRjaF9vYnNvbGV0ZSk6IERyaXZlLWJ5 IGZpeCB0byBzZXQgYnVpbGQgcHJvcGVydGllcyBmb3IgcGF0Y2ggYXV0aG9yLCBjb21taXRlciBh bmQgcmV2aWV3ZXIuCisgICAgICAgIChCdWd6aWxsYU1peGluLl9pc19wYXRjaF9jcV9wbHVzKToK KyAgICAgICAgKEJ1Z3ppbGxhTWl4aW4uX2RvZXNfcGF0Y2hfaGF2ZV9hY2NlcHRhYmxlX3Jldmll d19mbGFnKTogTWV0aG9kIHRvIGNoZWNrIGlmIHBhdGNoIGhhdmUgcj8gb3Igci0gZmxhZy4KKyAg ICAgICAgKFZhbGlkYXRlUGF0Y2guc3RhcnQpOgorCiAyMDIwLTAyLTIyICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBpbmNsdWRlIG1pc3Rha2VzIGFu ZCBtYWtlIHNvbWUgY29kaW5nIHN0eWxlIHR3ZWFrcyB0byBXZWJLaXQgYW5kIFdlYktpdFRlc3RS dW5uZXIKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJ KHJldmlzaW9uIDI1NzIwOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9z dGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4Nyw5IEBAIGNsYXNzIEJ1Z3ppbGxh TWl4aW4ob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiAtMQogCiAgICAgICAgIHBhdGNoX2F1 dGhvciA9IHBhdGNoX2pzb24uZ2V0KCdjcmVhdG9yJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgncGF0Y2hfYXV0aG9yJywgcGF0Y2hfYXV0aG9yKQogICAgICAgICBpZiBzZWxmLmFkZFVSTHM6 Ci0gICAgICAgICAgICBzZWxmLmFkZFVSTCgnUGF0Y2ggYnk6IHt9Jy5mb3JtYXQocGF0Y2hfYXV0 aG9yKSwgJ21haWx0bzp7fScuZm9ybWF0KHBhdGNoX2F1dGhvcikpCisgICAgICAgICAgICBzZWxm LmFkZFVSTCgnUGF0Y2ggYnk6IHt9Jy5mb3JtYXQocGF0Y2hfYXV0aG9yKSwgJycpCiAgICAgICAg IHJldHVybiBwYXRjaF9qc29uLmdldCgnaXNfb2Jzb2xldGUnKQogCiAgICAgZGVmIF9pc19wYXRj aF9yZXZpZXdfZGVuaWVkKHNlbGYsIHBhdGNoX2lkKToKQEAgLTQxMCw5ICs0MTEsMzAgQEAgY2xh c3MgQnVnemlsbGFNaXhpbihvYmplY3QpOgogCiAgICAgICAgIGZvciBmbGFnIGluIHBhdGNoX2pz b24uZ2V0KCdmbGFncycsIFtdKToKICAgICAgICAgICAgIGlmIGZsYWcuZ2V0KCduYW1lJykgPT0g J2NvbW1pdC1xdWV1ZScgYW5kIGZsYWcuZ2V0KCdzdGF0dXMnKSA9PSAnKyc6CisgICAgICAgICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfY29tbWl0dGVyJywgZmxhZy5nZXQoJ3NldHRl cicsICcnKSkKICAgICAgICAgICAgICAgICByZXR1cm4gMQogICAgICAgICByZXR1cm4gMAogCisg ICAgZGVmIF9kb2VzX3BhdGNoX2hhdmVfYWNjZXB0YWJsZV9yZXZpZXdfZmxhZyhzZWxmLCBwYXRj aF9pZCk6CisgICAgICAgIHBhdGNoX2pzb24gPSBzZWxmLmdldF9wYXRjaF9qc29uKHBhdGNoX2lk KQorICAgICAgICBpZiBub3QgcGF0Y2hfanNvbjoKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9n KCdzdGRpbycsICdVbmFibGUgdG8gZmV0Y2ggcGF0Y2gge30uXG4nLmZvcm1hdChwYXRjaF9pZCkp CisgICAgICAgICAgICByZXR1cm4gLTEKKworICAgICAgICBmb3IgZmxhZyBpbiBwYXRjaF9qc29u LmdldCgnZmxhZ3MnLCBbXSk6CisgICAgICAgICAgICBpZiBmbGFnLmdldCgnbmFtZScpID09ICdy ZXZpZXcnOgorICAgICAgICAgICAgICAgIHJldmlld19zdGF0dXMgPSBmbGFnLmdldCgnc3RhdHVz JykKKyAgICAgICAgICAgICAgICBpZiByZXZpZXdfc3RhdHVzID09ICcrJzoKKyAgICAgICAgICAg ICAgICAgICAgcGF0Y2hfcmV2aWV3ZXIgPSBmbGFnLmdldCgnc2V0dGVyJywgJycpCisgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX3Jldmlld2VyJywgcGF0Y2hfcmV2 aWV3ZXIpCisgICAgICAgICAgICAgICAgICAgIGlmIHNlbGYuYWRkVVJMczoKKyAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdSZXZpZXdlZCBieToge30nLmZvcm1hdChwYXRjaF9y ZXZpZXdlciksICcnKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gMQorICAgICAgICAgICAg ICAgIGlmIHJldmlld19zdGF0dXMgaW4gWyctJywgJz8nXToKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ1BhdGNoIHt9IGlzIG1hcmtlZCBye30uXG4nLmZvcm1h dChwYXRjaF9pZCwgcmV2aWV3X3N0YXR1cykpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiAw CisgICAgICAgIHJldHVybiAxICAjIFBhdGNoIHdpdGhvdXQgcmV2aWV3IGZsYWcgaXMgYWNjZXB0 YWJsZSwgc2luY2UgdGhlIENoYW5nZUxvZyBtaWdodCBoYXZlICdSZXZpZXdlZCBieScgaW4gaXQu CisKICAgICBkZWYgX2lzX2J1Z19jbG9zZWQoc2VsZiwgYnVnX2lkKToKICAgICAgICAgaWYgbm90 IGJ1Z19pZDoKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdTa2lwcGluZyBi dWcgc3RhdHVzIHZhbGlkYXRpb24gc2luY2UgYnVnIGlkIGlzIE5vbmUuXG4nKQpAQCAtNTY2LDYg KzU4OCwxMSBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsCiAgICAg ICAgICAgICBzZWxmLnNraXBfYnVpbGQoJ1BhdGNoIHt9IGlzIG5vdCBtYXJrZWQgY3ErLicuZm9y bWF0KHBhdGNoX2lkKSkKICAgICAgICAgICAgIHJldHVybiBOb25lCiAKKyAgICAgICAgYWNjZXB0 YWJsZV9yZXZpZXdfZmxhZyA9IHNlbGYuX2RvZXNfcGF0Y2hfaGF2ZV9hY2NlcHRhYmxlX3Jldmll d19mbGFnKHBhdGNoX2lkKSBpZiBzZWxmLnZlcmlmeWNxcGx1cyBlbHNlIDEKKyAgICAgICAgaWYg YWNjZXB0YWJsZV9yZXZpZXdfZmxhZyAhPSAxOgorICAgICAgICAgICAgc2VsZi5za2lwX2J1aWxk KCdQYXRjaCB7fSBkb2VzIG5vdCBoYXZlIGFjY2VwdGFibGUgcmV2aWV3IGZsYWcuJy5mb3JtYXQo cGF0Y2hfaWQpKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKwogICAgICAgICBpZiBvYnNvbGV0 ZSA9PSAtMSBvciByZXZpZXdfZGVuaWVkID09IC0xIG9yIGJ1Z19jbG9zZWQgPT0gLTE6CiAgICAg ICAgICAgICBzZWxmLmZpbmlzaGVkKFdBUk5JTkdTKQogICAgICAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgndmFsaWRhdGVkJywgRmFsc2UpCkBAIC01NzksNiArNjA2LDcgQEAgY2xhc3MgVmFsaWRh dGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwLAogICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2co J3N0ZGlvJywgJ1BhdGNoIGlzIG5vdCBtYXJrZWQgci0uXG4nKQogICAgICAgICBpZiBzZWxmLnZl cmlmeWNxcGx1czoKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdQYXRjaCBp cyBtYXJrZWQgY3ErLlxuJykKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdQ YXRjaCBoYXZlIGFjY2VwdGFibGUgcmV2aWV3IGZsYWcuXG4nKQogICAgICAgICBzZWxmLmZpbmlz aGVkKFNVQ0NFU1MpCiAgICAgICAgIHJldHVybiBOb25lCiAK 391555 2020-02-24 10:30:10 -0800 2020-02-24 16:55:59 -0800 Patch bug-208138-20200224133009.patch text/plain 4346 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NzIwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTAyLTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIGNoZWNrIHRoYXQgcGF0Y2gg aGF2ZSBhcHByb3ByaWF0ZSByZXZpZXcgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHk6CisgICAgICAgIChCdWd6aWxsYU1peGluLl9pc19wYXRjaF9vYnNvbGV0ZSk6IERyaXZlLWJ5 IGZpeCB0byBzZXQgYnVpbGQgcHJvcGVydGllcyBmb3IgcGF0Y2ggYXV0aG9yLCBjb21taXRlciBh bmQgcmV2aWV3ZXIuCisgICAgICAgIChCdWd6aWxsYU1peGluLl9pc19wYXRjaF9jcV9wbHVzKToK KyAgICAgICAgKEJ1Z3ppbGxhTWl4aW4uX2RvZXNfcGF0Y2hfaGF2ZV9hY2NlcHRhYmxlX3Jldmll d19mbGFnKTogTWV0aG9kIHRvIGNoZWNrIGlmIHBhdGNoIGhhdmUgcj8gb3Igci0gZmxhZy4KKyAg ICAgICAgKFZhbGlkYXRlUGF0Y2guc3RhcnQpOgorCiAyMDIwLTAyLTIyICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBpbmNsdWRlIG1pc3Rha2VzIGFu ZCBtYWtlIHNvbWUgY29kaW5nIHN0eWxlIHR3ZWFrcyB0byBXZWJLaXQgYW5kIFdlYktpdFRlc3RS dW5uZXIKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJ KHJldmlzaW9uIDI1NzIwOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9z dGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4Nyw5IEBAIGNsYXNzIEJ1Z3ppbGxh TWl4aW4ob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiAtMQogCiAgICAgICAgIHBhdGNoX2F1 dGhvciA9IHBhdGNoX2pzb24uZ2V0KCdjcmVhdG9yJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgncGF0Y2hfYXV0aG9yJywgcGF0Y2hfYXV0aG9yKQogICAgICAgICBpZiBzZWxmLmFkZFVSTHM6 Ci0gICAgICAgICAgICBzZWxmLmFkZFVSTCgnUGF0Y2ggYnk6IHt9Jy5mb3JtYXQocGF0Y2hfYXV0 aG9yKSwgJ21haWx0bzp7fScuZm9ybWF0KHBhdGNoX2F1dGhvcikpCisgICAgICAgICAgICBzZWxm LmFkZFVSTCgnUGF0Y2ggYnk6IHt9Jy5mb3JtYXQocGF0Y2hfYXV0aG9yKSwgJycpCiAgICAgICAg IHJldHVybiBwYXRjaF9qc29uLmdldCgnaXNfb2Jzb2xldGUnKQogCiAgICAgZGVmIF9pc19wYXRj aF9yZXZpZXdfZGVuaWVkKHNlbGYsIHBhdGNoX2lkKToKQEAgLTQxMCw5ICs0MTEsMzMgQEAgY2xh c3MgQnVnemlsbGFNaXhpbihvYmplY3QpOgogCiAgICAgICAgIGZvciBmbGFnIGluIHBhdGNoX2pz b24uZ2V0KCdmbGFncycsIFtdKToKICAgICAgICAgICAgIGlmIGZsYWcuZ2V0KCduYW1lJykgPT0g J2NvbW1pdC1xdWV1ZScgYW5kIGZsYWcuZ2V0KCdzdGF0dXMnKSA9PSAnKyc6CisgICAgICAgICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfY29tbWl0dGVyJywgZmxhZy5nZXQoJ3NldHRl cicsICcnKSkKICAgICAgICAgICAgICAgICByZXR1cm4gMQogICAgICAgICByZXR1cm4gMAogCisg ICAgZGVmIF9kb2VzX3BhdGNoX2hhdmVfYWNjZXB0YWJsZV9yZXZpZXdfZmxhZyhzZWxmLCBwYXRj aF9pZCk6CisgICAgICAgIHBhdGNoX2pzb24gPSBzZWxmLmdldF9wYXRjaF9qc29uKHBhdGNoX2lk KQorICAgICAgICBpZiBub3QgcGF0Y2hfanNvbjoKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9n KCdzdGRpbycsICdVbmFibGUgdG8gZmV0Y2ggcGF0Y2gge30uXG4nLmZvcm1hdChwYXRjaF9pZCkp CisgICAgICAgICAgICByZXR1cm4gLTEKKworICAgICAgICBmb3IgZmxhZyBpbiBwYXRjaF9qc29u LmdldCgnZmxhZ3MnLCBbXSk6CisgICAgICAgICAgICBpZiBmbGFnLmdldCgnbmFtZScpID09ICdy ZXZpZXcnOgorICAgICAgICAgICAgICAgIHJldmlld19zdGF0dXMgPSBmbGFnLmdldCgnc3RhdHVz JykKKyAgICAgICAgICAgICAgICBpZiByZXZpZXdfc3RhdHVzID09ICcrJzoKKyAgICAgICAgICAg ICAgICAgICAgcGF0Y2hfcmV2aWV3ZXIgPSBmbGFnLmdldCgnc2V0dGVyJywgJycpCisgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX3Jldmlld2VyJywgcGF0Y2hfcmV2 aWV3ZXIpCisgICAgICAgICAgICAgICAgICAgIGlmIHNlbGYuYWRkVVJMczoKKyAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdSZXZpZXdlZCBieToge30nLmZvcm1hdChwYXRjaF9y ZXZpZXdlciksICcnKQorICAgICAgICAgICAgICAgICAgICBpZiBwYXRjaF9yZXZpZXdlciA9PSBw YXRjaF9qc29uLmdldCgnY3JlYXRvcicpOgorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5f YWRkVG9Mb2coJ3N0ZGlvJywgJ1BhdGNoIHt9IGlzIHIrIGJ5IHRoZSBwYXRjaCBhdXRob3Ige30g aXRzZWxmLiBUaGlzIHNlZW1zIGxpa2UgYSBtaXN0YWtlLlxuJy5mb3JtYXQocGF0Y2hfaWQsIHBh dGNoX3Jldmlld2VyKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiAwCisgICAgICAg ICAgICAgICAgICAgIHJldHVybiAxCisgICAgICAgICAgICAgICAgaWYgcmV2aWV3X3N0YXR1cyBp biBbJy0nLCAnPyddOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8n LCAnUGF0Y2gge30gaXMgbWFya2VkIHJ7fS5cbicuZm9ybWF0KHBhdGNoX2lkLCByZXZpZXdfc3Rh dHVzKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDAKKyAgICAgICAgcmV0dXJuIDEgICMg UGF0Y2ggd2l0aG91dCByZXZpZXcgZmxhZyBpcyBhY2NlcHRhYmxlLCBzaW5jZSB0aGUgQ2hhbmdl TG9nIG1pZ2h0IGhhdmUgJ1Jldmlld2VkIGJ5JyBpbiBpdC4KKwogICAgIGRlZiBfaXNfYnVnX2Ns b3NlZChzZWxmLCBidWdfaWQpOgogICAgICAgICBpZiBub3QgYnVnX2lkOgogICAgICAgICAgICAg c2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ1NraXBwaW5nIGJ1ZyBzdGF0dXMgdmFsaWRhdGlvbiBz aW5jZSBidWcgaWQgaXMgTm9uZS5cbicpCkBAIC01NjYsNiArNTkxLDExIEBAIGNsYXNzIFZhbGlk YXRlUGF0Y2goYnVpbGRzdGVwLkJ1aWxkU3RlcCwKICAgICAgICAgICAgIHNlbGYuc2tpcF9idWls ZCgnUGF0Y2gge30gaXMgbm90IG1hcmtlZCBjcSsuJy5mb3JtYXQocGF0Y2hfaWQpKQogICAgICAg ICAgICAgcmV0dXJuIE5vbmUKIAorICAgICAgICBhY2NlcHRhYmxlX3Jldmlld19mbGFnID0gc2Vs Zi5fZG9lc19wYXRjaF9oYXZlX2FjY2VwdGFibGVfcmV2aWV3X2ZsYWcocGF0Y2hfaWQpIGlmIHNl bGYudmVyaWZ5Y3FwbHVzIGVsc2UgMQorICAgICAgICBpZiBhY2NlcHRhYmxlX3Jldmlld19mbGFn ICE9IDE6CisgICAgICAgICAgICBzZWxmLnNraXBfYnVpbGQoJ1BhdGNoIHt9IGRvZXMgbm90IGhh dmUgYWNjZXB0YWJsZSByZXZpZXcgZmxhZy4nLmZvcm1hdChwYXRjaF9pZCkpCisgICAgICAgICAg ICByZXR1cm4gTm9uZQorCiAgICAgICAgIGlmIG9ic29sZXRlID09IC0xIG9yIHJldmlld19kZW5p ZWQgPT0gLTEgb3IgYnVnX2Nsb3NlZCA9PSAtMToKICAgICAgICAgICAgIHNlbGYuZmluaXNoZWQo V0FSTklOR1MpCiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCd2YWxpZGF0ZWQnLCBGYWxz ZSkKQEAgLTU3OSw2ICs2MDksNyBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWls ZFN0ZXAsCiAgICAgICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnUGF0Y2ggaXMgbm90 IG1hcmtlZCByLS5cbicpCiAgICAgICAgIGlmIHNlbGYudmVyaWZ5Y3FwbHVzOgogICAgICAgICAg ICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ1BhdGNoIGlzIG1hcmtlZCBjcSsuXG4nKQorICAg ICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ1BhdGNoIGhhdmUgYWNjZXB0YWJsZSBy ZXZpZXcgZmxhZy5cbicpCiAgICAgICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKICAgICAgICAg cmV0dXJuIE5vbmUKIAo=