140362 2015-01-12 09:41:46 -0800 build.webkit.org/dashboard should filter out commits to other branches 2016-01-22 23:04:15 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap bshafiei darin dbates thorton timothy oldest_to_newest 1060578 0 ap 2015-01-12 09:41:46 -0800 It is misleading to have the dashboard say "XXX revisions behind" when these changes are on a different branch, or when they are on a tag. We can use branch information from trac to do this. Even better, it may be possible to somehow get informed about ignored patches (e.g. patches that only touch ChangeLog, or patches for other files that are in a blacklist for the given platform). 1061491 1 ap 2015-01-14 22:36:22 -0800 rdar://problem/15971525 1071126 2 247097 ap 2015-02-22 22:08:05 -0800 Created attachment 247097 proposed fix 1071127 3 247097 thorton 2015-02-22 22:13:08 -0800 Comment on attachment 247097 proposed fix YAY! 1071222 4 ap 2015-02-23 09:43:09 -0800 Committed <http://trac.webkit.org/r180504>. 1157916 5 247097 jmarcell 2016-01-22 17:33:26 -0800 Comment on attachment 247097 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=247097&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:244 > + fromDate and toDate end up having the same value. Was this intentional? 1157992 6 ap 2016-01-22 23:04:15 -0800 I think so, it's supposed to download commits for that one day. 247097 2015-02-22 22:08:05 -0800 2015-02-22 22:13:08 -0800 proposed fix BranchCommitsOpenSource.txt text/plain 14743 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4MDQ5NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE1LTAyLTIyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIGJ1aWxkLndlYmtpdC5vcmcvZGFzaGJvYXJkIHNob3VsZCBmaWx0ZXIgb3V0 IGNvbW1pdHMgdG8gb3RoZXIgYnJhbmNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MDM2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qczoKKyAg ICAgICAgKEJ1aWxkYm90UXVldWUpOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 UXVldWVWaWV3LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9wcmVz ZW50UG9wb3ZlckZvclBlbmRpbmdDb21taXRzKToKKyAgICAgICAgKEJ1aWxkYm90UXVldWVWaWV3 LnByb3RvdHlwZS5fcHJlc2VudFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlKToKKyAgICAgICAgKEJ1 aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJ dGVyYXRpb24pOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLnJldmlzaW9u Q29udGVudEZvckl0ZXJhdGlvbik6CisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5 cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTogRGVsZXRlZC4KKyAgICAgICAgKEJ1aWxk Ym90UXVldWVWaWV3LnByb3RvdHlwZS5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UpOiBEZWxl dGVkLgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9yZXZpc2lvblBvcG92 ZXJDb250ZW50Rm9ySXRlcmF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9UcmFjLmpzOgorICAgICAgICAoVHJhYy5wcm90b3R5cGUuZ2V0IG9sZGVzdFJlY29yZGVkUmV2 aXNpb25OdW1iZXIpOgorICAgICAgICAoVHJhYy5wcm90b3R5cGUuY29tbWl0c09uQnJhbmNoKToK KyAgICAgICAgKFRyYWMucHJvdG90eXBlLl94bWxUaW1lbGluZVVSTCk6CisgICAgICAgIChUcmFj LnByb3RvdHlwZS5fY29udmVydENvbW1pdEluZm9FbGVtZW50VG9PYmplY3QpOgorICAgICAgICAo VHJhYy5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIChUcmFjLnByb3RvdHlwZS5zdGFydFBl cmlvZGljVXBkYXRlcyk6CisgICAgICAgIChUcmFjLnByb3RvdHlwZS5sb2FkTW9yZUhpc3Rvcmlj YWxEYXRhKToKKyAgICAgICAgKFRyYWMucHJvdG90eXBlLnVwZGF0ZSk6IERlbGV0ZWQuCisKIDIw MTUtMDItMjEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAog ICAgICAgICBUZXN0cyBkb24ndCB3b3JrIG9uIHNvbWUgYm90czogRmFpbGVkIHRvIHN0b3Agd3B0 d2sKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qcwkocmV2aXNpb24gMTgw NDc3KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qcwkod29ya2luZyBj b3B5KQpAQCAtMzMsNyArMzMsNyBAQCBCdWlsZGJvdFF1ZXVlID0gZnVuY3Rpb24oYnVpbGRib3Qs IGlkLCBpCiAgICAgdGhpcy5idWlsZGJvdCA9IGJ1aWxkYm90OwogICAgIHRoaXMuaWQgPSBpZDsK IAotICAgIHRoaXMuYnJhbmNoID0gaW5mby5icmFuY2ggfHwgbnVsbDsKKyAgICB0aGlzLmJyYW5j aCA9IGluZm8uYnJhbmNoIHx8IHsgb3BlblNvdXJjZTogInRydW5rIiwgaW50ZXJuYWw6ICJ0cnVu ayIgfTsKICAgICB0aGlzLnBsYXRmb3JtID0gaW5mby5wbGF0Zm9ybS5uYW1lIHx8ICJ1bmtub3du IjsKICAgICB0aGlzLmRlYnVnID0gaW5mby5kZWJ1ZyB8fCBmYWxzZTsKICAgICB0aGlzLmJ1aWxk ZXIgPSBpbmZvLmJ1aWxkZXIgfHwgZmFsc2U7CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9C dWlsZGJvdFF1ZXVlVmlldy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9C dWlsZGJvdFF1ZXVlVmlldy5qcwkocmV2aXNpb24gMTgwNDc3KQorKysgVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTg3LDIxICs4Nywy MyBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdmFyIGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyID0g d2Via2l0VHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwotICAgICAgICBpZiAoIWxh dGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyKQorICAgICAgICBpZiAoIWxhdGVz dFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyIHx8IHdlYmtpdFRyYWMub2xkZXN0UmVj b3JkZWRSZXZpc2lvbk51bWJlciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ub3BlblNvdXJj ZVJldmlzaW9uKSB7CisgICAgICAgICAgICB3ZWJraXRUcmFjLmxvYWRNb3JlSGlzdG9yaWNhbERh dGEoKTsKICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCi0gICAgICAgIHZhciB0b3Rh bFJldmlzaW9uc0JlaGluZCA9IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVy IC0gbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb247Ci0gICAgICAg IGlmICh0b3RhbFJldmlzaW9uc0JlaGluZCA8IDApCi0gICAgICAgICAgICB0b3RhbFJldmlzaW9u c0JlaGluZCA9IDA7CisgICAgICAgIC8vIEZJWE1FOiBUbyBiZSAxMDAlIGNvcnJlY3QsIHdlIHNo b3VsZCBhbHNvIGZpbHRlciBvdXQgY2hhbmdlcyB0aGF0IGFyZSBpZ25vcmVkIGJ5CisgICAgICAg IC8vIHRoZSBxdWV1ZSwgc2VlIF9zaG91bGRfZmlsZV90cmlnZ2VyX2J1aWxkIGluIHdrYnVpbGQu cHkuCisgICAgICAgIHZhciB0b3RhbFJldmlzaW9uc0JlaGluZCA9IHdlYmtpdFRyYWMuY29tbWl0 c09uQnJhbmNoKHF1ZXVlLmJyYW5jaC5vcGVuU291cmNlLCBmdW5jdGlvbihjb21taXQpIHsgcmV0 dXJuIGNvbW1pdC5yZXZpc2lvbk51bWJlciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ub3Bl blNvdXJjZVJldmlzaW9uOyB9KS5sZW5ndGg7CiAKICAgICAgICAgaWYgKGxhdGVzdFByb2R1Y3Rp dmVJdGVyYXRpb24uaW50ZXJuYWxSZXZpc2lvbikgewogICAgICAgICAgICAgdmFyIGxhdGVzdFJl Y29yZGVkSW50ZXJuYWxSZXZpc2lvbk51bWJlciA9IGludGVybmFsVHJhYy5sYXRlc3RSZWNvcmRl ZFJldmlzaW9uTnVtYmVyOwotICAgICAgICAgICAgaWYgKCFsYXRlc3RSZWNvcmRlZEludGVybmFs UmV2aXNpb25OdW1iZXIpCisgICAgICAgICAgICBpZiAoIWxhdGVzdFJlY29yZGVkSW50ZXJuYWxS ZXZpc2lvbk51bWJlciB8fCBpbnRlcm5hbFRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJl ciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24uaW50ZXJuYWxSZXZpc2lvbikgeworICAgICAg ICAgICAgICAgIGludGVybmFsVHJhYy5sb2FkTW9yZUhpc3RvcmljYWxEYXRhKCk7CiAgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQogCi0gICAgICAgICAgICB2YXIgaW50ZXJu YWxSZXZpc2lvbnNCZWhpbmQgPSBsYXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1iZXIg LSBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLmludGVybmFsUmV2aXNpb247Ci0gICAgICAgICAg ICBpZiAoaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgPiAwKQotICAgICAgICAgICAgICAgIHRvdGFs UmV2aXNpb25zQmVoaW5kICs9IGludGVybmFsUmV2aXNpb25zQmVoaW5kOworICAgICAgICAgICAg dG90YWxSZXZpc2lvbnNCZWhpbmQgKz0gaW50ZXJuYWxUcmFjLmNvbW1pdHNPbkJyYW5jaChxdWV1 ZS5icmFuY2guaW50ZXJuYWwsIGZ1bmN0aW9uKGNvbW1pdCkgeyByZXR1cm4gY29tbWl0LnJldmlz aW9uTnVtYmVyID4gbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uOyB9 KS5sZW5ndGg7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXRvdGFsUmV2aXNpb25zQmVoaW5k KQpAQCAtMTE1LDcgKzExNyw3IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgbmV3IFBvcG92ZXJUcmFja2VyKG1lc3NhZ2VFbGVtZW50LCB0aGlzLl9wcmVzZW50UG9w b3ZlckZvclBlbmRpbmdDb21taXRzLmJpbmQodGhpcyksIHF1ZXVlKTsKICAgICB9LAogCi0gICAg X3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlOiBmdW5jdGlvbih0cmFjLCBmaXJzdFJldmlzaW9u TnVtYmVyLCBsYXN0UmV2aXNpb25OdW1iZXIpCisgICAgX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJh bmdlOiBmdW5jdGlvbih0cmFjLCBicmFuY2gsIGZpcnN0UmV2aXNpb25OdW1iZXIsIGxhc3RSZXZp c2lvbk51bWJlcikKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGxpbmVGb3JDb21taXQodHJhYywg Y29tbWl0KQogICAgICAgICB7CkBAIC0xNDIsMjIgKzE0NCwxNCBAQCBCdWlsZGJvdFF1ZXVlVmll dy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9CiAK LSAgICAgICAgLy8gVGhpcyBmdW5jdGlvbiBvbmx5IGFkZHMgbGluZXMgYWJvdXQgY29tbWl0cyB0 aGF0IHRoZSB0cmFjIG9iamVjdCBrbm93cyBhYm91dC4KLSAgICAgICAgLy8gQWx0ZXJuYXRpdmVs eSwgaXQgY291bGQgYWRkIGxpbmtzIHdpdGhvdXQgaW5mbyBhbmQvb3IgdHJpZ2dlciBsb2FkaW5n IGFkZGl0aW9uYWwKLSAgICAgICAgLy8gZGF0YSwgYnV0IHRoaXMgcHJvYmFibHkgZG9lc24ndCBt YXR0ZXIgZm9yIERhc2hib2FyZCB1c2UuCi0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAg ICAgZm9yICh2YXIgaSA9IHRyYWMucmVjb3JkZWRDb21taXRzLmxlbmd0aCAtIDE7IGkgPj0gMDsg LS1pKSB7Ci0gICAgICAgICAgICB2YXIgY29tbWl0ID0gdHJhYy5yZWNvcmRlZENvbW1pdHNbaV07 Ci0gICAgICAgICAgICBpZiAoY29tbWl0LnJldmlzaW9uTnVtYmVyID4gbGFzdFJldmlzaW9uTnVt YmVyKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgICAgICBpZiAoY29tbWl0 LnJldmlzaW9uTnVtYmVyIDwgZmlyc3RSZXZpc2lvbk51bWJlcikKLSAgICAgICAgICAgICAgICBi cmVhazsKLQotICAgICAgICAgICAgcmVzdWx0LnB1c2gobGluZUZvckNvbW1pdCh0cmFjLCBjb21t aXQpKTsKLSAgICAgICAgfQorICAgICAgICBjb25zb2xlLmFzc2VydCh0cmFjLm9sZGVzdFJlY29y ZGVkUmV2aXNpb25OdW1iZXIgPj0gZmlyc3RSZXZpc2lvbk51bWJlcik7CiAKLSAgICAgICAgcmV0 dXJuIHJlc3VsdDsKKyAgICAgICAgLy8gRklYTUU6IFRvIGJlIDEwMCUgY29ycmVjdCwgd2Ugc2hv dWxkIGFsc28gZmlsdGVyIG91dCBjaGFuZ2VzIHRoYXQgYXJlIGlnbm9yZWQgYnkKKyAgICAgICAg Ly8gdGhlIHF1ZXVlLCBzZWUgX3Nob3VsZF9maWxlX3RyaWdnZXJfYnVpbGQgaW4gd2tidWlsZC5w eS4KKyAgICAgICAgdmFyIGNvbW1pdHMgPSB0cmFjLmNvbW1pdHNPbkJyYW5jaChicmFuY2gsIGZ1 bmN0aW9uKGNvbW1pdCkgeyByZXR1cm4gY29tbWl0LnJldmlzaW9uTnVtYmVyID49IGZpcnN0UmV2 aXNpb25OdW1iZXIgJiYgY29tbWl0LnJldmlzaW9uTnVtYmVyIDw9IGxhc3RSZXZpc2lvbk51bWJl cjsgfSk7CisgICAgICAgIHJldHVybiBjb21taXRzLm1hcChmdW5jdGlvbihjb21taXQpIHsKKyAg ICAgICAgICAgIHJldHVybiBsaW5lRm9yQ29tbWl0KHRyYWMsIGNvbW1pdCk7CisgICAgICAgIH0s IHRoaXMpLnJldmVyc2UoKTsKICAgICB9LAogCiAgICAgX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGlu Z0NvbW1pdHM6IGZ1bmN0aW9uKGVsZW1lbnQsIHBvcG92ZXIsIHF1ZXVlKQpAQCAtMTY5LDEzICsx NjMsMTMgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY29u dGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICBjb250ZW50LmNs YXNzTmFtZSA9ICJjb21taXQtaGlzdG9yeS1wb3BvdmVyIjsKIAotICAgICAgICB2YXIgbGluZXNG b3JPcGVuU291cmNlID0gdGhpcy5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2Uod2Via2l0VHJh YywgbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb24gKyAxLCB3ZWJr aXRUcmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIpOworICAgICAgICB2YXIgbGluZXNG b3JPcGVuU291cmNlID0gdGhpcy5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2Uod2Via2l0VHJh YywgcXVldWUuYnJhbmNoLm9wZW5Tb3VyY2UsIGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ub3Bl blNvdXJjZVJldmlzaW9uICsgMSwgd2Via2l0VHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVt YmVyKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgIT0gbGluZXNGb3JPcGVuU291cmNlLmxl bmd0aDsgKytpKQogICAgICAgICAgICAgY29udGVudC5hcHBlbmRDaGlsZChsaW5lc0Zvck9wZW5T b3VyY2VbaV0pOwogCiAgICAgICAgIHZhciBsaW5lc0ZvckludGVybmFsID0gW107CiAgICAgICAg IGlmIChsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLmludGVybmFsUmV2aXNpb24gJiYgaW50ZXJu YWxUcmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIpCi0gICAgICAgICAgICB2YXIgbGlu ZXNGb3JJbnRlcm5hbCA9IHRoaXMuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKGludGVybmFs VHJhYywgbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uICsgMSwgaW50 ZXJuYWxUcmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIpOworICAgICAgICAgICAgdmFy IGxpbmVzRm9ySW50ZXJuYWwgPSB0aGlzLl9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5nZShpbnRl cm5hbFRyYWMsIHF1ZXVlLmJyYW5jaC5pbnRlcm5hbCwgbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlv bi5pbnRlcm5hbFJldmlzaW9uICsgMSwgaW50ZXJuYWxUcmFjLmxhdGVzdFJlY29yZGVkUmV2aXNp b25OdW1iZXIpOwogCiAgICAgICAgIGlmIChsaW5lc0Zvck9wZW5Tb3VyY2UubGVuZ3RoICYmIGxp bmVzRm9ySW50ZXJuYWwubGVuZ3RoKQogICAgICAgICAgICAgdGhpcy5fYWRkRGl2aWRlclRvUG9w b3Zlcihjb250ZW50KTsKQEAgLTE5NSw3ICsxODksOCBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7CiAgICAgICAgIGNvbnRlbnQuY2xhc3NOYW1lID0gImNvbW1pdC1oaXN0b3J5LXBvcG92 ZXIiOwogCi0gICAgICAgIHZhciBsaW5lc0ZvckNvbW1pdHMgPSB0aGlzLl9wb3BvdmVyTGluZXNG b3JDb21taXRSYW5nZShjb250ZXh0LnRyYWMsIGNvbnRleHQuZmlyc3RSZXZpc2lvbiwgY29udGV4 dC5sYXN0UmV2aXNpb24pOworICAgICAgICAvLyBGSVhNRTogTm90aGluZyBndWFyYW50ZWVzIHRo YXQgVHJhYyBoYXMgaGlzdG9yaWNhbCBkYXRhIGZvciB0aGVzZSByZXZpc2lvbnMuCisgICAgICAg IHZhciBsaW5lc0ZvckNvbW1pdHMgPSB0aGlzLl9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5nZShj b250ZXh0LnRyYWMsIGNvbnRleHQuYnJhbmNoLCBjb250ZXh0LmZpcnN0UmV2aXNpb24sIGNvbnRl eHQubGFzdFJldmlzaW9uKTsKICAgICAgICAgaWYgKCFsaW5lc0ZvckNvbW1pdHMubGVuZ3RoKQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC0yMTUsNyArMjEwLDcgQEAgQnVpbGRib3RR dWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LAogCi0g ICAgX3JldmlzaW9uUG9wb3ZlckNvbnRlbnRGb3JJdGVyYXRpb246IGZ1bmN0aW9uKGl0ZXJhdGlv biwgcHJldmlvdXNJdGVyYXRpb24sIGludGVybmFsKQorICAgIF9yZXZpc2lvbkNvbnRlbnRXaXRo UG9wb3ZlckZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uLCBwcmV2aW91c0l0ZXJhdGlv biwgaW50ZXJuYWwpCiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKICAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9ICJyIiArIChp bnRlcm5hbCA/IGl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uIDogaXRlcmF0aW9uLm9wZW5Tb3Vy Y2VSZXZpc2lvbik7CkBAIC0yMjQsNiArMjE5LDcgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90 eXBlID0gewogICAgICAgICBpZiAocHJldmlvdXNJdGVyYXRpb24pIHsKICAgICAgICAgICAgIHZh ciBjb250ZXh0ID0gewogICAgICAgICAgICAgICAgIHRyYWM6IGludGVybmFsID8gaW50ZXJuYWxU cmFjIDogd2Via2l0VHJhYywKKyAgICAgICAgICAgICAgICBicmFuY2g6IGludGVybmFsID8gaXRl cmF0aW9uLnF1ZXVlLmJyYW5jaC5pbnRlcm5hbCA6IGl0ZXJhdGlvbi5xdWV1ZS5icmFuY2gub3Bl blNvdXJjZSwKICAgICAgICAgICAgICAgICBmaXJzdFJldmlzaW9uOiAoaW50ZXJuYWwgPyBwcmV2 aW91c0l0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uIDogcHJldmlvdXNJdGVyYXRpb24ub3BlblNv dXJjZVJldmlzaW9uKSArIDEsCiAgICAgICAgICAgICAgICAgbGFzdFJldmlzaW9uOiBpbnRlcm5h bCA/IGl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uIDogaXRlcmF0aW9uLm9wZW5Tb3VyY2VSZXZp c2lvbgogICAgICAgICAgICAgfTsKQEAgLTI3MiwxMiArMjY4LDEyIEBAIEJ1aWxkYm90UXVldWVW aWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGl0ZXJhdGlv bi5vcGVuU291cmNlUmV2aXNpb24pOwogCi0gICAgICAgIHZhciBvcGVuU291cmNlQ29udGVudCA9 IHRoaXMuX3JldmlzaW9uUG9wb3ZlckNvbnRlbnRGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2 aW91c0Rpc3BsYXllZEl0ZXJhdGlvbik7CisgICAgICAgIHZhciBvcGVuU291cmNlQ29udGVudCA9 IHRoaXMuX3JldmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uKGl0ZXJhdGlvbiwg cHJldmlvdXNEaXNwbGF5ZWRJdGVyYXRpb24pOwogCiAgICAgICAgIGlmICghaXRlcmF0aW9uLmlu dGVybmFsUmV2aXNpb24pCiAgICAgICAgICAgICByZXR1cm4gb3BlblNvdXJjZUNvbnRlbnQ7CiAK LSAgICAgICAgdmFyIGludGVybmFsQ29udGVudCA9IHRoaXMuX3JldmlzaW9uUG9wb3ZlckNvbnRl bnRGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlvbiwgdHJ1 ZSk7CisgICAgICAgIHZhciBpbnRlcm5hbENvbnRlbnQgPSB0aGlzLl9yZXZpc2lvbkNvbnRlbnRX aXRoUG9wb3ZlckZvckl0ZXJhdGlvbihpdGVyYXRpb24sIHByZXZpb3VzRGlzcGxheWVkSXRlcmF0 aW9uLCB0cnVlKTsKIAogICAgICAgICB2YXIgZnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1 bWVudEZyYWdtZW50KCk7CiAgICAgICAgIGZyYWdtZW50LmFwcGVuZENoaWxkKG9wZW5Tb3VyY2VD b250ZW50KTsKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1RyYWMuanMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvVHJhYy5qcwkocmV2aXNpb24gMTgwNDc3KQorKysgVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvVHJhYy5qcwkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksMTMg QEAgVHJhYy5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFRyYWMsCiAgICAgX19wcm90 b19fOiBCYXNlT2JqZWN0LnByb3RvdHlwZSwKIAorICAgIGdldCBvbGRlc3RSZWNvcmRlZFJldmlz aW9uTnVtYmVyKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5yZWNvcmRlZENvbW1pdHMubGVu Z3RoKQorICAgICAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDsKKyAgICAgICAgcmV0dXJuIHRoaXMu cmVjb3JkZWRDb21taXRzWzBdLnJldmlzaW9uTnVtYmVyOworICAgIH0sCisKICAgICBnZXQgbGF0 ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMucmVj b3JkZWRDb21taXRzLmxlbmd0aCkKQEAgLTU2LDYgKzYzLDEzIEBAIFRyYWMucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gdGhpcy5yZWNvcmRlZENvbW1pdHNbdGhpcy5yZWNvcmRlZENvbW1p dHMubGVuZ3RoIC0gMV0ucmV2aXNpb25OdW1iZXI7CiAgICAgfSwKIAorICAgIGNvbW1pdHNPbkJy YW5jaDogZnVuY3Rpb24oYnJhbmNoLCBmaWx0ZXIpCisgICAgeworICAgICAgICByZXR1cm4gdGhp cy5yZWNvcmRlZENvbW1pdHMuZmlsdGVyKGZ1bmN0aW9uKGNvbW1pdCkgeworICAgICAgICAgICAg cmV0dXJuICghY29tbWl0LmNvbnRhaW5zQnJhbmNoTG9jYXRpb24gfHwgY29tbWl0LmJyYW5jaCA9 PT0gYnJhbmNoKSAmJiBmaWx0ZXIoY29tbWl0KTsKKyAgICAgICAgfSk7CisgICAgfSwKKwogICAg IHJldmlzaW9uVVJMOiBmdW5jdGlvbihyZXZpc2lvbikKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLmJhc2VVUkwgKyAiY2hhbmdlc2V0LyIgKyBlbmNvZGVVUklDb21wb25lbnQocmV2aXNpb24p OwpAQCAtNjMsMTQgKzc3LDYgQEAgVHJhYy5wcm90b3R5cGUgPSB7CiAKICAgICBfeG1sVGltZWxp bmVVUkw6IGZ1bmN0aW9uKGZyb21EYXRlLCB0b0RhdGUpCiAgICAgewotICAgICAgICBpZiAodHlw ZW9mIGZyb21EYXRlID09PSAidW5kZWZpbmVkIikgewotICAgICAgICAgICAgZnJvbURhdGUgPSBu ZXcgRGF0ZSgpOwotICAgICAgICAgICAgdG9EYXRlID0gbmV3IERhdGUoZnJvbURhdGUpOwotICAg ICAgICAgICAgLy8gQnkgZGVmYXVsdCwgZ2V0IGF0IGxlYXN0IG9uZSBmdWxsIGRheSBvZiBjaGFu Z2VzZXRzLCBhcyB0aGUgY3VycmVudCBkYXkgbWF5IGhhdmUgb25seSBiZWd1bi4KLSAgICAgICAg ICAgIGZyb21EYXRlLnNldERhdGUoZnJvbURhdGUuZ2V0RGF0ZSgpIC0gMSk7Ci0gICAgICAgIH0g ZWxzZSBpZiAodHlwZW9mIHRvRGF0ZSA9PT0gInVuZGVmaW5lZCIpCi0gICAgICAgICAgICB0b0Rh dGUgPSBmcm9tRGF0ZTsKLQogICAgICAgICBjb25zb2xlLmFzc2VydChmcm9tRGF0ZSA8PSB0b0Rh dGUpOwogCiAgICAgICAgIHZhciBmcm9tRGF5ID0gbmV3IERhdGUoZnJvbURhdGUuZ2V0RnVsbFll YXIoKSwgZnJvbURhdGUuZ2V0TW9udGgoKSwgZnJvbURhdGUuZ2V0RGF0ZSgpKTsKQEAgLTE0NCw4 ICsxNTAsOSBAQCBUcmFjLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGVsc2UgaWYgKGxvY2F0 aW9uLnN0YXJ0c1dpdGgoInN1Ym1pc3Npb25zLyIpKQogICAgICAgICAgICAgICAgIDsgLy8gVGhl c2UgY2hhbmdlcyBhcmUgbmV2ZXIgcmVsZXZhbnQgdG8gdGhlIGRhc2hib2FyZC4KICAgICAgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgICAgIC8vIHJlc3VsdC5jb250YWluc0JyYW5jaExvY2F0 aW9uIHJlbWFpbnMgdHJ1ZSwgYmVjYXVzZSB0aGlzIGNvbW1pdCBkb2VzCisgICAgICAgICAgICAg ICAgLy8gbm90IG1hdGNoIGFueSBleHBsaWNpdGx5IHNwZWNpZmllZCBicmFuY2hlcy4KICAgICAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSk7Ci0gICAgICAgICAgICAgICAgcmVzdWx0 LmNvbnRhaW5zQnJhbmNoTG9jYXRpb24gPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQogCkBAIC0xOTUsMTQgKzIwMiw1MiBAQCBUcmFjLnByb3RvdHlwZSA9IHsKICAgICAgICAgfS5i aW5kKHRoaXMpLCB0aGlzLl9uZWVkc0F1dGhlbnRpY2F0aW9uID8geyB3aXRoQ3JlZGVudGlhbHM6 IHRydWUgfSA6IHt9KTsKICAgICB9LAogCi0gICAgdXBkYXRlOiBmdW5jdGlvbigpCisgICAgX3Vw ZGF0ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgbG9hZFhNTCh0aGlzLl94bWxUaW1lbGlu ZVVSTCgpLCB0aGlzLl9sb2FkZWQuYmluZCh0aGlzKSwgdGhpcy5fbmVlZHNBdXRoZW50aWNhdGlv biA/IHsgd2l0aENyZWRlbnRpYWxzOiB0cnVlIH0gOiB7fSk7CisgICAgICAgIHZhciBmcm9tRGF0 ZSA9IG5ldyBEYXRlKHRoaXMuX2xhdGVzdExvYWRlZERhdGUpOworICAgICAgICB2YXIgdG9EYXRl ID0gbmV3IERhdGUoKTsKKworICAgICAgICB0aGlzLl9sYXRlc3RMb2FkZWREYXRlID0gdG9EYXRl OworCisgICAgICAgIGxvYWRYTUwodGhpcy5feG1sVGltZWxpbmVVUkwoZnJvbURhdGUsIHRvRGF0 ZSksIHRoaXMuX2xvYWRlZC5iaW5kKHRoaXMpLCB0aGlzLl9uZWVkc0F1dGhlbnRpY2F0aW9uID8g eyB3aXRoQ3JlZGVudGlhbHM6IHRydWUgfSA6IHt9KTsKICAgICB9LAogCiAgICAgc3RhcnRQZXJp b2RpY1VwZGF0ZXM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMudXBkYXRlKCk7Ci0g ICAgICAgIHRoaXMudXBkYXRlVGltZXIgPSBzZXRJbnRlcnZhbCh0aGlzLnVwZGF0ZS5iaW5kKHRo aXMpLCBUcmFjLlVwZGF0ZUludGVydmFsKTsKLSAgICB9CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCF0aGlzLl9vbGRlc3RIaXN0b3JpY2FsRGF0ZSk7CisKKyAgICAgICAgdmFyIHRvZGF5ID0gbmV3 IERhdGUoKTsKKworICAgICAgICB0aGlzLl9vbGRlc3RIaXN0b3JpY2FsRGF0ZSA9IHRvZGF5Owor ICAgICAgICB0aGlzLl9sYXRlc3RMb2FkZWREYXRlID0gdG9kYXk7CisKKyAgICAgICAgdGhpcy5f bG9hZGluZ0hpc3RvcmljYWxEYXRhID0gdHJ1ZTsKKyAgICAgICAgbG9hZFhNTCh0aGlzLl94bWxU aW1lbGluZVVSTCh0b2RheSwgdG9kYXkpLCBmdW5jdGlvbihkYXRhRG9jdW1lbnQpIHsKKyAgICAg ICAgICAgIHRoaXMuX2xvYWRpbmdIaXN0b3JpY2FsRGF0YSA9IGZhbHNlOworICAgICAgICAgICAg dGhpcy5fbG9hZGVkKGRhdGFEb2N1bWVudCk7CisgICAgICAgIH0uYmluZCh0aGlzKSwgdGhpcy5f bmVlZHNBdXRoZW50aWNhdGlvbiA/IHsgd2l0aENyZWRlbnRpYWxzOiB0cnVlIH0gOiB7fSk7CisK KyAgICAgICAgdGhpcy51cGRhdGVUaW1lciA9IHNldEludGVydmFsKHRoaXMuX3VwZGF0ZS5iaW5k KHRoaXMpLCBUcmFjLlVwZGF0ZUludGVydmFsKTsKKyAgICB9LAorCisgICAgbG9hZE1vcmVIaXN0 b3JpY2FsRGF0YTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhp cy5fb2xkZXN0SGlzdG9yaWNhbERhdGUpOworCisgICAgICAgIGlmICh0aGlzLl9sb2FkaW5nSGlz dG9yaWNhbERhdGEpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgLy8gTG9hZCBvbmUg bW9yZSBkYXkgb2YgaGlzdG9yaWNhbCBkYXRhLgorICAgICAgICB2YXIgZnJvbURhdGUgPSBuZXcg RGF0ZSh0aGlzLl9vbGRlc3RIaXN0b3JpY2FsRGF0ZSk7CisgICAgICAgIGZyb21EYXRlLnNldERh dGUoZnJvbURhdGUuZ2V0RGF0ZSgpIC0gMSk7CisgICAgICAgIHZhciB0b0RhdGUgPSBuZXcgRGF0 ZShmcm9tRGF0ZSk7CisKKyAgICAgICAgdGhpcy5fb2xkZXN0SGlzdG9yaWNhbERhdGUgPSBmcm9t RGF0ZTsKKworICAgICAgICB0aGlzLl9sb2FkaW5nSGlzdG9yaWNhbERhdGEgPSB0cnVlOworICAg ICAgICBsb2FkWE1MKHRoaXMuX3htbFRpbWVsaW5lVVJMKGZyb21EYXRlLCB0b0RhdGUpLCBmdW5j dGlvbihkYXRhRG9jdW1lbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX2xvYWRpbmdIaXN0b3JpY2Fs RGF0YSA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fbG9hZGVkKGRhdGFEb2N1bWVudCk7Cisg ICAgICAgIH0uYmluZCh0aGlzKSwgdGhpcy5fbmVlZHNBdXRoZW50aWNhdGlvbiA/IHsgd2l0aENy ZWRlbnRpYWxzOiB0cnVlIH0gOiB7fSk7CisgICAgfSwKIH07Cg==