74257 2011-12-11 15:56:22 -0800 [Refactoring] In prepare-ChangeLog, move top-level code to resolve conflicted ChangeLogs into a method 2011-12-12 08:47:41 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 1 haraken haraken aroben ddkilzer rniwa webkit.review.bot oldest_to_newest 518932 0 haraken 2011-12-11 15:56:22 -0800 We are planning to write unit-tests for prepare-ChangeLog in a run-leaks_unittest/ manner. This bug is one of the incremental refactorings to remove all top-level code and global variables from prepare-ChangeLog. 518935 1 118716 haraken 2011-12-11 16:04:53 -0800 Created attachment 118716 Patch 518992 2 118716 rniwa 2011-12-11 20:51:46 -0800 Comment on attachment 118716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118716&action=review > Tools/ChangeLog:13 > + * Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs into resolveConflictedChangeLogs(). This line seems too long. Please add line breaks as needed. > Tools/Scripts/prepare-ChangeLog:458 > + if (@conflictedChangeLogs) { It seems like we can exit early here. 518997 3 118728 haraken 2011-12-11 21:09:53 -0800 Created attachment 118728 rebased patch for commit 518998 4 haraken 2011-12-11 21:11:19 -0800 (In reply to comment #2) > (From update of attachment 118716 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118716&action=review > > > Tools/ChangeLog:13 > > + * Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs into resolveConflictedChangeLogs(). > > This line seems too long. Please add line breaks as needed. Done. > > Tools/Scripts/prepare-ChangeLog:458 > > + if (@conflictedChangeLogs) { > > It seems like we can exit early here. Done. 519031 5 118728 webkit.review.bot 2011-12-11 23:08:12 -0800 Comment on attachment 118728 rebased patch for commit Clearing flags on attachment: 118728 Committed r102559: <http://trac.webkit.org/changeset/102559> 519237 6 ddkilzer 2011-12-12 08:47:41 -0800 Manually marking as RESOLVED/FIXED since the bot didn't seem to do it. 118716 2011-12-11 16:04:53 -0800 2011-12-11 20:51:46 -0800 Patch bug-74257-20111212090452.patch text/plain 5253 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWQxNTlmNGI0NDhhZGVjZTczMjJjMDYyM2Q3NWJhOTQ2 MWQ1MDdkYi4uMGVkNTU3MWIwNDZkMTY4OWRjZTBmNDZiZTUzMDVkNTVjNTVjZGJiZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIx IEBACiAyMDExLTEyLTExICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIE1vdmUgdG9wLWxldmVsIGNvZGUgdG8gcmVzb2x2ZSBjb25m bGljdGVkIENoYW5nZUxvZ3MgaW50byBhIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQyNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgcGxhbm5pbmcgdG8gd3JpdGUgdW5pdC10ZXN0 cyBmb3IgcHJlcGFyZS1DaGFuZ2VMb2cKKyAgICAgICAgaW4gYSBydW4tbGVha3NfdW5pdHRlc3Qv IG1hbm5lci4gVGhpcyBwYXRjaCBpcyBvbmUgb2YgdGhlIGluY3JlbWVudGFsCisgICAgICAgIHJl ZmFjdG9yaW5ncyB0byByZW1vdmUgYWxsIHRvcC1sZXZlbCBjb2RlIGFuZCBnbG9iYWwgdmFyaWFi bGVzIGZyb20KKyAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cuCisKKyAgICAgICAgKiBTY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nOiBNb3ZlZCB0b3AtbGV2ZWwgY29kZSB0byBnZXQgdGhlIGxhdGVz dCBDaGFuZ2VMb2dzIGludG8gZ2V0TGF0ZXN0Q2hhbmdlTG9ncygpLCBhbmQgbW92ZWQgdG9wLWxl dmVsIGNvZGUgdG8gcmVzb2x2ZSBjb25mbGljdGVkIENoYW5nZUxvZ3MgaW50byByZXNvbHZlQ29u ZmxpY3RlZENoYW5nZUxvZ3MoKS4KKyAgICAgICAgKGdldExhdGVzdENoYW5nZUxvZ3MpOgorICAg ICAgICAocmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKToKKworMjAxMS0xMi0xMSAgS2VudGFy byBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW1JlZmFjdG9yaW5nXSBN b3ZlIHRvcC1sZXZlbCBjb2RlIHRvIGdlbmVyYXRlIGEgbmV3IENoYW5nZUxvZyBpbnRvIGEgbWV0 aG9kCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDI1 MwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA2ZjliYWQyN2VmOWY1NTU5ZDQ3ODc2M2Mx MzJkY2YyZTU3ZThlNDg4Li43OTc3MDVlYTYwMjRmYTJhODA3ZTJiMTU4YTMyZGU4Y2Y0ZjlhMzA2 IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTY5LDYgKzY5LDggQEAgc3ViIGNoYW5nZUxv Z0VtYWlsQWRkcmVzc0Zyb21BcmdzKCQpOwogc3ViIGNoYW5nZUxvZ05hbWVGcm9tQXJncygkKTsK IHN1YiBmZXRjaEJ1Z0Rlc2NyaXB0aW9uRnJvbVVSTCgkKTsKIHN1YiBmaW5kQ2hhbmdlTG9ncyhc JSk7CitzdWIgZ2V0TGF0ZXN0Q2hhbmdlTG9ncygkKTsKK3N1YiByZXNvbHZlQ29uZmxpY3RlZENo YW5nZUxvZ3MoJCk7CiBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJFwlKTsKIHN1YiBmaXJz dERpcmVjdG9yeU9yQ3dkKCk7CiBzdWIgZGlmZkZyb21Ub1N0cmluZygpOwpAQCAtMjA1LDMwICsy MDcsMTAgQEAgaWYgKCRidWdOdW1iZXIgJiYgISRidWdEZXNjcmlwdGlvbikgewogbXkgKCRmaWxl c0luQ2hhbmdlTG9nLCAkcHJlZml4ZXMpID0gZmluZENoYW5nZUxvZ3MoJWZ1bmN0aW9uTGlzdHMp OwogCiAjIEdldCB0aGUgbGF0ZXN0IENoYW5nZUxvZyBmaWxlcyBmcm9tIHN2bi4KLW15IEBsb2dz ID0gKCk7Ci1mb3JlYWNoIG15ICRwcmVmaXggKEAkcHJlZml4ZXMpIHsKLSAgICBwdXNoIEBsb2dz LCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7Ci19Ci0K LWlmIChAbG9ncyAmJiAkdXBkYXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKLSAgICBwcmludCBT VERFUlIgIiAgUnVubmluZyAnc3ZuIHVwZGF0ZScgdG8gdXBkYXRlIENoYW5nZUxvZyBmaWxlcy5c biI7Ci0gICAgb3BlbiBFUlJPUlMsICItfCIsICRTVk4sICJ1cGRhdGUiLCBAbG9ncwotICAgICAg ICBvciBkaWUgIlRoZSBzdm4gdXBkYXRlIG9mIENoYW5nZUxvZyBmaWxlcyBmYWlsZWQ6ICQhLlxu IjsKLSAgICBteSBAY29uZmxpY3RlZENoYW5nZUxvZ3M7Ci0gICAgd2hpbGUgKG15ICRsaW5lID0g PEVSUk9SUz4pIHsKLSAgICAgICAgcHJpbnQgU1RERVJSICIgICAgIiwgJGxpbmU7Ci0gICAgICAg IHB1c2ggQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzLCAkMSBpZiAkbGluZSA9fiBtL15DXHMrKC4rPylb XHJcbl0qJC87Ci0gICAgfQotICAgIGNsb3NlIEVSUk9SUzsKK215ICRjaGFuZ2VMb2dzID0gZ2V0 TGF0ZXN0Q2hhbmdlTG9ncygkcHJlZml4ZXMpOwogCi0gICAgaWYgKEBjb25mbGljdGVkQ2hhbmdl TG9ncykgewotICAgICAgICBwcmludCBTVERFUlIgIiAgQXR0ZW1wdGluZyB0byBtZXJnZSBjb25m bGljdGVkIENoYW5nZUxvZ3MuXG4iOwotICAgICAgICBteSAkcmVzb2x2ZUNoYW5nZUxvZ3NQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShkaXJuYW1lKCQwKSwgInJlc29sdmUtQ2hhbmdlTG9ncyIp OwotICAgICAgICBvcGVuIFJFU09MVkUsICItfCIsICRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsICIt LW5vLXdhcm5pbmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzCi0gICAgICAgICAgICBvciBkaWUg IkNvdWxkIG5vdCBvcGVuIHJlc29sdmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKLSAgICAg ICAgcHJpbnQgU1RERVJSICIgICAgJF8iIHdoaWxlIDxSRVNPTFZFPjsKLSAgICAgICAgY2xvc2Ug UkVTT0xWRTsKLSAgICB9CitpZiAoQCRjaGFuZ2VMb2dzICYmICR1cGRhdGVDaGFuZ2VMb2dzICYm ICRpc1NWTikgeworICAgIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkY2hhbmdlTG9ncyk7 CiB9CiAKIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkcHJlZml4ZXMsICRmaWxlc0luQ2hhbmdlTG9n LCAkYWRkZWRSZWdyZXNzaW9uVGVzdHMsICVmdW5jdGlvbkxpc3RzKTsKQEAgLTI0NywxNyArMjI5 LDE3IEBAIGlmICgkc3Bld0RpZmYgJiYgQGNoYW5nZWRfZmlsZXMpIHsKIH0KIAogIyBPcGVuIENo YW5nZUxvZ3MuCi1pZiAoJG9wZW5DaGFuZ2VMb2dzICYmIEBsb2dzKSB7CitpZiAoJG9wZW5DaGFu Z2VMb2dzICYmIEAkY2hhbmdlTG9ncykgewogICAgIHByaW50IFNUREVSUiAiICBPcGVuaW5nIHRo ZSBlZGl0ZWQgQ2hhbmdlTG9nIGZpbGVzLlxuIjsKICAgICBteSAkZWRpdG9yID0gJEVOVntDSEFO R0VfTE9HX0VESVRPUn07CiAgICAgaWYgKCRlZGl0b3IpIHsKLSAgICAgICAgc3lzdGVtICgoc3Bs aXQgJyAnLCAkZWRpdG9yKSwgQGxvZ3MpOworICAgICAgICBzeXN0ZW0gKChzcGxpdCAnICcsICRl ZGl0b3IpLCBAJGNoYW5nZUxvZ3MpOwogICAgIH0gZWxzZSB7CiAgICAgICAgICRlZGl0b3IgPSAk RU5We0NIQU5HRV9MT0dfRURJVF9BUFBMSUNBVElPTn07CiAgICAgICAgIGlmICgkZWRpdG9yKSB7 Ci0gICAgICAgICAgICBzeXN0ZW0gIm9wZW4iLCAiLWEiLCAkZWRpdG9yLCBAbG9nczsKKyAgICAg ICAgICAgIHN5c3RlbSAib3BlbiIsICItYSIsICRlZGl0b3IsIEAkY2hhbmdlTG9nczsKICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHN5c3RlbSAib3BlbiIsICItZSIsIEBsb2dzOworICAg ICAgICAgICAgc3lzdGVtICJvcGVuIiwgIi1lIiwgQCRjaGFuZ2VMb2dzOwogICAgICAgICB9CiAg ICAgfQogfQpAQCAtNDQ4LDYgKzQzMCw0MSBAQCBzdWIgZmluZENoYW5nZUxvZ3MoXCUpCiAgICAg cmV0dXJuIChcJWZpbGVzSW5DaGFuZ2VMb2csIFxAcHJlZml4ZXMpOwogfQogCitzdWIgZ2V0TGF0 ZXN0Q2hhbmdlTG9ncygkKQoreworICAgIG15ICgkcHJlZml4ZXMpID0gQF87CisKKyAgICBteSBA Y2hhbmdlTG9ncyA9ICgpOworICAgIGZvcmVhY2ggbXkgJHByZWZpeCAoQCRwcmVmaXhlcykgewor ICAgICAgICBwdXNoIEBjaGFuZ2VMb2dzLCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXggfHwg Ii4iLCAiQ2hhbmdlTG9nIik7CisgICAgfQorICAgIHJldHVybiBcQGNoYW5nZUxvZ3M7Cit9CisK K3N1YiByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCkKK3sKKyAgICBteSAoJGNoYW5nZUxv Z3MpID0gQF87CisKKyAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyAnc3ZuIHVwZGF0ZScgdG8g dXBkYXRlIENoYW5nZUxvZyBmaWxlcy5cbiI7CisgICAgb3BlbiBFUlJPUlMsICItfCIsICRTVk4s ICJ1cGRhdGUiLCBAJGNoYW5nZUxvZ3MKKyAgICAgICAgb3IgZGllICJUaGUgc3ZuIHVwZGF0ZSBv ZiBDaGFuZ2VMb2cgZmlsZXMgZmFpbGVkOiAkIS5cbiI7CisgICAgbXkgQGNvbmZsaWN0ZWRDaGFu Z2VMb2dzOworICAgIHdoaWxlIChteSAkbGluZSA9IDxFUlJPUlM+KSB7CisgICAgICAgIHByaW50 IFNUREVSUiAiICAgICIsICRsaW5lOworICAgICAgICBwdXNoIEBjb25mbGljdGVkQ2hhbmdlTG9n cywgJDEgaWYgJGxpbmUgPX4gbS9eQ1xzKyguKz8pW1xyXG5dKiQvOworICAgIH0KKyAgICBjbG9z ZSBFUlJPUlM7CisKKyAgICBpZiAoQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSB7CisgICAgICAgIHBy aW50IFNUREVSUiAiICBBdHRlbXB0aW5nIHRvIG1lcmdlIGNvbmZsaWN0ZWQgQ2hhbmdlTG9ncy5c biI7CisgICAgICAgIG15ICRyZXNvbHZlQ2hhbmdlTG9nc1BhdGggPSBGaWxlOjpTcGVjLT5jYXRm aWxlKGRpcm5hbWUoJDApLCAicmVzb2x2ZS1DaGFuZ2VMb2dzIik7CisgICAgICAgIG9wZW4gUkVT T0xWRSwgIi18IiwgJHJlc29sdmVDaGFuZ2VMb2dzUGF0aCwgIi0tbm8td2FybmluZ3MiLCBAY29u ZmxpY3RlZENoYW5nZUxvZ3MKKyAgICAgICAgICAgIG9yIGRpZSAiQ291bGQgbm90IG9wZW4gcmVz b2x2ZS1DaGFuZ2VMb2dzIHNjcmlwdDogJCEuXG4iOworICAgICAgICBwcmludCBTVERFUlIgIiAg ICAkXyIgd2hpbGUgPFJFU09MVkU+OworICAgICAgICBjbG9zZSBSRVNPTFZFOworICAgIH0KK30K Kwogc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCRcJSkKIHsKICAgICBteSAoJHByZWZpeGVz LCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAkZnVuY3Rpb25MaXN0 cykgPSBAXzsK 118728 2011-12-11 21:09:53 -0800 2011-12-11 23:08:12 -0800 rebased patch for commit bug-74257-20111212140951.patch text/plain 5245 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWQxNTlmNGI0NDhhZGVjZTczMjJjMDYyM2Q3NWJhOTQ2 MWQ1MDdkYi4uYTcwMWM3YWY3MjY4Y2UwMWY3YTU1ODliMGVkYjg3ZmYzYzk0NzdlZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIz IEBACiAyMDExLTEyLTExICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIE1vdmUgdG9wLWxldmVsIGNvZGUgdG8gcmVzb2x2ZSBjb25m bGljdGVkIENoYW5nZUxvZ3MgaW50byBhIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQyNTcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9z dWtlIE5pd2EuCisKKyAgICAgICAgV2UgYXJlIHBsYW5uaW5nIHRvIHdyaXRlIHVuaXQtdGVzdHMg Zm9yIHByZXBhcmUtQ2hhbmdlTG9nCisgICAgICAgIGluIGEgcnVuLWxlYWtzX3VuaXR0ZXN0LyBt YW5uZXIuIFRoaXMgcGF0Y2ggaXMgb25lIG9mIHRoZSBpbmNyZW1lbnRhbAorICAgICAgICByZWZh Y3RvcmluZ3MgdG8gcmVtb3ZlIGFsbCB0b3AtbGV2ZWwgY29kZSBhbmQgZ2xvYmFsIHZhcmlhYmxl cyBmcm9tCisgICAgICAgIHByZXBhcmUtQ2hhbmdlTG9nLgorCisgICAgICAgICogU2NyaXB0cy9w cmVwYXJlLUNoYW5nZUxvZzogTW92ZWQgdG9wLWxldmVsIGNvZGUgdG8gZ2V0IHRoZSBsYXRlc3Qg Q2hhbmdlTG9ncworICAgICAgICBpbnRvIGdldExhdGVzdENoYW5nZUxvZ3MoKSwgYW5kIG1vdmVk IHRvcC1sZXZlbCBjb2RlIHRvIHJlc29sdmUgY29uZmxpY3RlZCBDaGFuZ2VMb2dzCisgICAgICAg IGludG8gcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCkuCisgICAgICAgIChnZXRMYXRlc3RD aGFuZ2VMb2dzKToKKyAgICAgICAgKHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncyk6CisKKzIw MTEtMTItMTEgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAg IFtSZWZhY3RvcmluZ10gTW92ZSB0b3AtbGV2ZWwgY29kZSB0byBnZW5lcmF0ZSBhIG5ldyBDaGFu Z2VMb2cgaW50byBhIG1ldGhvZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzQyNTMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNo YW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggNmY5YmFkMjdl ZjlmNTU1OWQ0Nzg3NjNjMTMyZGNmMmU1N2U4ZTQ4OC4uYjVkMmE3ZDgyMzI3Yjk0NmIxZWIyYWY0 ZDBlM2Q1YmMzZmRkNzgyNyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5n ZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC02OSw2ICs2OSw4 IEBAIHN1YiBjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9tQXJncygkKTsKIHN1YiBjaGFuZ2VMb2dO YW1lRnJvbUFyZ3MoJCk7CiBzdWIgZmV0Y2hCdWdEZXNjcmlwdGlvbkZyb21VUkwoJCk7CiBzdWIg ZmluZENoYW5nZUxvZ3MoXCUpOworc3ViIGdldExhdGVzdENoYW5nZUxvZ3MoJCk7CitzdWIgcmVz b2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpOwogc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygk JCRcJSk7CiBzdWIgZmlyc3REaXJlY3RvcnlPckN3ZCgpOwogc3ViIGRpZmZGcm9tVG9TdHJpbmco KTsKQEAgLTIwNSwzMCArMjA3LDEwIEBAIGlmICgkYnVnTnVtYmVyICYmICEkYnVnRGVzY3JpcHRp b24pIHsKIG15ICgkZmlsZXNJbkNoYW5nZUxvZywgJHByZWZpeGVzKSA9IGZpbmRDaGFuZ2VMb2dz KCVmdW5jdGlvbkxpc3RzKTsKIAogIyBHZXQgdGhlIGxhdGVzdCBDaGFuZ2VMb2cgZmlsZXMgZnJv bSBzdm4uCi1teSBAbG9ncyA9ICgpOwotZm9yZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7 Ci0gICAgcHVzaCBAbG9ncywgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwgIkNo YW5nZUxvZyIpOwotfQotCi1pZiAoQGxvZ3MgJiYgJHVwZGF0ZUNoYW5nZUxvZ3MgJiYgJGlzU1ZO KSB7Ci0gICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgJ3N2biB1cGRhdGUnIHRvIHVwZGF0ZSBD aGFuZ2VMb2cgZmlsZXMuXG4iOwotICAgIG9wZW4gRVJST1JTLCAiLXwiLCAkU1ZOLCAidXBkYXRl IiwgQGxvZ3MKLSAgICAgICAgb3IgZGllICJUaGUgc3ZuIHVwZGF0ZSBvZiBDaGFuZ2VMb2cgZmls ZXMgZmFpbGVkOiAkIS5cbiI7Ci0gICAgbXkgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzOwotICAgIHdo aWxlIChteSAkbGluZSA9IDxFUlJPUlM+KSB7Ci0gICAgICAgIHByaW50IFNUREVSUiAiICAgICIs ICRsaW5lOwotICAgICAgICBwdXNoIEBjb25mbGljdGVkQ2hhbmdlTG9ncywgJDEgaWYgJGxpbmUg PX4gbS9eQ1xzKyguKz8pW1xyXG5dKiQvOwotICAgIH0KLSAgICBjbG9zZSBFUlJPUlM7CitteSAk Y2hhbmdlTG9ncyA9IGdldExhdGVzdENoYW5nZUxvZ3MoJHByZWZpeGVzKTsKIAotICAgIGlmIChA Y29uZmxpY3RlZENoYW5nZUxvZ3MpIHsKLSAgICAgICAgcHJpbnQgU1RERVJSICIgIEF0dGVtcHRp bmcgdG8gbWVyZ2UgY29uZmxpY3RlZCBDaGFuZ2VMb2dzLlxuIjsKLSAgICAgICAgbXkgJHJlc29s dmVDaGFuZ2VMb2dzUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoZGlybmFtZSgkMCksICJyZXNv bHZlLUNoYW5nZUxvZ3MiKTsKLSAgICAgICAgb3BlbiBSRVNPTFZFLCAiLXwiLCAkcmVzb2x2ZUNo YW5nZUxvZ3NQYXRoLCAiLS1uby13YXJuaW5ncyIsIEBjb25mbGljdGVkQ2hhbmdlTG9ncwotICAg ICAgICAgICAgb3IgZGllICJDb3VsZCBub3Qgb3BlbiByZXNvbHZlLUNoYW5nZUxvZ3Mgc2NyaXB0 OiAkIS5cbiI7Ci0gICAgICAgIHByaW50IFNUREVSUiAiICAgICRfIiB3aGlsZSA8UkVTT0xWRT47 Ci0gICAgICAgIGNsb3NlIFJFU09MVkU7Ci0gICAgfQoraWYgKEAkY2hhbmdlTG9ncyAmJiAkdXBk YXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKKyAgICByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxv Z3MoJGNoYW5nZUxvZ3MpOwogfQogCiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAk ZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAlZnVuY3Rpb25MaXN0cyk7 CkBAIC0yNDcsMTcgKzIyOSwxNyBAQCBpZiAoJHNwZXdEaWZmICYmIEBjaGFuZ2VkX2ZpbGVzKSB7 CiB9CiAKICMgT3BlbiBDaGFuZ2VMb2dzLgotaWYgKCRvcGVuQ2hhbmdlTG9ncyAmJiBAbG9ncykg eworaWYgKCRvcGVuQ2hhbmdlTG9ncyAmJiBAJGNoYW5nZUxvZ3MpIHsKICAgICBwcmludCBTVERF UlIgIiAgT3BlbmluZyB0aGUgZWRpdGVkIENoYW5nZUxvZyBmaWxlcy5cbiI7CiAgICAgbXkgJGVk aXRvciA9ICRFTlZ7Q0hBTkdFX0xPR19FRElUT1J9OwogICAgIGlmICgkZWRpdG9yKSB7Ci0gICAg ICAgIHN5c3RlbSAoKHNwbGl0ICcgJywgJGVkaXRvciksIEBsb2dzKTsKKyAgICAgICAgc3lzdGVt ICgoc3BsaXQgJyAnLCAkZWRpdG9yKSwgQCRjaGFuZ2VMb2dzKTsKICAgICB9IGVsc2UgewogICAg ICAgICAkZWRpdG9yID0gJEVOVntDSEFOR0VfTE9HX0VESVRfQVBQTElDQVRJT059OwogICAgICAg ICBpZiAoJGVkaXRvcikgewotICAgICAgICAgICAgc3lzdGVtICJvcGVuIiwgIi1hIiwgJGVkaXRv ciwgQGxvZ3M7CisgICAgICAgICAgICBzeXN0ZW0gIm9wZW4iLCAiLWEiLCAkZWRpdG9yLCBAJGNo YW5nZUxvZ3M7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBzeXN0ZW0gIm9wZW4iLCAi LWUiLCBAbG9nczsKKyAgICAgICAgICAgIHN5c3RlbSAib3BlbiIsICItZSIsIEAkY2hhbmdlTG9n czsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTQ0OCw2ICs0MzAsNDEgQEAgc3ViIGZpbmRDaGFu Z2VMb2dzKFwlKQogICAgIHJldHVybiAoXCVmaWxlc0luQ2hhbmdlTG9nLCBcQHByZWZpeGVzKTsK IH0KIAorc3ViIGdldExhdGVzdENoYW5nZUxvZ3MoJCkKK3sKKyAgICBteSAoJHByZWZpeGVzKSA9 IEBfOworCisgICAgbXkgQGNoYW5nZUxvZ3MgPSAoKTsKKyAgICBmb3JlYWNoIG15ICRwcmVmaXgg KEAkcHJlZml4ZXMpIHsKKyAgICAgICAgcHVzaCBAY2hhbmdlTG9ncywgRmlsZTo6U3BlYy0+Y2F0 ZmlsZSgkcHJlZml4IHx8ICIuIiwgIkNoYW5nZUxvZyIpOworICAgIH0KKyAgICByZXR1cm4gXEBj aGFuZ2VMb2dzOworfQorCitzdWIgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCit7Cisg ICAgbXkgKCRjaGFuZ2VMb2dzKSA9IEBfOworCisgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcg J3N2biB1cGRhdGUnIHRvIHVwZGF0ZSBDaGFuZ2VMb2cgZmlsZXMuXG4iOworICAgIG9wZW4gRVJS T1JTLCAiLXwiLCAkU1ZOLCAidXBkYXRlIiwgQCRjaGFuZ2VMb2dzCisgICAgICAgIG9yIGRpZSAi VGhlIHN2biB1cGRhdGUgb2YgQ2hhbmdlTG9nIGZpbGVzIGZhaWxlZDogJCEuXG4iOworICAgIG15 IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKKyAgICB3aGlsZSAobXkgJGxpbmUgPSA8RVJST1JTPikg eworICAgICAgICBwcmludCBTVERFUlIgIiAgICAiLCAkbGluZTsKKyAgICAgICAgcHVzaCBAY29u ZmxpY3RlZENoYW5nZUxvZ3MsICQxIGlmICRsaW5lID1+IG0vXkNccysoLis/KVtcclxuXSokLzsK KyAgICB9CisgICAgY2xvc2UgRVJST1JTOworCisgICAgcmV0dXJuIGlmICFAY29uZmxpY3RlZENo YW5nZUxvZ3M7CisKKyAgICBwcmludCBTVERFUlIgIiAgQXR0ZW1wdGluZyB0byBtZXJnZSBjb25m bGljdGVkIENoYW5nZUxvZ3MuXG4iOworICAgIG15ICRyZXNvbHZlQ2hhbmdlTG9nc1BhdGggPSBG aWxlOjpTcGVjLT5jYXRmaWxlKGRpcm5hbWUoJDApLCAicmVzb2x2ZS1DaGFuZ2VMb2dzIik7Cisg ICAgb3BlbiBSRVNPTFZFLCAiLXwiLCAkcmVzb2x2ZUNoYW5nZUxvZ3NQYXRoLCAiLS1uby13YXJu aW5ncyIsIEBjb25mbGljdGVkQ2hhbmdlTG9ncworICAgICAgICBvciBkaWUgIkNvdWxkIG5vdCBv cGVuIHJlc29sdmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKKyAgICBwcmludCBTVERFUlIg IiAgICAkXyIgd2hpbGUgPFJFU09MVkU+OworICAgIGNsb3NlIFJFU09MVkU7Cit9CisKIHN1YiBn ZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkXCUpCiB7CiAgICAgbXkgKCRwcmVmaXhlcywgJGZpbGVz SW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMpID0gQF87 Cg==