224519 2021-04-13 17:25:56 -0700 [results.webkit.org] Fully report git commits 2021-04-15 12:08:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ews-watchlist glenn webkit-bug-importer oldest_to_newest 1749946 0 jbedard 2021-04-13 17:25:56 -0700 Git commits in a local checkout are fully defined, we shouldn't rely on the results database defining partial commits for us. 1749947 1 webkit-bug-importer 2021-04-13 17:26:13 -0700 <rdar://problem/76619007> 1749949 2 425935 jbedard 2021-04-13 17:30:47 -0700 Created attachment 425935 Patch 1750601 3 425935 aakash_jain 2021-04-15 07:00:39 -0700 Comment on attachment 425935 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425935&action=review > Tools/Scripts/webkitpy/port/base.py:1530 > + # Don't rely on the results database to define git commits what does this mean? > Tools/Scripts/webkitpy/port/base.py:-1532 > - # Special case for WebKit since we have multiple representations at the moment Are we removing this special case? 1750628 4 425935 jbedard 2021-04-15 08:49:52 -0700 Comment on attachment 425935 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425935&action=review >> Tools/Scripts/webkitpy/port/base.py:1530 >> + # Don't rely on the results database to define git commits > > what does this mean? if you send the results database a partially-defined commit (ie, only the commit hash and repository_id), the results database will talk to whatever backend it has defined for the specific repository (GitHub + svn.webkit.org, for example) to determine the author/timestamp/identifier/etc. However, if we have a Git checkout, all of this information is accessible locally, so we might as well just report fully defined commits (ie, commits with populated author/timestamp/identifier) in the first place. The reason we didn't do this originally is because getting timestamp and commit message in Subversion is a network call anyways. >> Tools/Scripts/webkitpy/port/base.py:-1532 >> - # Special case for WebKit since we have multiple representations at the moment > > Are we removing this special case? Because the representation of WebKit on the backend now handles this. Previously, our representation of WebKit was purely Subversion, and had no knowledge of what a git commit was, and so didn't know that "master" and "trunk" were the same branch. However, since the new WebKit repository representation is aware of Git, it will correctly map trunk, main and master as default branches. 1750639 5 aakash_jain 2021-04-15 09:08:25 -0700 (In reply to Jonathan Bedard from comment #4) > >> Tools/Scripts/webkitpy/port/base.py:1530 > >> + # Don't rely on the results database to define git commits > > > > what does this mean? > > if you send the results database a partially-defined commit (ie, only the > commit hash and repository_id), the results database will talk to whatever > backend it has defined for the specific repository (GitHub + svn.webkit.org, > for example) to determine the author/timestamp/identifier/etc. However, if > we have a Git checkout, all of this information is accessible locally, so we > might as well just report fully defined commits (ie, commits with populated > author/timestamp/identifier) in the first place. The reason we didn't do > this originally is because getting timestamp and commit message in > Subversion is a network call anyways. ok, the comments needs to be updated to be more clear. > Because the representation of WebKit on the backend now handles this. ok 1750683 6 426119 jbedard 2021-04-15 11:17:02 -0700 Created attachment 426119 Patch for landing 1750709 7 ews-feeder 2021-04-15 12:08:08 -0700 Committed r276038 (236582@main): <https://commits.webkit.org/236582@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426119. 425935 2021-04-13 17:30:47 -0700 2021-04-15 11:17:00 -0700 Patch bug-224519-20210413173047.patch text/plain 4849 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTkxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA0LTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBGdWxseSByZXBvcnQgZ2l0IGNvbW1p dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUx OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzY2MTkwMDc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gYWxsb3dpbmcgdGhlIGJh Y2stZW5kIHRvIGZ1bGx5IGRlZmluZSBjb21taXRzIGFzc29jaWF0ZWQgd2l0aCBhIHRlc3QsCisg ICAgICAgIGRlZmluZSB0aG9zZSBjb21taXRzIGNsaWVudCBzaWRlIGFuZCBwb3N0IHRoZSByZXN1 bHQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9ydW5fcmVzdWx0cy5weToKKyAgICAgICAgKHN1bW1hcml6ZV9yZXN1bHRzKTogSGFuZGxlIGZ1 bGx5IHF1YWxpZmllZCBjb21taXRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zvcl91cGxvYWQpOiBGdWxseSBkZWZpbmUg Z2l0IGNvbW1pdHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRl c3QucHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2NvbW1pdHNfZm9yX3VwbG9hZF9naXRfc3Zu KToKKwogMjAyMS0wNC0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJlbW92ZSBzdXBwb3J0IGZvciBOUEFQSSBwbHVnaW5zIGluIFdlYlZp ZXcKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0 X3J1bl9yZXN1bHRzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5CShyZXZpc2lvbiAyNzU5MTcpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVz dWx0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMzc0LDcgKzM3NCw3IEBAIGRlZiBzdW1tYXJpemVf cmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXQKICAgICAgICAgIyBGSVhNRTogRG8gd2UgcmVhbGx5 IG5lZWQgdG8gcG9wdWxhdGUgdGhpcyBib3RoIGhlcmUgYW5kIGluIHRoZSBqc29uX3Jlc3VsdHNf Z2VuZXJhdG9yPwogICAgICAgICBpZiBwb3J0X29iai5nZXRfb3B0aW9uKCJidWlsZGVyX25hbWUi KToKICAgICAgICAgICAgIHBvcnRfb2JqLmhvc3QuaW5pdGlhbGl6ZV9zY20oKQotICAgICAgICAg ICAgcmVzdWx0c1sncmV2aXNpb24nXSA9IHBvcnRfb2JqLmNvbW1pdHNfZm9yX3VwbG9hZCgpWzBd WydpZCddCisgICAgICAgICAgICByZXN1bHRzWydyZXZpc2lvbiddID0gc3RyKHBvcnRfb2JqLmNv bW1pdHNfZm9yX3VwbG9hZCgpWzBdLmdldCgncmV2aXNpb24nLCBwb3J0X29iai5jb21taXRzX2Zv cl91cGxvYWQoKVswXS5nZXQoJ2lkJykpKQogICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAg ICAgICAgX2xvZy53YXJuKCJGYWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lvbiBmb3IgY2hl Y2tvdXQgKGN3ZDogJXMsIHdlYmtpdF9iYXNlOiAlcyksIGxlYXZpbmcgJ3JldmlzaW9uJyBrZXkg YmxhbmsgaW4gZnVsbF9yZXN1bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2ZpbGVzeXN0ZW0u Z2V0Y3dkKCksIHBvcnRfb2JqLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBlKSkKICAgICAgICAg IyBIYW5kbGUgY2FzZXMgd2hlcmUgd2UncmUgcnVubmluZyBvdXRzaWRlIG9mIHZlcnNpb24gY29u dHJvbC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyNzU5 MTcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5 KQpAQCAtMTUyNywxNiArMTUyNywxOCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAKICAgICAgICAg Y29tbWl0cyA9IFtdCiAgICAgICAgIGZvciByZXBvX2lkLCByZXBvIGluIHJlcG9zLml0ZW1zKCk6 Ci0gICAgICAgICAgICBjb21taXQgPSByZXBvLmNvbW1pdChpbmNsdWRlX2xvZz1GYWxzZSwgaW5j bHVkZV9pZGVudGlmaWVyPUZhbHNlKQorICAgICAgICAgICAgIyBEb24ndCByZWx5IG9uIHRoZSBy ZXN1bHRzIGRhdGFiYXNlIHRvIGRlZmluZSBnaXQgY29tbWl0cworICAgICAgICAgICAgaWYgcmVw by5pc19naXQ6CisgICAgICAgICAgICAgICAgY29tbWl0ID0gcmVwby5jb21taXQoKQorICAgICAg ICAgICAgICAgIGNvbW1pdCA9IGNvbW1pdC5FbmNvZGVyKCkuZGVmYXVsdChjb21taXQpCisgICAg ICAgICAgICAgICAgY29tbWl0WydyZXBvc2l0b3J5X2lkJ10gPSByZXBvX2lkCisgICAgICAgICAg ICAgICAgY29tbWl0cy5hcHBlbmQoY29tbWl0KQogCi0gICAgICAgICAgICAjIFNwZWNpYWwgY2Fz ZSBmb3IgV2ViS2l0IHNpbmNlIHdlIGhhdmUgbXVsdGlwbGUgcmVwcmVzZW50YXRpb25zIGF0IHRo ZSBtb21lbnQKLSAgICAgICAgICAgIGJyYW5jaCA9IGNvbW1pdC5icmFuY2gKLSAgICAgICAgICAg IGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIGJyYW5jaCBpbiByZXBvLkRFRkFVTFRfQlJBTkNI RVM6Ci0gICAgICAgICAgICAgICAgYnJhbmNoID0gJ3RydW5rJwotCi0gICAgICAgICAgICBjb21t aXRzLmFwcGVuZChVcGxvYWQuY3JlYXRlX2NvbW1pdCgKLSAgICAgICAgICAgICAgICByZXBvc2l0 b3J5X2lkPXJlcG9faWQsCi0gICAgICAgICAgICAgICAgaWQ9c3RyKGNvbW1pdC5yZXZpc2lvbiBv ciBjb21taXQuaGFzaCksCi0gICAgICAgICAgICAgICAgYnJhbmNoPWJyYW5jaCwKLSAgICAgICAg ICAgICkpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGNvbW1pdCA9IHJlcG8u Y29tbWl0KGluY2x1ZGVfbG9nPUZhbHNlLCBpbmNsdWRlX2lkZW50aWZpZXI9RmFsc2UpCisgICAg ICAgICAgICAgICAgY29tbWl0cy5hcHBlbmQoVXBsb2FkLmNyZWF0ZV9jb21taXQoCisgICAgICAg ICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9cmVwb19pZCwKKyAgICAgICAgICAgICAgICAgICAg aWQ9c3RyKGNvbW1pdC5yZXZpc2lvbiBvciBjb21taXQuaGFzaCksCisgICAgICAgICAgICAgICAg ICAgIGJyYW5jaD1jb21taXQuYnJhbmNoLAorICAgICAgICAgICAgICAgICkpCiAgICAgICAgIHJl dHVybiBjb21taXRzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91 bml0dGVzdC5weQkocmV2aXNpb24gMjc1OTE3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2Jhc2VfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTMzMSw3ICszMzEsMTcgQEAg Y2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X2NvbW1pdHNf Zm9yX3VwbG9hZF9naXRfc3ZuKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bigp LCBtb2Nrcy5sb2NhbC5HaXQocGF0aD0nLycsIGdpdF9zdm49VHJ1ZSk6CiAgICAgICAgICAgICBw b3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdmb28nKQotICAgICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChbeydyZXBvc2l0b3J5X2lkJzogJ3dlYmtpdCcsICdpZCc6ICc5JywgJ2JyYW5j aCc6ICd0cnVuayd9XSwgcG9ydC5jb21taXRzX2Zvcl91cGxvYWQoKSkKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoW3sKKyAgICAgICAgICAgICAgICAncmVwb3NpdG9yeV9pZCc6ICd3ZWJr aXQnLAorICAgICAgICAgICAgICAgICdyZXZpc2lvbic6IDksCisgICAgICAgICAgICAgICAgJ2hh c2gnOiAnZDhiY2UyNmZhNjVjNmZjOGYzOWMxNzkyN2FiYjc3ZjY5ZmFiODJmYycsCisgICAgICAg ICAgICAgICAgJ2lkZW50aWZpZXInOiAnNUBtYWluJywKKyAgICAgICAgICAgICAgICAnYnJhbmNo JzogJ21haW4nLAorICAgICAgICAgICAgICAgICdhdXRob3InOiB7J2VtYWlscyc6IFsnamJlZGFy ZEBhcHBsZS5jb20nXSwgJ25hbWUnOiAnSm9uYXRoYW4gQmVkYXJkJ30sCisgICAgICAgICAgICAg ICAgJ21lc3NhZ2UnOiAnUGF0Y2ggU2VyaWVzXG5naXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFt cGxlLm9yZy9yZXBvc2l0b3J5Ly90cnVua0A5IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5 MWI0ZGJmYycsCisgICAgICAgICAgICAgICAgJ3RpbWVzdGFtcCc6IDE2MDE2NjgwMDAsCisgICAg ICAgICAgICAgICAgJ29yZGVyJzogMSwKKyAgICAgICAgICAgIH1dLCBwb3J0LmNvbW1pdHNfZm9y X3VwbG9hZCgpKQogCiAKIGNsYXNzIE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6Cg== 426119 2021-04-15 11:17:02 -0700 2021-04-15 12:08:08 -0700 Patch for landing bug-224519-20210415111701.patch text/plain 5063 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NjAzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA0LTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBGdWxseSByZXBvcnQgZ2l0IGNvbW1p dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUx OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzY2MTkwMDc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgUmF0aGVyIHRoYW4gYWxsb3dpbmcgdGhlIGJhY2st ZW5kIHRvIGZ1bGx5IGRlZmluZSBjb21taXRzIGFzc29jaWF0ZWQgd2l0aCBhIHRlc3QsCisgICAg ICAgIGRlZmluZSB0aG9zZSBjb21taXRzIGNsaWVudCBzaWRlIGFuZCBwb3N0IHRoZSByZXN1bHQu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9y dW5fcmVzdWx0cy5weToKKyAgICAgICAgKHN1bW1hcml6ZV9yZXN1bHRzKTogSGFuZGxlIGZ1bGx5 IHF1YWxpZmllZCBjb21taXRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNl LnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zvcl91cGxvYWQpOiBGdWxseSBkZWZpbmUgZ2l0 IGNvbW1pdHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3Qu cHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2NvbW1pdHNfZm9yX3VwbG9hZF9naXRfc3ZuKToK KwogMjAyMS0wNC0xNSAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgQWxsb3cgZmFzdC1jcSBhcyBhIHByZWZpeCBmb3IgcGF0Y2ggbmFtZSBmb3IgZmFzdC1j cSBtb2RlIG9uIGNvbW1pdC1xdWV1ZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkJ KHJldmlzaW9uIDI3NjAzNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNzQsNyArMzc0 LDcgQEAgZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdAogICAgICAgICAj IEZJWE1FOiBEbyB3ZSByZWFsbHkgbmVlZCB0byBwb3B1bGF0ZSB0aGlzIGJvdGggaGVyZSBhbmQg aW4gdGhlIGpzb25fcmVzdWx0c19nZW5lcmF0b3I/CiAgICAgICAgIGlmIHBvcnRfb2JqLmdldF9v cHRpb24oImJ1aWxkZXJfbmFtZSIpOgogICAgICAgICAgICAgcG9ydF9vYmouaG9zdC5pbml0aWFs aXplX3NjbSgpCi0gICAgICAgICAgICByZXN1bHRzWydyZXZpc2lvbiddID0gcG9ydF9vYmouY29t bWl0c19mb3JfdXBsb2FkKClbMF1bJ2lkJ10KKyAgICAgICAgICAgIHJlc3VsdHNbJ3JldmlzaW9u J10gPSBzdHIocG9ydF9vYmouY29tbWl0c19mb3JfdXBsb2FkKClbMF0uZ2V0KCdyZXZpc2lvbics IHBvcnRfb2JqLmNvbW1pdHNfZm9yX3VwbG9hZCgpWzBdLmdldCgnaWQnKSkpCiAgICAgZXhjZXB0 IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICBfbG9nLndhcm4oIkZhaWxlZCB0byBkZXRlcm1pbmUg c3ZuIHJldmlzaW9uIGZvciBjaGVja291dCAoY3dkOiAlcywgd2Via2l0X2Jhc2U6ICVzKSwgbGVh dmluZyAncmV2aXNpb24nIGtleSBibGFuayBpbiBmdWxsX3Jlc3VsdHMuanNvbi5cbiVzIiAlIChw b3J0X29iai5fZmlsZXN5c3RlbS5nZXRjd2QoKSwgcG9ydF9vYmoucGF0aF9mcm9tX3dlYmtpdF9i YXNlKCksIGUpKQogICAgICAgICAjIEhhbmRsZSBjYXNlcyB3aGVyZSB3ZSdyZSBydW5uaW5nIG91 dHNpZGUgb2YgdmVyc2lvbiBjb250cm9sLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jh c2UucHkJKHJldmlzaW9uIDI3NjAzNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTI3LDE2ICsxNTI3LDIwIEBAIGNsYXNzIFBvcnQo b2JqZWN0KToKIAogICAgICAgICBjb21taXRzID0gW10KICAgICAgICAgZm9yIHJlcG9faWQsIHJl cG8gaW4gcmVwb3MuaXRlbXMoKToKLSAgICAgICAgICAgIGNvbW1pdCA9IHJlcG8uY29tbWl0KGlu Y2x1ZGVfbG9nPUZhbHNlLCBpbmNsdWRlX2lkZW50aWZpZXI9RmFsc2UpCisgICAgICAgICAgICBp ZiByZXBvLmlzX2dpdDoKKyAgICAgICAgICAgICAgICAjIEdpdCBjb21taXRzIGFyZSBjb21wbGV0 ZWx5IGRlZmluZWQgbG9jYWxseSwgc28gdXBsb2FkIHRoZSBmdWxseSBkZWZpbmVkIGNvbW1pdC4K KyAgICAgICAgICAgICAgICBjb21taXQgPSByZXBvLmNvbW1pdCgpCisgICAgICAgICAgICAgICAg Y29tbWl0ID0gY29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KGNvbW1pdCkKKyAgICAgICAgICAgICAg ICBjb21taXRbJ3JlcG9zaXRvcnlfaWQnXSA9IHJlcG9faWQKKyAgICAgICAgICAgICAgICBjb21t aXRzLmFwcGVuZChjb21taXQpCiAKLSAgICAgICAgICAgICMgU3BlY2lhbCBjYXNlIGZvciBXZWJL aXQgc2luY2Ugd2UgaGF2ZSBtdWx0aXBsZSByZXByZXNlbnRhdGlvbnMgYXQgdGhlIG1vbWVudAot ICAgICAgICAgICAgYnJhbmNoID0gY29tbWl0LmJyYW5jaAotICAgICAgICAgICAgaWYgcmVwb19p ZCA9PSAnd2Via2l0JyBhbmQgYnJhbmNoIGluIHJlcG8uREVGQVVMVF9CUkFOQ0hFUzoKLSAgICAg ICAgICAgICAgICBicmFuY2ggPSAndHJ1bmsnCi0KLSAgICAgICAgICAgIGNvbW1pdHMuYXBwZW5k KFVwbG9hZC5jcmVhdGVfY29tbWl0KAotICAgICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9cmVw b19pZCwKLSAgICAgICAgICAgICAgICBpZD1zdHIoY29tbWl0LnJldmlzaW9uIG9yIGNvbW1pdC5o YXNoKSwKLSAgICAgICAgICAgICAgICBicmFuY2g9YnJhbmNoLAotICAgICAgICAgICAgKSkKKyAg ICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgIyBTdWJ2ZXJzaW9uIGNvbW1pdHMgcmVx dWlyZSBuZXR3b3JrIHJlcXVlc3RzIHRvIGJlY29tZSBmdWxseSBkZWZpbmVkLCBzbyBwcm92aWRl IHBhcnRpYWwgY29tbWl0cworICAgICAgICAgICAgICAgICMgYW5kIGxldCB0aGUgYmFja2VuZCBo YW5kbGUgdGhlbS4KKyAgICAgICAgICAgICAgICBjb21taXQgPSByZXBvLmNvbW1pdChpbmNsdWRl X2xvZz1GYWxzZSwgaW5jbHVkZV9pZGVudGlmaWVyPUZhbHNlKQorICAgICAgICAgICAgICAgIGNv bW1pdHMuYXBwZW5kKFVwbG9hZC5jcmVhdGVfY29tbWl0KAorICAgICAgICAgICAgICAgICAgICBy ZXBvc2l0b3J5X2lkPXJlcG9faWQsCisgICAgICAgICAgICAgICAgICAgIGlkPXN0cihjb21taXQu cmV2aXNpb24gb3IgY29tbWl0Lmhhc2gpLAorICAgICAgICAgICAgICAgICAgICBicmFuY2g9Y29t bWl0LmJyYW5jaCwKKyAgICAgICAgICAgICAgICApKQogICAgICAgICByZXR1cm4gY29tbWl0cwpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkJKHJl dmlzaW9uIDI3NjAzNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMzEsNyArMzMxLDE3IEBAIGNsYXNzIFBvcnRUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9jb21taXRzX2Zvcl91cGxvYWRfZ2l0 X3N2bihzZWxmKToKICAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oKSwgbW9ja3MubG9jYWwu R2l0KHBhdGg9Jy8nLCBnaXRfc3ZuPVRydWUpOgogICAgICAgICAgICAgcG9ydCA9IHNlbGYubWFr ZV9wb3J0KHBvcnRfbmFtZT0nZm9vJykKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoW3sn cmVwb3NpdG9yeV9pZCc6ICd3ZWJraXQnLCAnaWQnOiAnOScsICdicmFuY2gnOiAndHJ1bmsnfV0s IHBvcnQuY29tbWl0c19mb3JfdXBsb2FkKCkpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs KFt7CisgICAgICAgICAgICAgICAgJ3JlcG9zaXRvcnlfaWQnOiAnd2Via2l0JywKKyAgICAgICAg ICAgICAgICAncmV2aXNpb24nOiA5LAorICAgICAgICAgICAgICAgICdoYXNoJzogJ2Q4YmNlMjZm YTY1YzZmYzhmMzljMTc5MjdhYmI3N2Y2OWZhYjgyZmMnLAorICAgICAgICAgICAgICAgICdpZGVu dGlmaWVyJzogJzVAbWFpbicsCisgICAgICAgICAgICAgICAgJ2JyYW5jaCc6ICdtYWluJywKKyAg ICAgICAgICAgICAgICAnYXV0aG9yJzogeydlbWFpbHMnOiBbJ2piZWRhcmRAYXBwbGUuY29tJ10s ICduYW1lJzogJ0pvbmF0aGFuIEJlZGFyZCd9LAorICAgICAgICAgICAgICAgICdtZXNzYWdlJzog J1BhdGNoIFNlcmllc1xuZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3Np dG9yeS8vdHJ1bmtAOSAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMnLAorICAg ICAgICAgICAgICAgICd0aW1lc3RhbXAnOiAxNjAxNjY4MDAwLAorICAgICAgICAgICAgICAgICdv cmRlcic6IDEsCisgICAgICAgICAgICB9XSwgcG9ydC5jb21taXRzX2Zvcl91cGxvYWQoKSkKIAog CiBjbGFzcyBOYXR1cmFsQ29tcGFyZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgo=