37065 2010-04-03 14:28:01 -0700 check-webkit-style: decouple the StyleChecker class and error_handlers.py from patch-related code 2010-04-11 20:53:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 37067 1 cjerdonek cjerdonek cjerdonek commit-queue hamaji oldest_to_newest 208307 0 cjerdonek 2010-04-03 14:28:01 -0700 checker.py and error_handlers.py shouldn't have to know how to parse and interpret patches. 208309 1 cjerdonek 2010-04-03 15:40:06 -0700 We can probably get rid of the PatchStyleErrorHandler altogether by renaming the DefaultStyleErrorHandler to StyleErrorHandler and having it accept an optional array of line numbers (the line numbers of the modified lines). We probably also want to move the style_checker.check_patch() method to style/main.py and have the style_checker.check_file() method accept an optional array of line numbers, similar to the above. This way only style/main.py needs to be aware of patch-related code. This will have other benefits for future patches as well. 211410 2 53098 cjerdonek 2010-04-11 13:07:57 -0700 Created attachment 53098 Proposed patch 211412 3 cjerdonek 2010-04-11 13:10:09 -0700 This report was originally to move the patch-related code to a separate file, but for now it would be sufficient and better simply to move that code into a separate class. 211526 4 53098 hamaji 2010-04-11 20:40:46 -0700 Comment on attachment 53098 Proposed patch Looks sane. 211529 5 53098 commit-queue 2010-04-11 20:53:06 -0700 Comment on attachment 53098 Proposed patch Clearing flags on attachment: 53098 Committed r57467: <http://trac.webkit.org/changeset/57467> 211530 6 commit-queue 2010-04-11 20:53:11 -0700 All reviewed patches have been landed. Closing bug. 53098 2010-04-11 13:07:57 -0700 2010-04-11 20:53:06 -0700 Proposed patch _patch-37065-1.diff text/plain 8790 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNzM3OWE0Li5iMThmYzUxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDQt MTEgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3JlZCBjaGVjay13ZWJr aXQtc3R5bGUgc28gdGhhdCB0aGUgU3R5bGVDaGVja2VyIGNsYXNzCisgICAgICAgIGhhcyBubyBk ZXBlbmRlbmNpZXMgb24gcGF0Y2gtcmVsYXRlZCBjb25jZXB0cy4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjUKKworICAgICAgICBUaGlzIHBh dGNoIGlzIGFuIGludGVybWVkaWF0ZSBzdGVwIHRvd2FyZHMgbWFraW5nIHRoZSBTdHlsZUNoZWNr ZXIKKyAgICAgICAgY2xhc3MgYSBnZW5lcmFsaXplZCBmaWxlIHByb2Nlc3NvciB0aGF0IGNhbiBk byBhcmJpdGFyeSBvcGVyYXRpb25zCisgICAgICAgIG9uIHRoZSBmaWxlcyBjb3JyZXNwb25kaW5n IHRvIGEgbGlzdCBvZiBwYXRocy4gIFRoaXMgcGF0Y2gKKyAgICAgICAgYWxzbyBzaW1wbGlmaWVz IHRoZSB1bml0LXRlc3Rpbmcgb2YgcGF0Y2gtY2hlY2tpbmcgY29kZS4KKworICAgICAgICAqIFNj cmlwdHMvY2hlY2std2Via2l0LXN0eWxlOgorICAgICAgICAgIC0gVXBkYXRlZCB0byB1c2UgdGhl IG5ldyBQYXRjaENoZWNrZXIgY2xhc3MuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXIucHk6CisgICAgICAgICAgLSBSZWZhY3RvcmVkIHRoZSBTdHlsZUNoZWNrZXIu Y2hlY2tfcGF0Y2goKSBtZXRob2QgaW50byB0aGUKKyAgICAgICAgICAgIGNoZWNrKCkgbWV0aG9k IG9mIGEgbmV3IFBhdGNoQ2hlY2tlciBjbGFzcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weToKKyAgICAgICAgICAtIFJlZmFjdG9yZWQgdGhl IHVuaXQgdGVzdHMgYXMgbmVjZXNzYXJ5LCBjaGFuZ2luZyB0aGUKKyAgICAgICAgICAgIFN0eWxl Q2hlY2tlckNoZWNrUGF0Y2hUZXN0IGNsYXNzIHRvIGEgUGF0Y2hDaGVja2VyVGVzdCBjbGFzcy4K KwogMjAxMC0wNC0xMSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL2NoZWNrLXdlYmtpdC1zdHlsZSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvY2hlY2std2Vi a2l0LXN0eWxlCmluZGV4IDk1ZmZmNzkuLjk4OTdmYmQgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvY2hl Y2std2Via2l0LXN0eWxlCkBAIC00OSw4ICs0OSw5IEBAIGltcG9ydCBvcy5wYXRoCiBpbXBvcnQg c3lzCiAKIGZyb20gd2Via2l0cHkuc3R5bGVfcmVmZXJlbmNlcyBpbXBvcnQgZGV0ZWN0X2NoZWNr b3V0Ci1mcm9tIHdlYmtpdHB5LnN0eWxlLm1haW4gaW1wb3J0IGNoYW5nZV9kaXJlY3RvcnkKIGlt cG9ydCB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGFzIGNoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5 bGUuY2hlY2tlciBpbXBvcnQgUGF0Y2hDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLm1haW4g aW1wb3J0IGNoYW5nZV9kaXJlY3RvcnkKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJjaGVj ay13ZWJraXQtc3R5bGUiKQogCkBAIC0xMTMsNyArMTE0LDggQEAgZGVmIG1haW4oKToKICAgICAg ICAgICAgIHBhdGNoID0gY2hlY2tvdXQuY3JlYXRlX3BhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdChv cHRpb25zLmdpdF9jb21taXQpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBwYXRjaCA9IGNo ZWNrb3V0LmNyZWF0ZV9wYXRjaCgpCi0gICAgICAgIHN0eWxlX2NoZWNrZXIuY2hlY2tfcGF0Y2go cGF0Y2gpCisgICAgICAgIHBhdGNoX2NoZWNrZXIgPSBQYXRjaENoZWNrZXIoc3R5bGVfY2hlY2tl cikKKyAgICAgICAgcGF0Y2hfY2hlY2tlci5jaGVjayhwYXRjaCkKIAogICAgIGVycm9yX2NvdW50 ID0gc3R5bGVfY2hlY2tlci5lcnJvcl9jb3VudAogICAgIGZpbGVfY291bnQgPSBzdHlsZV9jaGVj a2VyLmZpbGVfY291bnQKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlci5weQppbmRleCAyNThhMGIzLi4yNDlhYjRjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CkBAIC03MDcsMjMgKzcwNywyNiBAQCBjbGFzcyBT dHlsZUNoZWNrZXIob2JqZWN0KToKIAogICAgICAgICBwcm9jZXNzX2ZpbGUocHJvY2Vzc29yLCBm aWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKIAotICAgICMgRklYTUU6IEVsaW1pbmF0ZSB0 aGlzIG1ldGhvZCBhbmQgbW92ZSBpdHMgbG9naWMgdG8gc3R5bGUvbWFpbi5weS4KLSAgICAjICAg ICAgICBDYWxscyB0byBjaGVja19wYXRjaCgpIGNhbiBiZSByZXBsYWNlZCBieSBhcHByb3ByaWF0 ZSBjYWxscwotICAgICMgICAgICAgIHRvIGNoZWNrX2ZpbGUoKSB1c2luZyB0aGUgb3B0aW9uYWwg bGluZV9udW1iZXJzIHBhcmFtZXRlci4KLSAgICBkZWYgY2hlY2tfcGF0Y2goc2VsZiwgcGF0Y2hf c3RyaW5nLCBtb2NrX2NoZWNrX2ZpbGU9Tm9uZSk6Ci0gICAgICAgICIiIkNoZWNrIHN0eWxlIGlu IHRoZSBnaXZlbiBwYXRjaC4KKworY2xhc3MgUGF0Y2hDaGVja2VyKG9iamVjdCk6CisKKyAgICAi IiJTdXBwb3J0cyBjaGVja2luZyBzdHlsZSBpbiBwYXRjaGVzLiIiIgorCisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHN0eWxlX2NoZWNrZXIpOgorICAgICAgICAiIiJDcmVhdGUgYSBQYXRjaENoZWNr ZXIgaW5zdGFuY2UuCiAKICAgICAgICAgQXJnczoKLSAgICAgICAgICBwYXRjaF9zdHJpbmc6IEEg c3RyaW5nIHRoYXQgaXMgYSBwYXRjaCBzdHJpbmcuCisgICAgICAgICAgc3R5bGVfY2hlY2tlcjog QSBTdHlsZUNoZWNrZXIgaW5zdGFuY2UuCiAKICAgICAgICAgIiIiCi0gICAgICAgIGNoZWNrX2Zp bGUgPSAoc2VsZi5jaGVja19maWxlIGlmIG1vY2tfY2hlY2tfZmlsZSBpcyBOb25lIGVsc2UKLSAg ICAgICAgICAgICAgICAgICAgICBtb2NrX2NoZWNrX2ZpbGUpCisgICAgICAgIHNlbGYuX2ZpbGVf Y2hlY2tlciA9IHN0eWxlX2NoZWNrZXIKIAorICAgIGRlZiBjaGVjayhzZWxmLCBwYXRjaF9zdHJp bmcpOgorICAgICAgICAiIiJDaGVjayBzdHlsZSBpbiB0aGUgZ2l2ZW4gcGF0Y2guIiIiCiAgICAg ICAgIHBhdGNoX2ZpbGVzID0gcGFyc2VfcGF0Y2gocGF0Y2hfc3RyaW5nKQogCiAgICAgICAgICMg VGhlIGRpZmYgdmFyaWFibGUgaXMgYSBEaWZmRmlsZSBpbnN0YW5jZS4KLSAgICAgICAgZm9yIGZp bGVfcGF0aCwgZGlmZiBpbiBwYXRjaF9maWxlcy5pdGVyaXRlbXMoKToKKyAgICAgICAgZm9yIHBh dGgsIGRpZmYgaW4gcGF0Y2hfZmlsZXMuaXRlcml0ZW1zKCk6CiAgICAgICAgICAgICBsaW5lX251 bWJlcnMgPSBzZXQoKQogICAgICAgICAgICAgZm9yIGxpbmUgaW4gZGlmZi5saW5lczoKICAgICAg ICAgICAgICAgICAjIFdoZW4gZGVsZXRlZCBsaW5lIGlzIG5vdCBzZXQsIGl0IG1lYW5zIHRoYXQK QEAgLTczMSw3ICs3MzQsOCBAQCBjbGFzcyBTdHlsZUNoZWNrZXIob2JqZWN0KToKICAgICAgICAg ICAgICAgICBpZiBub3QgbGluZVswXToKICAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJz LmFkZChsaW5lWzFdKQogCi0gICAgICAgICAgICBfbG9nLmRlYnVnKCdGb3VuZCAlcyBtb2RpZmll ZCBsaW5lcyBpbiBwYXRjaCBmb3I6ICVzJwotICAgICAgICAgICAgICAgICAgICAgICAlIChsZW4o bGluZV9udW1iZXJzKSwgZmlsZV9wYXRoKSkKKyAgICAgICAgICAgIF9sb2cuZGVidWcoJ0ZvdW5k ICVzIG5ldyBvciBtb2RpZmllZCBsaW5lcyBpbjogJXMnCisgICAgICAgICAgICAgICAgICAgICAg ICUgKGxlbihsaW5lX251bWJlcnMpLCBwYXRoKSkKIAotICAgICAgICAgICAgY2hlY2tfZmlsZShm aWxlX3BhdGg9ZmlsZV9wYXRoLCBsaW5lX251bWJlcnM9bGluZV9udW1iZXJzKQorICAgICAgICAg ICAgc2VsZi5fZmlsZV9jaGVja2VyLmNoZWNrX2ZpbGUoZmlsZV9wYXRoPXBhdGgsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaW5lX251bWJlcnM9bGluZV9udW1i ZXJzKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyX3VuaXR0ZXN0LnB5CmluZGV4IGZkMjg5YWEuLmU2NDU3ZjIgMTAwNzU1Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKQEAg LTUwLDYgKzUwLDcgQEAgZnJvbSBjaGVja2VyIGltcG9ydCBjaGVja193ZWJraXRfc3R5bGVfY29u ZmlndXJhdGlvbgogZnJvbSBjaGVja2VyIGltcG9ydCBjaGVja193ZWJraXRfc3R5bGVfcGFyc2Vy CiBmcm9tIGNoZWNrZXIgaW1wb3J0IGNvbmZpZ3VyZV9sb2dnaW5nCiBmcm9tIGNoZWNrZXIgaW1w b3J0IFByb2Nlc3NvckRpc3BhdGNoZXIKK2Zyb20gY2hlY2tlciBpbXBvcnQgUGF0Y2hDaGVja2Vy CiBmcm9tIGNoZWNrZXIgaW1wb3J0IFN0eWxlQ2hlY2tlcgogZnJvbSBjaGVja2VyIGltcG9ydCBT dHlsZUNoZWNrZXJDb25maWd1cmF0aW9uCiBmcm9tIGZpbHRlciBpbXBvcnQgdmFsaWRhdGVfZmls dGVyX3J1bGVzCkBAIC02OTgsNjEgKzY5OSw2IEBAIGNsYXNzIFN0eWxlQ2hlY2tlckNoZWNrRmls ZVRlc3QoU3R5bGVDaGVja2VyQ2hlY2tGaWxlQmFzZSk6CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIiIpCiAKIAotY2xhc3MgU3R5bGVDaGVja2VyQ2hlY2tQYXRjaFRlc3QoU3R5bGVD aGVja2VyQ2hlY2tGaWxlQmFzZSk6Ci0KLSAgICAiIiJUZXN0IHRoZSBjaGVja19wYXRjaCgpIG1l dGhvZCBvZiB0aGUgU3R5bGVDaGVja2VyIGNsYXNzLgotCi0gICAgSW50ZXJuYWxseSwgdGhlIGNo ZWNrX3BhdGNoKCkgbWV0aG9kIGNhbGxzIFN0eWxlQ2hlY2tlci5jaGVja19maWxlKCkgZm9yCi0g ICAgZWFjaCBmaWxlIHRoYXQgYXBwZWFycyBpbiB0aGUgcGF0Y2ggc3RyaW5nLiAgVGhpcyBjbGFz cyBwYXNzZXMgYSBtb2NrCi0gICAgY2hlY2tfZmlsZSgpIG1ldGhvZCB0byBjaGVja19wYXRjaCgp IHRvIGZhY2lsaXRhdGUgdW5pdC10ZXN0aW5nLiAgVGhlCi0gICAgImdvdF8qIiBhdHRyaWJ1dGVz IG9mIHRoaXMgY2xhc3MgYXJlIHRoZSBwYXJhbWV0ZXJzIHRoYXQgY2hlY2tfcGF0Y2goKQotICAg IHBhc3NlZCB0byBjaGVja19maWxlKCkuICAoV2UgdGVzdCBvbmx5IGEgc2luZ2xlIGNhbGwuKSAg VGhlc2UgYXR0cmlidXRlcwotICAgIGxldCB1cyBjaGVjayB0aGF0IGNoZWNrX3BhdGNoKCkgaXMg Y2FsbGluZyBjaGVja19maWxlKCkgY29ycmVjdGx5LgotCi0gICAgQXR0cmlidXRlczoKLSAgICAg IGdvdF9maWxlX3BhdGg6IFRoZSB2YWx1ZSB0aGF0IGNoZWNrX3BhdGNoKCkgcGFzc2VkIGFzIHRo ZSBmaWxlX3BhdGgKLSAgICAgICAgICAgICAgICAgICAgIHBhcmFtZXRlciB0byB0aGUgbW9ja19j aGVja19maWxlKCkgZnVuY3Rpb24uCi0gICAgICBnb3RfbGluZV9udW1iZXJzOiBUaGUgdmFsdWUg dGhhdCBjaGVja19wYXRjaCgpIHBhc3NlZCBhcyB0aGUgbGluZV9udW1iZXJzCi0gICAgICAgICAg ICAgICAgICAgICAgICBwYXJhbWV0ZXIgdG8gdGhlIG1vY2tfY2hlY2tfZmlsZSgpIGZ1bmN0aW9u LgotCi0gICAgIiIiCi0KLSAgICBfZmlsZV9wYXRoID0gIl9faW5pdF9fLnB5IgotCi0gICAgIyBU aGUgbW9kaWZpZWQgbGluZV9udW1iZXJzIGFycmF5IGZvciB0aGlzIHBhdGNoIGlzOiBbMl0uCi0g ICAgX3BhdGNoX3N0cmluZyA9ICIiImRpZmYgLS1naXQgYS9fX2luaXRfXy5weSBiL19faW5pdF9f LnB5Ci1pbmRleCBlZjY1YmVlLi5lM2RiNzBlIDEwMDY0NAotLS0tIGEvX19pbml0X18ucHkKLSsr KyBiL19faW5pdF9fLnB5Ci1AQCAtMSwxICsxLDIgQEAKLSAjIFJlcXVpcmVkIGZvciBQeXRob24g dG8gc2VhcmNoIHRoaXMgZGlyZWN0b3J5IGZvciBtb2R1bGUgZmlsZXMKLSsjIE5ldyBsaW5lCi0i IiIKLQotICAgIGRlZiBzZXRVcChzZWxmKToKLSAgICAgICAgU3R5bGVDaGVja2VyQ2hlY2tGaWxl QmFzZS5zZXRVcChzZWxmKQotICAgICAgICBzZWxmLl9nb3RfZmlsZV9wYXRoID0gTm9uZQotICAg ICAgICBzZWxmLl9nb3RfbGluZV9udW1iZXJzID0gTm9uZQotCi0gICAgZGVmIF9tb2NrX2NoZWNr X2ZpbGUoc2VsZiwgZmlsZV9wYXRoLCBsaW5lX251bWJlcnMpOgotICAgICAgICBzZWxmLl9nb3Rf ZmlsZV9wYXRoID0gZmlsZV9wYXRoCi0gICAgICAgIHNlbGYuX2dvdF9saW5lX251bWJlcnMgPSBs aW5lX251bWJlcnMKLQotICAgIGRlZiB0ZXN0X2NoZWNrX3BhdGNoKHNlbGYpOgotICAgICAgICBw YXRjaF9maWxlcyA9IHBhcnNlX3BhdGNoKHNlbGYuX3BhdGNoX3N0cmluZykKLSAgICAgICAgZGlm ZiA9IHBhdGNoX2ZpbGVzW3NlbGYuX2ZpbGVfcGF0aF0KLQotICAgICAgICBjb25maWd1cmF0aW9u ID0gc2VsZi5fc3R5bGVfY2hlY2tlcl9jb25maWd1cmF0aW9uKCkKLQotICAgICAgICBzdHlsZV9j aGVja2VyID0gU3R5bGVDaGVja2VyKGNvbmZpZ3VyYXRpb24pCi0KLSAgICAgICAgc3R5bGVfY2hl Y2tlci5jaGVja19wYXRjaChwYXRjaF9zdHJpbmc9c2VsZi5fcGF0Y2hfc3RyaW5nLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1vY2tfY2hlY2tfZmlsZT1zZWxmLl9tb2NrX2No ZWNrX2ZpbGUpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5fZ290X2ZpbGVfcGF0 aCwgIl9faW5pdF9fLnB5IikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5fZ290X2xp bmVfbnVtYmVycywgc2V0KFsyXSkpCi0KLQogY2xhc3MgU3R5bGVDaGVja2VyQ2hlY2tQYXRoc1Rl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgIiIiVGVzdCB0aGUgY2hlY2tfcGF0aHMoKSBt ZXRob2Qgb2YgdGhlIFN0eWxlQ2hlY2tlciBjbGFzcy4iIiIKQEAgLTc5OSwzICs3NDUsNDAgQEAg Y2xhc3MgU3R5bGVDaGVja2VyQ2hlY2tQYXRoc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKCJkaXJfcGF0aDEiLCAiZmlsZTEi KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbigiZGlyX3BhdGgxIiwg ImZpbGUyIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4oImRpcl9w YXRoMiIsICJmaWxlMyIpXSkKKworCitjbGFzcyBQYXRjaENoZWNrZXJUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKKworICAgICIiIlRlc3QgdGhlIFBhdGNoQ2hlY2tlciBjbGFzcy4iIiIKKworICAg IGNsYXNzIE1vY2tTdHlsZUNoZWNrZXIob2JqZWN0KToKKworICAgICAgICBkZWYgX19pbml0X18o c2VsZik6CisgICAgICAgICAgICBzZWxmLmNoZWNrZWRfZmlsZXMgPSBbXQorICAgICAgICAgICAg IiIiQSBsaXN0IG9mIChmaWxlX3BhdGgsIGxpbmVfbnVtYmVycykgcGFpcnMuIiIiCisKKyAgICAg ICAgZGVmIGNoZWNrX2ZpbGUoc2VsZiwgZmlsZV9wYXRoLCBsaW5lX251bWJlcnMpOgorICAgICAg ICAgICAgc2VsZi5jaGVja2VkX2ZpbGVzLmFwcGVuZCgoZmlsZV9wYXRoLCBsaW5lX251bWJlcnMp KQorCisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzdHlsZV9jaGVja2VyID0gc2VsZi5N b2NrU3R5bGVDaGVja2VyKCkKKyAgICAgICAgc2VsZi5fc3R5bGVfY2hlY2tlciA9IHN0eWxlX2No ZWNrZXIKKyAgICAgICAgc2VsZi5fcGF0Y2hfY2hlY2tlciA9IFBhdGNoQ2hlY2tlcihzdHlsZV9j aGVja2VyKQorCisgICAgZGVmIF9jYWxsX2NoZWNrX3BhdGNoKHNlbGYsIHBhdGNoX3N0cmluZyk6 CisgICAgICAgIHNlbGYuX3BhdGNoX2NoZWNrZXIuY2hlY2socGF0Y2hfc3RyaW5nKQorCisgICAg ZGVmIF9hc3NlcnRfY2hlY2tlZChzZWxmLCBjaGVja2VkX2ZpbGVzKToKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoc2VsZi5fc3R5bGVfY2hlY2tlci5jaGVja2VkX2ZpbGVzLCBjaGVja2VkX2Zp bGVzKQorCisgICAgZGVmIHRlc3RfY2hlY2tfcGF0Y2goc2VsZik6CisgICAgICAgICMgVGhlIG1v ZGlmaWVkIGxpbmVfbnVtYmVycyBhcnJheSBmb3IgdGhpcyBwYXRjaCBpczogWzJdLgorICAgICAg ICBzZWxmLl9jYWxsX2NoZWNrX3BhdGNoKCIiImRpZmYgLS1naXQgYS9fX2luaXRfXy5weSBiL19f aW5pdF9fLnB5CitpbmRleCBlZjY1YmVlLi5lM2RiNzBlIDEwMDY0NAorLS0tIGEvX19pbml0X18u cHkKKysrKyBiL19faW5pdF9fLnB5CitAQCAtMSwxICsxLDIgQEAKKyAjIFJlcXVpcmVkIGZvciBQ eXRob24gdG8gc2VhcmNoIHRoaXMgZGlyZWN0b3J5IGZvciBtb2R1bGUgZmlsZXMKKysjIE5ldyBs aW5lCisiIiIpCisgICAgICAgIHNlbGYuX2Fzc2VydF9jaGVja2VkKFsoIl9faW5pdF9fLnB5Iiwg c2V0KFsyXSkpXSkK