114671 2013-04-16 02:06:06 -0700 Remove Account class from committers.py 2013-04-16 02:24:46 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114673 1 rniwa rniwa benjamin koivisto mjs simon.fraser oldest_to_newest 876404 0 rniwa 2013-04-16 02:06:06 -0700 Remove Account class from committers.py 876410 1 198278 rniwa 2013-04-16 02:12:27 -0700 Created attachment 198278 Cleanup 876416 2 198278 ossy 2013-04-16 02:23:48 -0700 Comment on attachment 198278 Cleanup LGTM, r=me. 876417 3 rniwa 2013-04-16 02:24:46 -0700 Committed r148504: <http://trac.webkit.org/changeset/148504> 198278 2013-04-16 02:12:27 -0700 2013-04-16 02:23:48 -0700 Cleanup bug-114671-20130416021200.patch text/plain 13318 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0ODUwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM5IEBACisyMDEzLTA0LTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSBBY2NvdW50IGNsYXNzIGZyb20gY29tbWl0dGVycy5weQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NjcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjb3VudCBjbGFzcyB3 YXMgYWRkZWQgdG8gc3VwcG9ydCB3YXRjaCBsaXN0IGVtYWlsIGFkZHJlc3NlcyB0aGF0IGFyZSBu b3QgYXNzb2NpYXRlZCB3aXRoCisgICAgICAgIGEgcGFydGljdWxhciBjb250cmlidXRvciBidXQg bm9ib2R5IHVzZXMgdGhlc2UgZW1haWwgYWRkcmVzcyBzaW5jZSBDaHJvbWl1bSBwb3J0IGZvcmtl ZC4KKworICAgICAgICBSZW1vdmUgaXQuCisKKyAgICAgICAgQWxzbyByZW1vdmVkIGFjY291bnRf YnlfbG9naW4gZnJvbSBDb21taXR0ZXJMaXN0IHNpbmNlIGl0IHdhcyBuZXZlciBjYWxsZWQgZXhj ZXB0IGl0cyB1bml0dGVzdHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGFuZ2Vsb2cucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL2NvbW1pdHRlcnMucHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAgICAgIChD b250cmlidXRvci5tYXRjaGVzX2dsb2IpOgorICAgICAgICAoUmV2aWV3ZXIuX19pbml0X18pOgor ICAgICAgICAoQ29tbWl0dGVyTGlzdC5fX2luaXRfXyk6CisgICAgICAgIChDb21taXR0ZXJMaXN0 Ll9lbWFpbF90b19hY2NvdW50X21hcCk6CisgICAgICAgIChDb21taXR0ZXJMaXN0Ll9sb2dpbl90 b19hY2NvdW50X21hcCk6CisgICAgICAgIChDb21taXR0ZXJMaXN0LmNvbnRyaWJ1dG9yc19ieV9m dXp6eV9tYXRjaCk6CisgICAgICAgIChDb21taXR0ZXJMaXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWls KToKKyAgICAgICAgKENvbW1pdHRlckxpc3QuY29udHJpYnV0b3JfYnlfbmFtZSk6CisgICAgICAg IChDb21taXR0ZXJMaXN0LmNvbW1pdHRlcl9ieV9lbWFpbCk6CisgICAgICAgIChDb21taXR0ZXJM aXN0LnJldmlld2VyX2J5X2VtYWlsKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29tbWl0dGVyc191bml0dGVzdC5weToKKyAgICAgICAgKENvbW1pdHRlcnNUZXN0 LnRlc3RfY29tbWl0dGVyX2xvb2t1cCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5OgorICAgICAgICAoQnVnemlsbGEuX2NvbW1pdF9x dWV1ZV9mbGFnKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemls bGEvYnVnemlsbGFfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9xdWV1ZV9mbGFn KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0 cGFyc2VyLnB5OgorICAgICAgICAoV2F0Y2hMaXN0UGFyc2VyLl92YWxpZGF0ZSk6CisKIDIwMTMt MDQtMTYgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIHVwZGF0ZSB0byB0aGUgd2F0Y2hsaXN0LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5weQkocmV2aXNpb24gMTQ4NTAz KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3ICszNCw2IEBAIGZyb20gU3RyaW5nSU8gaW1wb3J0IFN0 cmluZ0lPCiBpbXBvcnQgdGV4dHdyYXAKIAogZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLmNv bW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QKLWZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZp Zy5jb21taXR0ZXJzIGltcG9ydCBBY2NvdW50CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u ZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogaW1wb3J0IHdlYmtpdHB5LmNvbW1vbi5jb25m aWcudXJscyBhcyBjb25maWdfdXJscwogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvY29tbWl0dGVycy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQkocmV2aXNpb24gMTQ4NTAzKQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkJKHdvcmtp bmcgY29weSkKQEAgLTMyLDcgKzMyLDggQEAKIGZyb20gd2Via2l0cHkuY29tbW9uLmVkaXRkaXN0 YW5jZSBpbXBvcnQgZWRpdF9kaXN0YW5jZQogaW1wb3J0IGZubWF0Y2gKIAotY2xhc3MgQWNjb3Vu dChvYmplY3QpOgorCitjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgIGRlZiBfX2luaXRf XyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXM9 Tm9uZSk6CiAgICAgICAgIGFzc2VydChuYW1lKQogICAgICAgICBhc3NlcnQoZW1haWxfb3JfZW1h aWxzKQpAQCAtODMsMTIgKzg0LDYgQEAgY2xhc3MgQWNjb3VudChvYmplY3QpOgogICAgICAgICBy ZXR1cm4gRmFsc2UKIAogCi1jbGFzcyBDb250cmlidXRvcihBY2NvdW50KToKLSAgICBkZWYgX19p bml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6Ci0g ICAgICAgIEFjY291bnQuX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNf bmlja25hbWUpCi0gICAgICAgIHNlbGYuaXNfY29udHJpYnV0b3IgPSBUcnVlCi0KLQogY2xhc3Mg Q29tbWl0dGVyKENvbnRyaWJ1dG9yKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1h aWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CiAgICAgICAgIENvbnRyaWJ1dG9yLl9f aW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lKQpAQCAtMTAx LDE2ICs5Niw2IEBAIGNsYXNzIFJldmlld2VyKENvbW1pdHRlcik6CiAgICAgICAgIHNlbGYuY2Fu X3JldmlldyA9IFRydWUKIAogCi0jIFRoaXMgaXMgYSBsaXN0IG9mIGVtYWlsIGFkZHJlc3NlcyB0 aGF0IGhhdmUgYnVnemlsbGEgYWNjb3VudHMgYnV0IGFyZSBub3QKLSMgdXNlZCBmb3IgY29udHJp YnV0aW5nIChzdWNoIGFzIG1haWxpbmcgbGlzdHMpLgotCi0KLXdhdGNoZXJzX3dob19hcmVfbm90 X2NvbnRyaWJ1dG9ycyA9IFsKLSAgICBBY2NvdW50KCJDaHJvbWl1bSBDb21wb3NpdG9yIEJ1Z3Mi LCBbImNjLWJ1Z3NAY2hyb21pdW0ub3JnIl0sICIiKSwKLSAgICBBY2NvdW50KCJDaHJvbWl1bSBN ZWRpYSBSZXZpZXdzIiwgWyJmZWF0dXJlLW1lZGlhLXJldmlld3NAY2hyb21pdW0ub3JnIl0sICIi KSwKLSAgICBBY2NvdW50KCJLZW50IFRhbXVyYSIsIFsidGtlbnQrd2thcGlAY2hyb21pdW0ub3Jn Il0sICIiKSwKLV0KLQogCiAjIFRoaXMgaXMgYSBsaXN0IG9mIHBlb3BsZSAob3IgYm90cykgd2hv IGFyZSBuZWl0aGVyIGNvbW1pdHRlcnMgbm9yIHJldmlld2VycywgYnV0IGdldAogIyBmcmVxdWVu dGx5IENDJ2VkIGJ5IG90aGVycyBvbiBCdWd6aWxsYSBidWdzLCBzbyB0aGVpciBuYW1lcyBzaG91 bGQgYmUKQEAgLTYxNSw5ICs2MDAsNyBAQCBjbGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsCiAgICAgICAgICAgICAgICAgIGNvbW1pdHRlcnM9Y29tbWl0 dGVyc191bmFibGVfdG9fcmV2aWV3LAogICAgICAgICAgICAgICAgICByZXZpZXdlcnM9cmV2aWV3 ZXJzX2xpc3QsCi0gICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnNfd2hv X2FyZV9ub3RfY29tbWl0dGVycywKLSAgICAgICAgICAgICAgICAgd2F0Y2hlcnM9d2F0Y2hlcnNf d2hvX2FyZV9ub3RfY29udHJpYnV0b3JzKToKLSAgICAgICAgc2VsZi5fYWNjb3VudHMgPSB3YXRj aGVycyArIGNvbnRyaWJ1dG9ycyArIGNvbW1pdHRlcnMgKyByZXZpZXdlcnMKKyAgICAgICAgICAg ICAgICAgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9yc193aG9fYXJlX25vdF9jb21taXR0ZXJzKToK ICAgICAgICAgc2VsZi5fY29udHJpYnV0b3JzID0gY29udHJpYnV0b3JzICsgY29tbWl0dGVycyAr IHJldmlld2VycwogICAgICAgICBzZWxmLl9jb21taXR0ZXJzID0gY29tbWl0dGVycyArIHJldmll d2VycwogICAgICAgICBzZWxmLl9yZXZpZXdlcnMgPSByZXZpZXdlcnMKQEAgLTYyNSw5ICs2MDgs NiBAQCBjbGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2FjY291bnRz X2J5X2VtYWlsID0ge30KICAgICAgICAgc2VsZi5fYWNjb3VudHNfYnlfbG9naW4gPSB7fQogCi0g ICAgZGVmIGFjY291bnRzKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fYWNjb3VudHMKLQog ICAgIGRlZiBjb250cmlidXRvcnMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9jb250cmli dXRvcnMKIApAQCAtNjQ3LDcgKzYyNyw3IEBAIGNsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToK IAogICAgIGRlZiBfZW1haWxfdG9fYWNjb3VudF9tYXAoc2VsZik6CiAgICAgICAgIGlmIG5vdCBs ZW4oc2VsZi5fYWNjb3VudHNfYnlfZW1haWwpOgotICAgICAgICAgICAgZm9yIGFjY291bnQgaW4g c2VsZi5fYWNjb3VudHM6CisgICAgICAgICAgICBmb3IgYWNjb3VudCBpbiBzZWxmLl9jb250cmli dXRvcnM6CiAgICAgICAgICAgICAgICAgZm9yIGVtYWlsIGluIGFjY291bnQuZW1haWxzOgogICAg ICAgICAgICAgICAgICAgICBhc3NlcnQoZW1haWwgbm90IGluIHNlbGYuX2FjY291bnRzX2J5X2Vt YWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNhdGUgZW1haWxzLgogICAgICAgICAg ICAgICAgICAgICBzZWxmLl9hY2NvdW50c19ieV9lbWFpbFtlbWFpbF0gPSBhY2NvdW50CkBAIC02 NTUsMTggKzYzNSwxMyBAQCBjbGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAKICAgICBkZWYg X2xvZ2luX3RvX2FjY291bnRfbWFwKHNlbGYpOgogICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2Fj Y291bnRzX2J5X2xvZ2luKToKLSAgICAgICAgICAgIGZvciBhY2NvdW50IGluIHNlbGYuX2FjY291 bnRzOgorICAgICAgICAgICAgZm9yIGFjY291bnQgaW4gc2VsZi5fY29udHJpYnV0b3JzOgogICAg ICAgICAgICAgICAgIGlmIGFjY291bnQuZW1haWxzOgogICAgICAgICAgICAgICAgICAgICBsb2dp biA9IGFjY291bnQuYnVnemlsbGFfZW1haWwoKQogICAgICAgICAgICAgICAgICAgICBhc3NlcnQo bG9naW4gbm90IGluIHNlbGYuX2FjY291bnRzX2J5X2xvZ2luKSAgIyBXZSBzaG91bGQgbmV2ZXIg aGF2ZSBkdXBsaWNhdGUgZW1haWxzLgogICAgICAgICAgICAgICAgICAgICBzZWxmLl9hY2NvdW50 c19ieV9sb2dpbltsb2dpbl0gPSBhY2NvdW50CiAgICAgICAgIHJldHVybiBzZWxmLl9hY2NvdW50 c19ieV9sb2dpbgogCi0gICAgZGVmIF9jb250cmlidXRvcl9vbmx5KHNlbGYsIHJlY29yZCk6Ci0g ICAgICAgIGlmIHJlY29yZCBhbmQgbm90IHJlY29yZC5pc19jb250cmlidXRvcjoKLSAgICAgICAg ICAgIHJldHVybiBOb25lCi0gICAgICAgIHJldHVybiByZWNvcmQKLQogICAgIGRlZiBfY29tbWl0 dGVyX29ubHkoc2VsZiwgcmVjb3JkKToKICAgICAgICAgaWYgcmVjb3JkIGFuZCBub3QgcmVjb3Jk LmNhbl9jb21taXQ6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQpAQCAtNzIwLDcgKzY5NSw3IEBA IGNsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToKICAgICAgICAgc3RyaW5nX2luX2xvd2VyY2Fz ZSA9IHN0cmluZy5sb3dlcigpCiAKICAgICAgICAgIyAxLiBFeGFjdCBtYXRjaCBmb3IgZnVsbG5h bWUsIGVtYWlsIGFuZCBpcmNfbmlja25hbWVzCi0gICAgICAgIGFjY291bnQgPSBzZWxmLmNvbnRy aWJ1dG9yX2J5X25hbWUoc3RyaW5nX2luX2xvd2VyY2FzZSkgb3Igc2VsZi5hY2NvdW50X2J5X2Vt YWlsKHN0cmluZ19pbl9sb3dlcmNhc2UpIG9yIHNlbGYuY29udHJpYnV0b3JfYnlfaXJjX25pY2tu YW1lKHN0cmluZ19pbl9sb3dlcmNhc2UpCisgICAgICAgIGFjY291bnQgPSBzZWxmLmNvbnRyaWJ1 dG9yX2J5X25hbWUoc3RyaW5nX2luX2xvd2VyY2FzZSkgb3Igc2VsZi5jb250cmlidXRvcl9ieV9l bWFpbChzdHJpbmdfaW5fbG93ZXJjYXNlKSBvciBzZWxmLmNvbnRyaWJ1dG9yX2J5X2lyY19uaWNr bmFtZShzdHJpbmdfaW5fbG93ZXJjYXNlKQogICAgICAgICBpZiBhY2NvdW50OgogICAgICAgICAg ICAgcmV0dXJuIFthY2NvdW50XSwgMAogCkBAIC03NTMsMjAgKzcyOCwxNCBAQCBjbGFzcyBDb21t aXR0ZXJMaXN0KG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gW10sIGxlbihzdHJpbmcpCiAg ICAgICAgIHJldHVybiBjb250cmlidXRvcldpdGhNaW5EaXN0YW5jZSwgbWluRGlzdGFuY2UKIAot ICAgIGRlZiBhY2NvdW50X2J5X2xvZ2luKHNlbGYsIGxvZ2luKToKLSAgICAgICAgcmV0dXJuIHNl bGYuX2xvZ2luX3RvX2FjY291bnRfbWFwKCkuZ2V0KGxvZ2luLmxvd2VyKCkpIGlmIGxvZ2luIGVs c2UgTm9uZQotCi0gICAgZGVmIGFjY291bnRfYnlfZW1haWwoc2VsZiwgZW1haWwpOgorICAgIGRl ZiBjb250cmlidXRvcl9ieV9lbWFpbChzZWxmLCBlbWFpbCk6CiAgICAgICAgIHJldHVybiBzZWxm Ll9lbWFpbF90b19hY2NvdW50X21hcCgpLmdldChlbWFpbC5sb3dlcigpKSBpZiBlbWFpbCBlbHNl IE5vbmUKIAogICAgIGRlZiBjb250cmlidXRvcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgogICAgICAg ICByZXR1cm4gc2VsZi5fbmFtZV90b19jb250cmlidXRvcl9tYXAoKS5nZXQobmFtZS5sb3dlcigp KSBpZiBuYW1lIGVsc2UgTm9uZQogCi0gICAgZGVmIGNvbnRyaWJ1dG9yX2J5X2VtYWlsKHNlbGYs IGVtYWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9yX29ubHkoc2VsZi5hY2Nv dW50X2J5X2VtYWlsKGVtYWlsKSkKLQogICAgIGRlZiBjb21taXR0ZXJfYnlfZW1haWwoc2VsZiwg ZW1haWwpOgotICAgICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2VsZi5hY2NvdW50 X2J5X2VtYWlsKGVtYWlsKSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdHRlcl9vbmx5KHNl bGYuY29udHJpYnV0b3JfYnlfZW1haWwoZW1haWwpKQogCiAgICAgZGVmIHJldmlld2VyX2J5X2Vt YWlsKHNlbGYsIGVtYWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyX29ubHkoc2Vs Zi5hY2NvdW50X2J5X2VtYWlsKGVtYWlsKSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2Vy X29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9lbWFpbChlbWFpbCkpCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVyc191bml0dGVzdC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVyc191 bml0dGVzdC5weQkocmV2aXNpb24gMTQ4NTAzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY29uZmlnL2NvbW1pdHRlcnNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI2 LDIxICsyNiwxOSBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgdW5pdHRlc3QyIGFzIHVuaXR0 ZXN0Ci1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcuY29tbWl0dGVycyBpbXBvcnQgQWNjb3Vu dCwgQ29tbWl0dGVyTGlzdCwgQ29udHJpYnV0b3IsIENvbW1pdHRlciwgUmV2aWV3ZXIKK2Zyb20g d2Via2l0cHkuY29tbW9uLmNvbmZpZy5jb21taXR0ZXJzIGltcG9ydCBDb21taXR0ZXJMaXN0LCBD b250cmlidXRvciwgQ29tbWl0dGVyLCBSZXZpZXdlcgogCiBjbGFzcyBDb21taXR0ZXJzVGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfY29tbWl0dGVyX2xvb2t1cChzZWxmKToK LSAgICAgICAgYWNjb3VudCA9IEFjY291bnQoJ1Rlc3QgWmVybycsIFsnemVyb0B0ZXN0LmNvbScs ICd6ZXJvQGdtYWlsLmNvbSddLCAnemVybycpCiAgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRl cignVGVzdCBPbmUnLCAnb25lQHRlc3QuY29tJywgJ29uZScpCiAgICAgICAgIHJldmlld2VyID0g UmV2aWV3ZXIoJ1Rlc3QgVHdvJywgWyd0d29AdGVzdC5jb20nLCAnVHdvQHJhZC5jb20nLCAnc29f dHdvQGdtYWlsLmNvbSddKQogICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yKCdUZXN0 IFRocmVlJywgWydUaHJlZUB0ZXN0LmNvbSddLCAndGhyZWUnKQogICAgICAgICBjb250cmlidXRv cl93aXRoX3R3b19uaWNrbmFtZXMgPSBDb250cmlidXRvcignT3RoZXIgRm91cicsIFsnb3RoZXJm b3VyQHdlYmtpdC5vcmcnLCAnb3RoZXJmb3VyQHdlYmtpdDIub3JnJ10sIFsnZm91cicsICdvdGhl cmZvdXInXSkKICAgICAgICAgY29udHJpYnV0b3Jfd2l0aF9zYW1lX2VtYWlsX3VzZXJuYW1lID0g Q29udHJpYnV0b3IoJ1lldCBBbm90aGVyIEZvdXInLCBbJ290aGVyZm91ckB3ZWJraXQuY29tJ10s IFsneWV0YW5vdGhlcmZvdXInXSkKLSAgICAgICAgY29tbWl0dGVyX2xpc3QgPSBDb21taXR0ZXJM aXN0KHdhdGNoZXJzPVthY2NvdW50XSwgY29tbWl0dGVycz1bY29tbWl0dGVyXSwgcmV2aWV3ZXJz PVtyZXZpZXdlcl0sCisgICAgICAgIGNvbW1pdHRlcl9saXN0ID0gQ29tbWl0dGVyTGlzdChjb21t aXR0ZXJzPVtjb21taXR0ZXJdLCByZXZpZXdlcnM9W3Jldmlld2VyXSwKICAgICAgICAgICAgIGNv bnRyaWJ1dG9ycz1bY29udHJpYnV0b3IsIGNvbnRyaWJ1dG9yX3dpdGhfdHdvX25pY2tuYW1lcywg Y29udHJpYnV0b3Jfd2l0aF9zYW1lX2VtYWlsX3VzZXJuYW1lXSkKIAogICAgICAgICAjIFRlc3Qg dmFsaWQgY29tbWl0dGVyLCByZXZpZXdlciBhbmQgY29udHJpYnV0b3IgbG9va3VwCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuYWNjb3VudF9ieV9lbWFpbCgnemVyb0B0 ZXN0LmNvbScpLCBhY2NvdW50KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9s aXN0LmNvbW1pdHRlcl9ieV9lbWFpbCgnb25lQHRlc3QuY29tJyksIGNvbW1pdHRlcikKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5yZXZpZXdlcl9ieV9lbWFpbCgndHdv QHRlc3QuY29tJyksIHJldmlld2VyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRl cl9saXN0LmNvbW1pdHRlcl9ieV9lbWFpbCgndHdvQHRlc3QuY29tJyksIHJldmlld2VyKQpAQCAt NjAsMTQgKzU4LDYgQEAgY2xhc3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAjIFRlc3QgdGhhdCB0aGUgZmlyc3QgZW1haWwgaXMgYXNzdW1lZCB0byBiZSB0aGUg QnVnemlsbGEgZW1haWwgYWRkcmVzcyAoZm9yIG5vdykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJykuYnVnemls bGFfZW1haWwoKSwgJ3R3b0B0ZXN0LmNvbScpCiAKLSAgICAgICAgIyBUZXN0IGxvb2t1cCBieSBs b2dpbiBlbWFpbCBhZGRyZXNzCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xp c3QuYWNjb3VudF9ieV9sb2dpbignemVyb0B0ZXN0LmNvbScpLCBhY2NvdW50KQotICAgICAgICBz ZWxmLmFzc2VydElzTm9uZShjb21taXR0ZXJfbGlzdC5hY2NvdW50X2J5X2xvZ2luKCd6ZXJvQGdt YWlsLmNvbScpKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmFjY291 bnRfYnlfbG9naW4oJ29uZUB0ZXN0LmNvbScpLCBjb21taXR0ZXIpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuYWNjb3VudF9ieV9sb2dpbigndHdvQHRlc3QuY29tJyks IHJldmlld2VyKQotICAgICAgICBzZWxmLmFzc2VydElzTm9uZShjb21taXR0ZXJfbGlzdC5hY2Nv dW50X2J5X2xvZ2luKCdUd29AcmFkLmNvbScpKQotICAgICAgICBzZWxmLmFzc2VydElzTm9uZShj b21taXR0ZXJfbGlzdC5hY2NvdW50X2J5X2xvZ2luKCdzb190d29AZ21haWwuY29tJykpCi0KICAg ICAgICAgIyBUZXN0IHRoYXQgYSBrbm93biBjb21taXR0ZXIgaXMgbm90IHJldHVybmVkIGR1cmlu ZyByZXZpZXdlciBsb29rdXAKICAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUoY29tbWl0dGVyX2xp c3QucmV2aWV3ZXJfYnlfZW1haWwoJ29uZUB0ZXN0LmNvbScpKQogICAgICAgICBzZWxmLmFzc2Vy dElzTm9uZShjb21taXR0ZXJfbGlzdC5yZXZpZXdlcl9ieV9lbWFpbCgndGhyZWVAdGVzdC5jb20n KSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6 aWxsYS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQv YnVnemlsbGEvYnVnemlsbGEucHkJKHJldmlzaW9uIDE0ODUwMykKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQkod29ya2luZyBjb3B5KQpA QCAtNTMxLDcgKzUzMSw3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgIyBGSVhNRTog VXNlIGVudW0gaW5zdGVhZCBvZiB0d28gYm9vbGVhbnMKICAgICBkZWYgX2NvbW1pdF9xdWV1ZV9m bGFnKHNlbGYsIG1hcmtfZm9yX2xhbmRpbmcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZSk6CiAgICAg ICAgIGlmIG1hcmtfZm9yX2xhbmRpbmc6Ci0gICAgICAgICAgICB1c2VyID0gc2VsZi5jb21taXR0 ZXJzLmFjY291bnRfYnlfZW1haWwoc2VsZi51c2VybmFtZSkKKyAgICAgICAgICAgIHVzZXIgPSBz ZWxmLmNvbW1pdHRlcnMuY29udHJpYnV0b3JfYnlfZW1haWwoc2VsZi51c2VybmFtZSkKICAgICAg ICAgICAgIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZSA9IFRydWUKICAgICAgICAgICAgIGlmIG5vdCB1 c2VyOgogICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygiWW91ciBCdWd6aWxsYSBsb2dpbiBp cyBub3QgbGlzdGVkIGluIGNvbW1pdHRlcnMucHkuIFVwbG9hZGluZyB3aXRoIGNxPyBpbnN0ZWFk IG9mIGNxKyIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemls bGEvYnVnemlsbGFfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAx NDg1MDMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVn emlsbGFfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwNSw4ICszMDUsNyBAQCBJZ25v cmUgdGhpcyBidWcuICBKdXN0IGZvciB0ZXN0aW5nIGZhaWx1CiAKICAgICAgICAgYnVnemlsbGEu Y29tbWl0dGVycyA9IENvbW1pdHRlckxpc3QocmV2aWV3ZXJzPVtSZXZpZXdlcigiV2ViS2l0IFJl dmlld2VyIiwgInJldmlld2VyQHdlYmtpdC5vcmciKV0sCiAgICAgICAgICAgICBjb21taXR0ZXJz PVtDb21taXR0ZXIoIldlYktpdCBDb21taXR0ZXIiLCAiY29tbWl0dGVyQHdlYmtpdC5vcmciKV0s Ci0gICAgICAgICAgICBjb250cmlidXRvcnM9W0NvbnRyaWJ1dG9yKCJXZWJLaXQgQ29udHJpYnV0 b3IiLCAiY29udHJpYnV0b3JAd2Via2l0Lm9yZyIpXSwKLSAgICAgICAgICAgIHdhdGNoZXJzPVtd KQorICAgICAgICAgICAgY29udHJpYnV0b3JzPVtDb250cmlidXRvcigiV2ViS2l0IENvbnRyaWJ1 dG9yIiwgImNvbnRyaWJ1dG9yQHdlYmtpdC5vcmciKV0pCiAKICAgICAgICAgZGVmIGFzc2VydF9j b21taXRfcXVldWVfZmxhZyhtYXJrX2Zvcl9sYW5kaW5nLCBtYXJrX2Zvcl9jb21taXRfcXVldWUs IGV4cGVjdGVkLCB1c2VybmFtZT1Ob25lKToKICAgICAgICAgICAgIGJ1Z3ppbGxhLnVzZXJuYW1l ID0gdXNlcm5hbWUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlz dC93YXRjaGxpc3RwYXJzZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQkocmV2aXNpb24gMTQ4NTAzKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNl ci5weQkod29ya2luZyBjb3B5KQpAQCAtMTUyLDcgKzE1Miw3IEBAIGNsYXNzIFdhdGNoTGlzdFBh cnNlcihvYmplY3QpOgogICAgICAgICAgICAgIyBtb2RpZnlpbmcgYSBsaXN0IHdoaWxlIGl0ZXJh dGluZyB0aHJvdWdoIGl0IGxlYWRzIHRvIHVuZGVmaW5lZCBiZWhhdmlvci4KICAgICAgICAgICAg IGludHJ1Y3Rpb25zX2NvcHkgPSBjY19ydWxlLmluc3RydWN0aW9ucygpWzpdCiAgICAgICAgICAg ICBmb3IgZW1haWwgaW4gaW50cnVjdGlvbnNfY29weToKLSAgICAgICAgICAgICAgICBpZiBub3Qg YWNjb3VudHMuYWNjb3VudF9ieV9lbWFpbChlbWFpbCk6CisgICAgICAgICAgICAgICAgaWYgbm90 IGFjY291bnRzLmNvbnRyaWJ1dG9yX2J5X2VtYWlsKGVtYWlsKToKICAgICAgICAgICAgICAgICAg ICAgY2NfcnVsZS5yZW1vdmVfaW5zdHJ1Y3Rpb24oZW1haWwpCiAgICAgICAgICAgICAgICAgICAg IHNlbGYuX2xvZ19lcnJvcigiVGhlIGVtYWlsIGFsaWFzICVzIHdoaWNoIGlzIGluIHRoZSB3YXRj aGxpc3QgaXMgbm90IGxpc3RlZCBhcyBhIGNvbnRyaWJ1dG9yIGluIGNvbW1pdHRlcnMucHkiICUg ZW1haWwpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCg==