72703 2011-11-18 01:44:52 -0800 ChangeLog should be able to parse annotated changelogs 2011-12-02 20:59:31 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72243 1 rniwa rniwa abarth eric ojan webkit.review.bot oldest_to_newest 505604 0 rniwa 2011-11-18 01:44:52 -0800 In order to parse change logs from different directories and correlate entries, we need a way to determine which change log entry corresponds to which revision. 505620 1 115770 rniwa 2011-11-18 02:12:31 -0800 Created attachment 115770 Patch 505622 2 webkit.review.bot 2011-11-18 02:16:08 -0800 Attachment 115770 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:256: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:258: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:260: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:264: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:266: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:272: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:274: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:277: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:279: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:282: trailing whitespace [pep8/W291] [5] Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py:286: trailing whitespace [pep8/W291] [5] Total errors found: 11 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 505623 3 rniwa 2011-11-18 02:18:50 -0800 (In reply to comment #2) > If any of these errors are false positives, please file a bug against check-webkit-style. Indeed this is a false positive. The trailing space is required for svn blame format. 505629 4 rniwa 2011-11-18 02:23:04 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=72706 for the style checker. 505957 5 rniwa 2011-11-18 12:06:00 -0800 Ping reviewers. 511959 6 115770 eric 2011-11-30 11:37:14 -0800 Comment on attachment 115770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115770&action=review Looks good. > Tools/Scripts/webkitpy/common/checkout/changelog.py:287 > + most_probable_revision = max(revisions_in_entry, key=revisions_in_entry.__getitem__) if revisions_in_entry else None I'm not sure I understand this? Also, isn't there a getitem helper used for this sort of thing? Object.getitem orsoemthing? Maybe I'm thinking of operator.itemgetter? 512169 7 115770 levin 2011-11-30 15:07:32 -0800 Comment on attachment 115770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115770&action=review > Tools/Scripts/webkitpy/common/checkout/changelog.py:247 > + def _sepearate_revision_and_line(line): fyi, typo: sepearate 514400 8 rniwa 2011-12-02 20:53:43 -0800 (In reply to comment #6) > (From update of attachment 115770 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115770&action=review > > Looks good. > > > Tools/Scripts/webkitpy/common/checkout/changelog.py:287 > > + most_probable_revision = max(revisions_in_entry, key=revisions_in_entry.__getitem__) if revisions_in_entry else None > > I'm not sure I understand this? Also, isn't there a getitem helper used for this sort of thing? Object.getitem orsoemthing? Maybe I'm thinking of operator.itemgetter? Here, I'm taking the revision that appear most frequently as the guess. 514401 9 rniwa 2011-12-02 20:54:08 -0800 (In reply to comment #7) > (From update of attachment 115770 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115770&action=review > > > Tools/Scripts/webkitpy/common/checkout/changelog.py:247 > > + def _sepearate_revision_and_line(line): > > fyi, typo: sepearate Will fix. 514402 10 rniwa 2011-12-02 20:58:43 -0800 Thanks for the review. Landing it now. 514403 11 rniwa 2011-12-02 20:59:31 -0800 Committed r101901: <http://trac.webkit.org/changeset/101901> 115770 2011-11-18 02:12:31 -0800 2011-11-30 15:07:31 -0800 Patch bug-72703-20111118021229.patch text/plain 10793 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmI2MTliYTA1OTdjNWJkYThjNjY1ZTQ1MWIwMjA5MTYx OWRhZTA3OC4uMzBlNzUxMDlkMzIxOTUwZGIxN2VhYjRlYTk3ZGZmZDJmYjQwYmNjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDExLTExLTE4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIENoYW5nZUxvZyBzaG91bGQgYmUgYWJsZSB0byBwYXJzZSBhbm5vdGF0ZWQgY2hhbmdlbG9n cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI3MDMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHBh cnNlX2VudHJpZXNfZnJvbV9maWxlIGF3YXJlIG9mIHN2biBibGFtZSBhbm5vdGF0aW9uIHN1Y2gg YXMgIjEwMDAwMCBvc3N5QHdlYmtpdC5vcmcgIiwKKyAgICAgICAgYW5kIGV4dHJhY3QgdGhlIHJl dmlzaW9uIG51bWJlciBmb3IgZWFjaCBlbnRyeS4KKworICAgICAgICBBbHNvIGFkZCBhIHN1cHBv cnQgdG8gZXh0cmFjdCAic3ZuIGJsYW1lIiByZXN1bHQgZnJvbSBzdm4vZ2l0IGNoZWNrb3V0IHRv IHNjbSBjbGFzc2VzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvY2hhbmdlbG9nLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L2NoYW5nZWxvZ191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3N2bi5weToKKwogMjAxMS0xMS0xNyAgUmFwaGFlbCBLdWJvIGRhIENv c3RhICA8a3Vib0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBbRUZMXSBDbGVhbiB1cCB0aGUg dXNlIG9mIERBVEFfRElSIGluIHRoZSBidWlsZHN5c3RlbQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5CmluZGV4IDJmNmMzM2I4MDNl NzI4Y2FiMzk2OWUwYjllNTBjYmMyYjRhOTZjNDIuLjAxZTEyN2QxODdjMjYzMThjY2JhNzZmMmFk MDY2ODczZWJhZjY0YWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2NoYW5nZWxvZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9jaGFuZ2Vsb2cucHkKQEAgLTExMCw5ICsxMTAsMTAgQEAgY2xhc3MgQ2hhbmdl TG9nRW50cnkob2JqZWN0KToKICAgICAjIGUuZy4gZ2l0LXN2bi1pZDogaHR0cDovL3N2bi53ZWJr aXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDk2MTYxIDI2OGY0NWNjLWNkMDktMDQxMC1h YjNjLWQ1MjY5MWI0ZGJmYwogICAgIHN2bl9pZF9yZWdleHAgPSByJ2dpdC1zdm4taWQ6IGh0dHA6 Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVua0AoP1A8c3ZuaWQ+XGQrKSAn CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgY29udGVudHMsIGNvbW1pdHRlcl9saXN0PUNvbW1p dHRlckxpc3QoKSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbnRlbnRzLCBjb21taXR0ZXJf bGlzdD1Db21taXR0ZXJMaXN0KCksIHJldmlzaW9uPU5vbmUpOgogICAgICAgICBzZWxmLl9jb250 ZW50cyA9IGNvbnRlbnRzCiAgICAgICAgIHNlbGYuX2NvbW1pdHRlcl9saXN0ID0gY29tbWl0dGVy X2xpc3QKKyAgICAgICAgc2VsZi5fcmV2aXNpb24gPSByZXZpc2lvbgogICAgICAgICBzZWxmLl9w YXJzZV9lbnRyeSgpCiAKICAgICBAc3RhdGljbWV0aG9kCkBAIC0xNjcsNiArMTY4LDkgQEAgY2xh c3MgQ2hhbmdlTG9nRW50cnkob2JqZWN0KToKIAogICAgICAgICBzZWxmLl90b3VjaGVkX2ZpbGVz ID0gcmUuZmluZGFsbChzZWxmLnRvdWNoZWRfZmlsZXNfcmVnZXhwLCBzZWxmLl9jb250ZW50cywg cmUuTVVMVElMSU5FKQogCisgICAgZGVmIHJldmlzaW9uKHNlbGYpOgorICAgICAgICByZXR1cm4g c2VsZi5fcmV2aXNpb24KKwogICAgIGRlZiBhdXRob3JfbmFtZShzZWxmKToKICAgICAgICAgcmV0 dXJuIHNlbGYuX2F1dGhvcl9uYW1lCiAKQEAgLTIzNyw2ICsyNDEsMTUgQEAgY2xhc3MgQ2hhbmdl TG9nKG9iamVjdCk6CiAgICAgICAgICAgICBlbnRyeV9saW5lcy5hcHBlbmQobGluZSkKICAgICAg ICAgcmV0dXJuIE5vbmUgIyBXZSBuZXZlciBmb3VuZCBhIGRhdGUgbGluZSEKIAorICAgIHN2bl9i bGFtZV9yZWdleHAgPSByZS5jb21waWxlKHInXihccyooP1A8cmV2aXNpb24+XGQrKSBbXiBdKylc cyg/UDxsaW5lPi4qP1xuKScpCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9zZXBlYXJh dGVfcmV2aXNpb25fYW5kX2xpbmUobGluZSk6CisgICAgICAgIG1hdGNoID0gQ2hhbmdlTG9nLnN2 bl9ibGFtZV9yZWdleHAubWF0Y2gobGluZSkKKyAgICAgICAgaWYgbm90IG1hdGNoOgorICAgICAg ICAgICAgcmV0dXJuIE5vbmUsIGxpbmUKKyAgICAgICAgcmV0dXJuIGludChtYXRjaC5ncm91cCgn cmV2aXNpb24nKSksIG1hdGNoLmdyb3VwKCdsaW5lJykKKwogICAgIEBzdGF0aWNtZXRob2QKICAg ICBkZWYgcGFyc2VfZW50cmllc19mcm9tX2ZpbGUoY2hhbmdlbG9nX2ZpbGUpOgogICAgICAgICAi IiJjaGFuZ2Vsb2dfZmlsZSBtdXN0IGJlIGEgZmlsZS1saWtlIG9iamVjdCB3aGljaCByZXR1cm5z CkBAIC0yNDQsMjAgKzI1NywzNSBAQCBjbGFzcyBDaGFuZ2VMb2cob2JqZWN0KToKICAgICAgICAg dG8gcGFzcyBmaWxlIG9iamVjdHMgdG8gdGhpcyBjbGFzcy4iIiIKICAgICAgICAgZGF0ZV9saW5l X3JlZ2V4cCA9IHJlLmNvbXBpbGUoQ2hhbmdlTG9nRW50cnkuZGF0ZV9saW5lX3JlZ2V4cCkKICAg ICAgICAgcm9sbGVkX292ZXJfcmVnZXhwID0gcmUuY29tcGlsZShDaGFuZ2VMb2dFbnRyeS5yb2xs ZWRfb3Zlcl9yZWdleHApCi0gICAgICAgIGVudHJ5X2xpbmVzID0gW10KKwogICAgICAgICAjIFRo ZSBmaXJzdCBsaW5lIHNob3VsZCBiZSBhIGRhdGUgbGluZS4KLSAgICAgICAgZmlyc3RfbGluZSA9 IGNoYW5nZWxvZ19maWxlLnJlYWRsaW5lKCkKKyAgICAgICAgcmV2aXNpb24sIGZpcnN0X2xpbmUg PSBDaGFuZ2VMb2cuX3NlcGVhcmF0ZV9yZXZpc2lvbl9hbmRfbGluZShjaGFuZ2Vsb2dfZmlsZS5y ZWFkbGluZSgpKQogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShmaXJzdF9saW5lLCB1bmljb2Rl KSkKLSAgICAgICAgaWYgbm90IGRhdGVfbGluZV9yZWdleHAubWF0Y2goZmlyc3RfbGluZSk6Cisg ICAgICAgIGlmIG5vdCBkYXRlX2xpbmVfcmVnZXhwLm1hdGNoKENoYW5nZUxvZy5zdm5fYmxhbWVf cmVnZXhwLnN1YignJywgZmlyc3RfbGluZSkpOgogICAgICAgICAgICAgcmFpc2UgU3RvcEl0ZXJh dGlvbgotICAgICAgICBlbnRyeV9saW5lcy5hcHBlbmQoZmlyc3RfbGluZSkKIAorICAgICAgICBl bnRyeV9saW5lcyA9IFtmaXJzdF9saW5lXQorICAgICAgICByZXZpc2lvbnNfaW5fZW50cnkgPSB7 cmV2aXNpb246IDF9IGlmIHJldmlzaW9uICE9IE5vbmUgZWxzZSBOb25lCiAgICAgICAgIGZvciBs aW5lIGluIGNoYW5nZWxvZ19maWxlOgotICAgICAgICAgICAgaWYgZGF0ZV9saW5lX3JlZ2V4cC5t YXRjaChsaW5lKSBvciByb2xsZWRfb3Zlcl9yZWdleHAubWF0Y2gobGluZSk6CisgICAgICAgICAg ICBpZiByZXZpc2lvbnNfaW5fZW50cnk6CisgICAgICAgICAgICAgICAgcmV2aXNpb24sIGxpbmUg PSBDaGFuZ2VMb2cuX3NlcGVhcmF0ZV9yZXZpc2lvbl9hbmRfbGluZShsaW5lKQorCisgICAgICAg ICAgICBpZiByb2xsZWRfb3Zlcl9yZWdleHAubWF0Y2gobGluZSk6CisgICAgICAgICAgICAgICAg YnJlYWsKKworICAgICAgICAgICAgaWYgZGF0ZV9saW5lX3JlZ2V4cC5tYXRjaChsaW5lKToKKyAg ICAgICAgICAgICAgICBtb3N0X3Byb2JhYmxlX3JldmlzaW9uID0gbWF4KHJldmlzaW9uc19pbl9l bnRyeSwga2V5PXJldmlzaW9uc19pbl9lbnRyeS5fX2dldGl0ZW1fXykgaWYgcmV2aXNpb25zX2lu X2VudHJ5IGVsc2UgTm9uZQogICAgICAgICAgICAgICAgICMgUmVtb3ZlIHRoZSBleHRyYSBuZXds aW5lIGF0IHRoZSBlbmQKLSAgICAgICAgICAgICAgICB5aWVsZCBDaGFuZ2VMb2dFbnRyeSgnJy5q b2luKGVudHJ5X2xpbmVzWzotMV0pKQorICAgICAgICAgICAgICAgIHlpZWxkIENoYW5nZUxvZ0Vu dHJ5KCcnLmpvaW4oZW50cnlfbGluZXNbOi0xXSksIHJldmlzaW9uPW1vc3RfcHJvYmFibGVfcmV2 aXNpb24pCiAgICAgICAgICAgICAgICAgZW50cnlfbGluZXMgPSBbXQorICAgICAgICAgICAgICAg IHJldmlzaW9uc19pbl9lbnRyeSA9IHtyZXZpc2lvbjogMH0KKwogICAgICAgICAgICAgZW50cnlf bGluZXMuYXBwZW5kKGxpbmUpCisgICAgICAgICAgICBpZiByZXZpc2lvbnNfaW5fZW50cnk6Cisg ICAgICAgICAgICAgICAgcmV2aXNpb25zX2luX2VudHJ5W3JldmlzaW9uXSA9IHJldmlzaW9uc19p bl9lbnRyeS5nZXQocmV2aXNpb24sIDApICsgMQorCisgICAgICAgIG1vc3RfcHJvYmFibGVfcmV2 aXNpb24gPSBtYXgocmV2aXNpb25zX2luX2VudHJ5LCBrZXk9cmV2aXNpb25zX2luX2VudHJ5Ll9f Z2V0aXRlbV9fKSBpZiByZXZpc2lvbnNfaW5fZW50cnkgZWxzZSBOb25lCisgICAgICAgIHlpZWxk IENoYW5nZUxvZ0VudHJ5KCcnLmpvaW4oZW50cnlfbGluZXNbOi0xXSksIHJldmlzaW9uPW1vc3Rf cHJvYmFibGVfcmV2aXNpb24pCiAKICAgICBkZWYgbGF0ZXN0X2VudHJ5KHNlbGYpOgogICAgICAg ICAjIENoYW5nZUxvZyBmaWxlcyBhcmUgYWx3YXlzIFVURi04LCB3ZSByZWFkIHRoZW0gaW4gYXMg c3VjaCB0byBzdXBwb3J0IFJldmlld2VycyB3aXRoIHVuaWNvZGUgaW4gdGhlaXIgbmFtZXMuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vs b2dfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9j aGFuZ2Vsb2dfdW5pdHRlc3QucHkKaW5kZXggYjg4MzcwYTdkYjUxZTkwNTcxYzFlNTQ4OTI4NzY5 Njk2MmU4ODljZi4uOTMyYjZjNGU2YWY3MDBmZDI3YmE4ZDZhMGRjM2Q3ZjZkZjI1NjUwOCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9n X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L2NoYW5nZWxvZ191bml0dGVzdC5weQpAQCAtMjUxLDYgKzI1MSw1MiBAQCBjbGFzcyBDaGFuZ2VM b2dUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocGFy c2VkX2VudHJpZXNbN10ucmV2aWV3ZXJfdGV4dCgpLCBOb25lKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhwYXJzZWRfZW50cmllc1s4XS5yZXZpZXdlcl90ZXh0KCksICdEYXJpbiBBZGxlcicp CiAKKyAgICBkZWYgdGVzdF9wYXJzZV9sb2dfZW50cmllc19mcm9tX2Fubm90YXRlZF9maWxlKHNl bGYpOgorICAgICAgICBjaGFuZ2Vsb2dfZmlsZSA9IFN0cmluZ0lPKHUnJycxMDAwMDAgb3NzeUB3 ZWJraXQub3JnIDIwMTEtMTEtMTEgIENzYWJhIE9zenRyb2dvblx1MDBlMWMgIDxvc3N5QHdlYmtp dC5vcmc+CisxMDAwMDAgb3NzeUB3ZWJraXQub3JnIAorMTAwMDAwIG9zc3lAd2Via2l0Lm9yZyAg ICAgICAgIDEwMCwwMDAgISEhCisxMDAwMDAgb3NzeUB3ZWJraXQub3JnIAorMTAwMDAwIG9zc3lA d2Via2l0Lm9yZyAgICAgICAgIFJldmlld2VkIGJ5IFpvbHRhbiBIZXJjemVnLgorMTAwMDAwIG9z c3lAd2Via2l0Lm9yZyAKKzEwMDAwMCBvc3N5QHdlYmtpdC5vcmcgICAgICAgICAqIENoYW5nZUxv ZzogUG9pbnQgb3V0IHJldmlzaW9uIDEwMCwwMDAuCisxMDAwMDAgb3NzeUB3ZWJraXQub3JnCis5 Mzc5OCBhcEBhcHBsZS5jb20gMjAxMS0wOC0yNSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFw cGxlLmNvbT4KKzkzNzk4IGFwQGFwcGxlLmNvbSAKKzkzNzk4IGFwQGFwcGxlLmNvbSAgICAgICAg IEZpeCBidWlsZCB3aGVuIEdDQyA0LjIgaXMgbm90IGluc3RhbGxlZC4KKzkzNzk4IGFwQGFwcGxl LmNvbSAKKzkzNzk4IGFwQGFwcGxlLmNvbSAgICAgICAgICogZ3Rlc3QveGNvZGUvQ29uZmlnL0Nv bXBpbGVyVmVyc2lvbi54Y2NvbmZpZzogQ29waWVkIGZyb20gU291cmNlL1dlYkNvcmUvQ29uZmln dXJhdGlvbnMvQ29tcGlsZXJWZXJzaW9uLnhjY29uZmlnLgorOTM3OTggYXBAYXBwbGUuY29tICAg ICAgICAgKiBndGVzdC94Y29kZS9Db25maWcvR2VuZXJhbC54Y2NvbmZpZzoKKzkzNzk4IGFwQGFw cGxlLmNvbSAgICAgICAgIFVzZSB0aGUgc2FtZSBjb21waWxlciB2ZXJzaW9uIGFzIG90aGVyIHBy b2plY3RzIGRvLgorOTM3OTggYXBAYXBwbGUuY29tCis5OTQ5MSBhbmRyZWFzLmtsaW5nQG5va2lh LmNvbSAyMDExLTExLTAzICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKzk5NDkx IGFuZHJlYXMua2xpbmdAbm9raWEuY29tIAorOTkxOTAgYW5kcmVhcy5rbGluZ0Bub2tpYS5jb20g ICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCwgc2lnaC4KKzk5MTkwIGFuZHJlYXMua2xpbmdA bm9raWEuY29tIAorOTkxOTAgYW5kcmVhcy5rbGluZ0Bub2tpYS5jb20gICAgICAgICAqIGNzcy9D U1NGb250RmFjZVJ1bGUuaDoKKzk5MTkwIGFuZHJlYXMua2xpbmdAbm9raWEuY29tICAgICAgICAg KiBjc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uaDoKKzk5MTkwIGFuZHJlYXMua2xpbmdA bm9raWEuY29tIAorOTkxOTAgYW5kcmVhcy5rbGluZ0Bub2tpYS5jb20gMjAxMS0xMS0wMyAgQW5k cmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+Cis5OTE5MCBhbmRyZWFzLmtsaW5nQG5va2lh LmNvbSAKKzk5MTg3IGFuZHJlYXMua2xpbmdAbm9raWEuY29tICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXgsIG91dC1vZi1saW5lIFN0eWxlU2hlZXQ6OnBhcmVudFN0eWxlU2hlZXQoKQorOTkx ODcgYW5kcmVhcy5rbGluZ0Bub2tpYS5jb20gICAgICAgICBhZ2FpbiBzaW5jZSB0aGVyZSdzIGEg Y3ljbGUgaW4gdGhlIGluY2x1ZGVzIGJldHdlZW4gQ1NTUnVsZS9TdHlsZVNoZWV0LgorOTkxODcg YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20gCis5OTE4NyBhbmRyZWFzLmtsaW5nQG5va2lhLmNvbSAg ICAgICAgICogY3NzL1N0eWxlU2hlZXQuY3BwOgorOTkxODcgYW5kcmVhcy5rbGluZ0Bub2tpYS5j b20gICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldDo6cGFyZW50U3R5bGVTaGVldCk6Cis5OTE4 NyBhbmRyZWFzLmtsaW5nQG5va2lhLmNvbSAgICAgICAgICogY3NzL1N0eWxlU2hlZXQuaDoKKzk5 MTg3IGFuZHJlYXMua2xpbmdAbm9raWEuY29tIAorJycnKQorICAgICAgICBwYXJzZWRfZW50cmll cyA9IGxpc3QoQ2hhbmdlTG9nLnBhcnNlX2VudHJpZXNfZnJvbV9maWxlKGNoYW5nZWxvZ19maWxl KSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocGFyc2VkX2VudHJpZXNbMF0ucmV2aXNpb24o KSwgMTAwMDAwKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwYXJzZWRfZW50cmllc1swXS5y ZXZpZXdlcl90ZXh0KCksICJab2x0YW4gSGVyY3plZyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBhcnNlZF9lbnRyaWVzWzBdLmF1dGhvcl9uYW1lKCksIHUiQ3NhYmEgT3N6dHJvZ29uXHUw MGUxYyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhcnNlZF9lbnRyaWVzWzBdLmF1dGhv cl9lbWFpbCgpLCAib3NzeUB3ZWJraXQub3JnIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo cGFyc2VkX2VudHJpZXNbMV0ucmV2aXNpb24oKSwgOTM3OTgpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHBhcnNlZF9lbnRyaWVzWzFdLmF1dGhvcl9uYW1lKCksICJBbGV4ZXkgUHJvc2t1cnlh a292IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocGFyc2VkX2VudHJpZXNbMl0ucmV2aXNp b24oKSwgOTkxOTApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhcnNlZF9lbnRyaWVzWzJd LmF1dGhvcl9uYW1lKCksICJBbmRyZWFzIEtsaW5nIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocGFyc2VkX2VudHJpZXNbM10ucmV2aXNpb24oKSwgOTkxODcpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBhcnNlZF9lbnRyaWVzWzNdLmF1dGhvcl9uYW1lKCksICJBbmRyZWFzIEtsaW5n IikKKwogICAgIGRlZiBfYXNzZXJ0X3BhcnNlX3Jldmlld2VyX3RleHRfYW5kX2xpc3Qoc2VsZiwg dGV4dCwgZXhwZWN0ZWRfcmV2aWV3ZXJfdGV4dCwgZXhwZWN0ZWRfcmV2aWV3ZXJfdGV4dF9saXN0 PU5vbmUpOgogICAgICAgICByZXZpZXdlcl90ZXh0LCByZXZpZXdlcl90ZXh0X2xpc3QgPSBDaGFu Z2VMb2dFbnRyeS5fcGFyc2VfcmV2aWV3ZXJfdGV4dCh0ZXh0KQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhyZXZpZXdlcl90ZXh0LCBleHBlY3RlZF9yZXZpZXdlcl90ZXh0KQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKaW5kZXggZDQ4 NTU3NGUwOTgxYmEyOTNmZDU0MjVhODgzNzM5Y2I0NzU1ZGZkNi4uN2MyM2JlMDU2NWMzMTkzNzRj M2YxNzdiMTY2MmU5NDBjMDJiZmVkYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC00MDEsNiArNDAxLDkgQEAgY2xhc3MgR2l0 KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIGxhc3Rfc3ZuX2NvbW1pdF9sb2coc2VsZik6 CiAgICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdzdm4nLCAnbG9nJywgJy0tbGltaXQ9 MSddKQogCisgICAgZGVmIHN2bl9ibGFtZShzZWxmLCBwYXRoKToKKyAgICAgICAgcmV0dXJuIHNl bGYucnVuKFsnZ2l0JywgJ3N2bicsICdibGFtZScsIHBhdGhdKQorCiAgICAgIyBHaXQtc3BlY2lm aWMgbWV0aG9kczoKICAgICBkZWYgX2JyYW5jaF9yZWZfZXhpc3RzKHNlbGYsIGJyYW5jaF9yZWYp OgogICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnc2hvdy1yZWYnLCAnLS1xdWlldCcs ICctLXZlcmlmeScsIGJyYW5jaF9yZWZdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpID09IDAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20u cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5Cmlu ZGV4IDAwMWI3ZTQxY2MzMzZhMWQ5Y2M5OTQwODNhMDNmNWY5YmEzNzQ3NjQuLmIwMDQ3MGJiYjI0 YjdmYTg0YjJmYTZmZjc0OTgyMzhhZTJlNzJjYjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtMjE4LDYgKzIxOCw5IEBAIGNs YXNzIFNDTToKICAgICBkZWYgbGFzdF9zdm5fY29tbWl0X2xvZyhzZWxmKToKICAgICAgICAgc2Vs Zi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCisgICAgZGVmIHN2bl9ibGFtZShzZWxmLCBw YXRoKToKKyAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQorCiAgICAgIyBT dWJjbGFzc2VzIG11c3QgaW5kaWNhdGUgaWYgdGhleSBzdXBwb3J0IGxvY2FsIGNvbW1pdHMsCiAg ICAgIyBidXQgdGhlIFNDTSBiYXNlY2xhc3Mgd2lsbCBvbmx5IGNhbGwgbG9jYWxfY29tbWl0cyBt ZXRob2RzIHdoZW4gdGhpcyBpcyB0cnVlLgogICAgIEBzdGF0aWNtZXRob2QKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CmluZGV4IDU1ODcz YzNlZGU5NTBjOGRkOWVkNzVkNGU0YTljM2Y0YTczYTAyMTguLmNkNGUxZWE2MDJlNDQwZDQ0NTAx MjQ2NDNkMmU2YzJmNzU4YWFhNjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQpAQCAtMzUwLDYgKzM1MCw5IEBAIGNsYXNzIFNWTihT Q00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICAjIGh0dHA6Ly9zdm5ib29rLnJlZC1iZWFuLmNv bS9lbi8xLjAvY2gwM3MwMy5odG1sCiAgICAgICAgIHJldHVybiBzZWxmLnN2bl9jb21taXRfbG9n KCdCQVNFJykKIAorICAgIGRlZiBzdm5fYmxhbWUoc2VsZiwgcGF0aCk6CisgICAgICAgIHJldHVy biBzZWxmLl9ydW5fc3ZuKFsnYmxhbWUnLCBwYXRoXSkKKwogICAgIGRlZiBwcm9wc2V0KHNlbGYs IHBuYW1lLCBwdmFsdWUsIHBhdGgpOgogICAgICAgICBkaXIsIGJhc2UgPSBvcy5wYXRoLnNwbGl0 KHBhdGgpCiAgICAgICAgIHJldHVybiBzZWxmLl9ydW5fc3ZuKFsncHNldCcsIHBuYW1lLCBwdmFs dWUsIGJhc2VdLCBjd2Q9ZGlyKQo=