68972 2011-09-27 23:03:17 -0700 watchlist: Add support for matching added or deleted lines. 2011-09-28 10:05:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68822 1 levin levin abarth eric levin levin+watchlist webkit.review.bot oldest_to_newest 474517 0 levin 2011-09-27 23:03:17 -0700 Note that added or deleted lines is simply based on the diff file itself -- not based on intraline diffing, so if someone changes a line containing "foo". Then "foo" will be in both added and deleted lines. 474523 1 108969 levin 2011-09-27 23:15:40 -0700 Created attachment 108969 Patch 474784 2 108969 abarth 2011-09-28 09:48:53 -0700 Comment on attachment 108969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108969&action=review > Tools/Scripts/webkitpy/common/watchlist/changedlinepattern.py:32 > +class ChangedLinePattern: Sometimes we put trivial classes that are only used in one place in the same file as the use, but it doesn't really matter. > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:52 > + } Technically should be less indented. 474803 3 108969 webkit.review.bot 2011-09-28 10:05:02 -0700 Comment on attachment 108969 Patch Clearing flags on attachment: 108969 Committed r96228: <http://trac.webkit.org/changeset/96228> 474804 4 webkit.review.bot 2011-09-28 10:05:07 -0700 All reviewed patches have been landed. Closing bug. 108969 2011-09-27 23:15:40 -0700 2011-09-28 10:05:02 -0700 Patch bug-68972-20110927231539.patch text/plain 13424 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTYxNzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMzQ5ZTRhMzZhMzlmYzI1MzViZjI1NDNiN2E5NmExMTYy ZDQ3MGM3Li44MmE1ZTI5MmU1MWQ1ZDQ1OTg2NWJhOTY1Njg0OWVjOTk4YzIwY2FlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTEtMDktMjcgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCisgICAg ICAgIHdhdGNobGlzdDogQWRkIHN1cHBvcnQgZm9yIG1hdGNoaW5nIGFkZGVkIG9yIGRlbGV0ZWQg bGluZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 ODk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybi5weTog QWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5n ZWRsaW5lcGF0dGVybl91bml0dGVzdC5weTogQWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdC5weTogQ29tbWVudCBmaXggdXAgYW5kIGZp eCBpbnB1dAorICAgICAgICB0byB0aGUgcGF0dGVybiBtYXRjaCB0byBvbmx5IGhhdmUgdGhlIGRp ZmYgbGluZXMgaW5zdGVhZCBvZiB0aGUgRGlmZkZpbGUuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdF91bml0dGVzdC5weToKKyAgICAgICAgQWRk IHRlc3RzIGZvciB0aGUgbmV3IHBhdHRlcm5zIGFuZCBjb21iaW5hdGlvbnMgb2YgdGhlIHBhdHRl cm5zLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxp c3RwYXJzZXIucHk6CisgICAgICAgIFNvcnQgaW1wb3J0cy4gQWRkIGNoYW5nZWxpbmUgc3VwcG9y dC4KKworMjAxMS0wOS0yNyAgRGF2aWQgTGV2aW4gIDxsZXZpbkBjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgd2F0Y2hsaXN0OiBBZGQgc3VwcG9ydCBmb3IgY2MgYW5kIG1lc3NhZ2UgcnVsZXMuCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODk1MAogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvY2hhbmdl ZGxpbmVwYXR0ZXJuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0 L2NoYW5nZWRsaW5lcGF0dGVybi5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZDQ3NTc4Yzg3OWM1NWUyNjFkYzMx NmE5MWIwZDZiNmY5ZDhiZTkwCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybi5weQpAQCAtMCwwICsxLDQz IEBACisjIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0 aW9uLgorIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFt ZXMgb2YgaXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21v dGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZp YyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QK KyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJ TiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U CisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IHJlCisKKworY2xhc3MgQ2hhbmdlZExpbmVQ YXR0ZXJuOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZWdleCwgaW5kZXhfZm9yX3plcm9fdmFs dWUpOgorICAgICAgICBzZWxmLl9yZWdleCA9IHJlLmNvbXBpbGUocmVnZXgpCisgICAgICAgIHNl bGYuX2luZGV4X2Zvcl96ZXJvX3ZhbHVlID0gaW5kZXhfZm9yX3plcm9fdmFsdWUKKworICAgIGRl ZiBtYXRjaChzZWxmLCBwYXRoLCBkaWZmX2ZpbGUpOgorICAgICAgICBmb3IgZGlmZl9saW5lIGlu IGRpZmZfZmlsZToKKyAgICAgICAgICAgIGlmIGRpZmZfbGluZVtzZWxmLl9pbmRleF9mb3JfemVy b192YWx1ZV06CisgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIGlmIHNlbGYu X3JlZ2V4LnNlYXJjaChkaWZmX2xpbmVbMl0pOgorICAgICAgICAgICAgICAgIHJldHVybiBUcnVl CisgICAgICAgIHJldHVybiBGYWxzZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybl91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9jaGFuZ2VkbGluZXBhdHRlcm5fdW5p dHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMDAxNzA0NWI4NzcwOWQ5NGFmMWMwMTgyNDI1YTc5ZTIxMDEy MmE3NgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dh dGNobGlzdC9jaGFuZ2VkbGluZXBhdHRlcm5fdW5pdHRlc3QucHkKQEAgLTAsMCArMSw2MiBAQAor IyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMK KyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor IyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4K KyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9m IGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHBy b2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJp b3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJ TUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCisKKycnJ1VuaXQgdGVzdHMgZm9yIGNoYW5nZWRsaW5lcGF0dGVybi5w eS4nJycKKworaW1wb3J0IHVuaXR0ZXN0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qu Y2hhbmdlZGxpbmVwYXR0ZXJuIGltcG9ydCBDaGFuZ2VkTGluZVBhdHRlcm4KKworCitjbGFzcyBD aGFuZ2VkTGluZVBhdHRlcm5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKworICAgICMgQSBxdWlj ayBub3RlIGFib3V0IHRoZSBkaWZmIGZpbGUgc3RydWN0dXJlLgorICAgICMgVGhlIGZpcnN0IGNv bHVtbiBpbmRpY2F0ZWQgdGhlIG9sZCBsaW5lIG51bWJlci4KKyAgICAjIFRoZSBzZWNvbmQgY29s dW1uIGluZGljYXRlcyB0aGUgbmV3IGxpbmUgbnVtYmVyLgorICAgICMgMCBpbiBlaXRoZXIgY29s dW1uIGluZGljYXRlcyBpdCBoYWQgbm8gb2xkIG9yIG5ldyBsaW5lIG51bWJlci4KKyAgICBfRElG Rl9GSUxFID0gKCgwLCAxLCAnaGknKSwKKyAgICAgICAgICAgICAgICAgICgxLCAwLCAnYnllJyks CisgICAgICAgICAgICAgICAgICAoMiwgMiwgJ290aGVyJyksCisgICAgICAgICAgICAgICAgICAo MywgMCwgJ2JvdGgnKSwKKyAgICAgICAgICAgICAgICAgICgwLCAzLCAnYm90aCcpLAorICAgICAg ICAgICAgICAgICAgKQorCisgICAgZGVmIHRlc3RfYWRkZWRfbGluZXMoc2VsZik6CisgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZShDaGFuZ2VkTGluZVBhdHRlcm4oJ2hpJywgMCkubWF0Y2goTm9uZSwg c2VsZi5fRElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKENoYW5nZWRMaW5lUGF0 dGVybignaC4nLCAwKS5tYXRjaChOb25lLCBzZWxmLl9ESUZGX0ZJTEUpKQorICAgICAgICBzZWxm LmFzc2VydFRydWUoQ2hhbmdlZExpbmVQYXR0ZXJuKCdib3RoJywgMCkubWF0Y2goTm9uZSwgc2Vs Zi5fRElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShDaGFuZ2VkTGluZVBhdHRl cm4oJ2J5ZScsIDApLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCisgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2UoQ2hhbmdlZExpbmVQYXR0ZXJuKCd5JywgMCkubWF0Y2goTm9uZSwgc2VsZi5f RElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShDaGFuZ2VkTGluZVBhdHRlcm4o J290aGVyJywgMCkubWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKKworICAgIGRlZiB0ZXN0 X3JlbW92ZWRfbGluZXMoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoQ2hhbmdlZExp bmVQYXR0ZXJuKCdoaScsIDEpLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCisgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2UoQ2hhbmdlZExpbmVQYXR0ZXJuKCdoLicsIDEpLm1hdGNoKE5vbmUs IHNlbGYuX0RJRkZfRklMRSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShDaGFuZ2VkTGluZVBh dHRlcm4oJ2JvdGgnLCAxKS5tYXRjaChOb25lLCBzZWxmLl9ESUZGX0ZJTEUpKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUoQ2hhbmdlZExpbmVQYXR0ZXJuKCdieWUnLCAxKS5tYXRjaChOb25lLCBz ZWxmLl9ESUZGX0ZJTEUpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoQ2hhbmdlZExpbmVQYXR0 ZXJuKCd5JywgMSkubWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5h c3NlcnRGYWxzZShDaGFuZ2VkTGluZVBhdHRlcm4oJ290aGVyJywgMSkubWF0Y2goTm9uZSwgc2Vs Zi5fRElGRl9GSUxFKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3dhdGNobGlzdC93YXRjaGxpc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93 YXRjaGxpc3Qvd2F0Y2hsaXN0LnB5CmluZGV4IGMwMDBkZmJkMjk4YWMwMjlkMzg4NGYyODA3Mjlh ZDdkM2ZlMjU1ZjYuLjhhMDZjNTgzNDZiMmUyNjhiMzBlZTAwMjlhZmVmYmQ1YmViMGQ0ZjIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxp c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNo bGlzdC5weQpAQCAtNTQsOSArNTQsOSBAQCBjbGFzcyBXYXRjaExpc3Qob2JqZWN0KToKICAgICAg ICAgICAgICAgICBpZiBkZWZpbml0aW9uIGluIG1hdGNoaW5nX2RlZmluaXRpb25zOgogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAgICAgICAgIyBTZWUgaWYgdGhlIGRl ZmluaXRpb24gbWF0Y2hlcy4KKyAgICAgICAgICAgICAgICAjIFNlZSBpZiB0aGUgZGVmaW5pdGlv biBtYXRjaGVzIHdpdGhpbiBvbmUgZmlsZS4KICAgICAgICAgICAgICAgICBmb3IgcGF0dGVybiBp biBzZWxmLl9kZWZpbml0aW9uc1tkZWZpbml0aW9uXToKLSAgICAgICAgICAgICAgICAgICAgaWYg bm90IHBhdHRlcm4ubWF0Y2gocGF0aCwgZGlmZl9maWxlKToKKyAgICAgICAgICAgICAgICAgICAg aWYgbm90IHBhdHRlcm4ubWF0Y2gocGF0aCwgZGlmZl9maWxlLmxpbmVzKToKICAgICAgICAgICAg ICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICAgICAgbWF0Y2hpbmdfZGVmaW5pdGlvbnMuYWRkKGRlZmluaXRpb24pCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0X3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdF91 bml0dGVzdC5weQppbmRleCBmNmU4YmU2YWFlN2VhNzZjMjJkYWI1ZjUxYmZhYTBmNjE2MjFkODUy Li41OTg3NDZjNWZhOWQ2MGVlMmRlMzAxYzY3NWE1MjE1MWEwMjZhMDBlIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0X3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxp c3RfdW5pdHRlc3QucHkKQEAgLTEzOSwzICsxMzksODAgQEAgY2xhc3MgV2F0Y2hMaXN0VGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgJ2NjX3NldCc6IHNldCgpLAogICAg ICAgICAgICAgICAgICdtZXNzYWdlcyc6IHNldCgpLAogICAgICAgICAgICAgICAgIH0sIGNjX3Nl dF9hbmRfbWVzc2FnZXMpCisKKyAgICBkZWYgdGVzdF9hZGRlZF9tYXRjaChzZWxmKToKKyAgICAg ICAgd2F0Y2hfbGlzdCA9IHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlKAorICAgICAgICAg ICAgJ3snCisgICAgICAgICAgICAnICAgICJERUZJTklUSU9OUyI6IHsnCisgICAgICAgICAgICAn ICAgICAgICAiV2F0Y2hMaXN0MSI6IHsnCisgICAgICAgICAgICAnICAgICAgICAgICAgImluX2Fk ZGVkX2xpbmVzIjogciJSZW5kZXJTdHlsZTo6aW5pdGlhbEJveE9yaWVudCIsJworICAgICAgICAg ICAgJyAgICAgICAgfSwnCisgICAgICAgICAgICAnICAgICAgICAiV2F0Y2hMaXN0MiI6IHsnCisg ICAgICAgICAgICAnICAgICAgICAgICAgImluX2RlbGV0ZWRfbGluZXMiOiByIlJlbmRlclN0eWxl Ojppbml0aWFsQm94T3JpZW50IiwnCisgICAgICAgICAgICAnICAgICAgICB9LCcKKyAgICAgICAg ICAgICcgICAgIH0sJworICAgICAgICAgICAgJyAgICAiQ0NfUlVMRVMiOiB7JworICAgICAgICAg ICAgJyAgICAgICAgIldhdGNoTGlzdDEiOiBbICJlcmljQHdlYmtpdC5vcmciLCBdLCcKKyAgICAg ICAgICAgICcgICAgICAgICJXYXRjaExpc3QyIjogWyAiYWJhcnRoQHdlYmtpdC5vcmciLCBdLCcK KyAgICAgICAgICAgICcgICAgfSwnCisgICAgICAgICAgICAnfScpCisgICAgICAgIGNjX3NldF9h bmRfbWVzc2FnZXMgPSB3YXRjaF9saXN0LmRldGVybWluZV9jY19zZXRfYW5kX21lc3NhZ2VzKERJ RkZfVEVTVF9EQVRBKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyh7CisgICAgICAgICAgICAg ICAgJ2NjX3NldCc6IHNldChbJ2VyaWNAd2Via2l0Lm9yZyddKSwKKyAgICAgICAgICAgICAgICAn bWVzc2FnZXMnOiBzZXQoKSwKKyAgICAgICAgICAgICAgICB9LCBjY19zZXRfYW5kX21lc3NhZ2Vz KQorCisgICAgZGVmIHRlc3RfZGVsZXRlZF9tYXRjaChzZWxmKToKKyAgICAgICAgd2F0Y2hfbGlz dCA9IHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBhcnNlKAorICAgICAgICAgICAgJ3snCisgICAg ICAgICAgICAnICAgICJERUZJTklUSU9OUyI6IHsnCisgICAgICAgICAgICAnICAgICAgICAiV2F0 Y2hMaXN0MSI6IHsnCisgICAgICAgICAgICAnICAgICAgICAgICAgImluX2FkZGVkX2xpbmVzIjog ciJ1bnNpZ25lZCBvcmllbnQ6IDE7IiwnCisgICAgICAgICAgICAnICAgICAgICB9LCcKKyAgICAg ICAgICAgICcgICAgICAgICJXYXRjaExpc3QyIjogeycKKyAgICAgICAgICAgICcgICAgICAgICAg ICAiaW5fZGVsZXRlZF9saW5lcyI6IHIidW5zaWduZWQgb3JpZW50OiAxOyIsJworICAgICAgICAg ICAgJyAgICAgICAgfSwnCisgICAgICAgICAgICAnICAgICB9LCcKKyAgICAgICAgICAgICcgICAg IkNDX1JVTEVTIjogeycKKyAgICAgICAgICAgICcgICAgICAgICJXYXRjaExpc3QxIjogWyAiZXJp Y0B3ZWJraXQub3JnIiwgXSwnCisgICAgICAgICAgICAnICAgICAgICAiV2F0Y2hMaXN0MiI6IFsg ImFiYXJ0aEB3ZWJraXQub3JnIiwgXSwnCisgICAgICAgICAgICAnICAgIH0sJworICAgICAgICAg ICAgJ30nKQorICAgICAgICBjY19zZXRfYW5kX21lc3NhZ2VzID0gd2F0Y2hfbGlzdC5kZXRlcm1p bmVfY2Nfc2V0X2FuZF9tZXNzYWdlcyhESUZGX1RFU1RfREFUQSkKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoeworICAgICAgICAgICAgICAgICdjY19zZXQnOiBzZXQoWydhYmFydGhAd2Via2l0 Lm9yZyddKSwKKyAgICAgICAgICAgICAgICAnbWVzc2FnZXMnOiBzZXQoKSwKKyAgICAgICAgICAg ICAgICB9LCBjY19zZXRfYW5kX21lc3NhZ2VzKQorCisgICAgZGVmIHRlc3RfY29tcGxleF9tYXRj aChzZWxmKToKKyAgICAgICAgd2F0Y2hfbGlzdCA9IHNlbGYuX3dhdGNoX2xpc3RfcGFyc2VyLnBh cnNlKAorICAgICAgICAgICAgJ3snCisgICAgICAgICAgICAnICAgICJERUZJTklUSU9OUyI6IHsn CisgICAgICAgICAgICAnICAgICAgICAiV2F0Y2hMaXN0MSI6IHsnCisgICAgICAgICAgICAnICAg ICAgICAgICAgImZpbGVuYW1lIjogciJXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJ bmhlcml0ZWREYXRhXC5jcHAiLCcKKyAgICAgICAgICAgICcgICAgICAgICAgICAiaW5fYWRkZWRf bGluZXMiOiByIlwmXCYgYm94T3JpZW50ID09IG8uYm94T3JpZW50OyIsJworICAgICAgICAgICAg JyAgICAgICAgICAgICJpbl9kZWxldGVkX2xpbmVzIjogciJcJlwmIHVzZXJTZWxlY3QgPT0gby51 c2VyU2VsZWN0OyIsJworICAgICAgICAgICAgJyAgICAgICAgfSwnCisgICAgICAgICAgICAnICAg ICAgICAiV2F0Y2hMaXN0MiI6IHsnCisgICAgICAgICAgICAnICAgICAgICAgICAgImZpbGVuYW1l IjogciJXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhXC5jcHAi LCcKKyAgICAgICAgICAgICcgICAgICAgICAgICAiaW5fYWRkZWRfbGluZXMiOiByIlJlbmRlclN0 eWxlOjppbml0aWFsQm94T3JpZW50IiwnCisgICAgICAgICAgICAnICAgICAgICB9LCcKKyAgICAg ICAgICAgICMgV2F0Y2hMaXN0MyB3b24ndCBtYXRjaCBiZWNhdXNlIHRoZXNlIHR3byBwYXR0ZXJu cyBhcmVuJ3QgaW4gdGhlIHNhbWUgZmlsZS4KKyAgICAgICAgICAgICcgICAgICAgICJXYXRjaExp c3QzIjogeycKKyAgICAgICAgICAgICcgICAgICAgICAgICAiaW5fYWRkZWRfbGluZXMiOiByIlJl bmRlclN0eWxlOjppbml0aWFsQm94T3JpZW50IiwnCisgICAgICAgICAgICAnICAgICAgICAgICAg ImluX2RlbGV0ZWRfbGluZXMiOiByInVuc2lnbmVkIG9yaWVudDogMTsiLCcKKyAgICAgICAgICAg ICcgICAgICAgIH0sJworICAgICAgICAgICAgJyAgICAgfSwnCisgICAgICAgICAgICAnICAgICJD Q19SVUxFUyI6IHsnCisgICAgICAgICAgICAnICAgICAgICAiV2F0Y2hMaXN0MSI6IFsgImVyaWNA d2Via2l0Lm9yZyIsIF0sJworICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlzdDMiOiBbICJh YmFydGhAd2Via2l0Lm9yZyIsIF0sJworICAgICAgICAgICAgJyAgICB9LCcKKyAgICAgICAgICAg ICcgICAgIk1FU1NBR0VfUlVMRVMiOiB7JworICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlz dDIiOiBbIlRoaXMgaXMgYSB0ZXN0IG1lc3NhZ2UuIl0sJworICAgICAgICAgICAgJyAgICB9LCcK KyAgICAgICAgICAgICd9JykKKyAgICAgICAgY2Nfc2V0X2FuZF9tZXNzYWdlcyA9IHdhdGNoX2xp c3QuZGV0ZXJtaW5lX2NjX3NldF9hbmRfbWVzc2FnZXMoRElGRl9URVNUX0RBVEEpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKHsKKyAgICAgICAgICAgICAgICAnY2Nfc2V0Jzogc2V0KFsnZXJp Y0B3ZWJraXQub3JnJ10pLAorICAgICAgICAgICAgICAgICdtZXNzYWdlcyc6IHNldChbIlRoaXMg aXMgYSB0ZXN0IG1lc3NhZ2UuIl0pLAorICAgICAgICAgICAgICAgIH0sIGNjX3NldF9hbmRfbWVz c2FnZXMpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxp c3Qvd2F0Y2hsaXN0cGFyc2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0 Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQppbmRleCBmM2NjMTE4NTY3YTExNzBiOWVmZTE2Y2Fl MmMwYjlmNzAxOWExZjBhLi4wOGQwYmMyODJkZjcyN2UzZTIwZmNjODMwNDg4ZWJhMjUyYjdkMzY2 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0 Y2hsaXN0cGFyc2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNo bGlzdC93YXRjaGxpc3RwYXJzZXIucHkKQEAgLTI3LDggKzI3LDkgQEAKICMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAogaW1wb3J0IHJlCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0IGlt cG9ydCBXYXRjaExpc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC5jaGFuZ2VkbGlu ZXBhdHRlcm4gaW1wb3J0IENoYW5nZWRMaW5lUGF0dGVybgogZnJvbSB3ZWJraXRweS5jb21tb24u d2F0Y2hsaXN0LmZpbGVuYW1lcGF0dGVybiBpbXBvcnQgRmlsZW5hbWVQYXR0ZXJuCitmcm9tIHdl YmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0IGltcG9ydCBXYXRjaExpc3QKIGZyb20g d2Via2l0cHkuY29tbW9uLndhdGNobGlzdC53YXRjaGxpc3RydWxlIGltcG9ydCBXYXRjaExpc3RS dWxlCiAKIApAQCAtNDQsNyArNDUsMTEgQEAgY2xhc3MgV2F0Y2hMaXN0UGFyc2VyKG9iamVjdCk6 CiAgICAgICAgICAgICBzZWxmLl9DQ19SVUxFUzogc2VsZi5fcGFyc2VfY2NfcnVsZXMsCiAgICAg ICAgICAgICBzZWxmLl9NRVNTQUdFX1JVTEVTOiBzZWxmLl9wYXJzZV9tZXNzYWdlX3J1bGVzLAog ICAgICAgICAgICAgfQotICAgICAgICBzZWxmLl9kZWZpbml0aW9uX3BhdHRlcm5fcGFyc2VycyA9 IHsnZmlsZW5hbWUnOiBGaWxlbmFtZVBhdHRlcm4sIH0KKyAgICAgICAgc2VsZi5fZGVmaW5pdGlv bl9wYXR0ZXJuX3BhcnNlcnMgPSB7CisgICAgICAgICAgICAnZmlsZW5hbWUnOiBGaWxlbmFtZVBh dHRlcm4sCisgICAgICAgICAgICAnaW5fYWRkZWRfbGluZXMnOiAobGFtYmRhIHJlZ2V4OiBDaGFu Z2VkTGluZVBhdHRlcm4ocmVnZXgsIDApKSwKKyAgICAgICAgICAgICdpbl9kZWxldGVkX2xpbmVz JzogKGxhbWJkYSByZWdleDogQ2hhbmdlZExpbmVQYXR0ZXJuKHJlZ2V4LCAxKSksCisgICAgICAg ICAgICB9CiAKICAgICBkZWYgcGFyc2Uoc2VsZiwgd2F0Y2hfbGlzdF9jb250ZW50cyk6CiAgICAg ICAgIHdhdGNoX2xpc3QgPSBXYXRjaExpc3QoKQo=