33745 2010-01-15 14:36:40 -0800 Split out "prepare-rollout" from "rollout" and make --complete-rollout default 2010-02-19 15:07:12 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth commit-queue oldest_to_newest 181403 0 eric 2010-01-15 14:36:40 -0800 Split out "prepare-rollout" and "land-rollout" from "rollout" and make --complete-rollout default --complete-rollout was a hack back when I didn't trust rollout. It's still possible for it to go wrong, but unlikely. Especially with our diff-confirmation step, we should remove the --complete-rollout flag. It's sometimes useful to be able to prepare rollouts and land them after further editing. prepare-rollout would be useful. Which woudl effectively be the current "rollout" without --complete-rollout passed. 181479 1 abarth 2010-01-15 22:33:18 -0800 I think this patch is super easy. You should just do it. 184579 2 eric 2010-01-26 06:53:31 -0800 Haven't written "land-rollout" yet (because it requires some fancy reason parsing from the ChangeLog), but the rest is done. Will upload. 184580 3 47408 eric 2010-01-26 06:58:00 -0800 Created attachment 47408 Patch 192051 4 47408 abarth 2010-02-19 14:21:41 -0800 Comment on attachment 47408 Patch Excellent! I think you can get rid of MetaStep now, btw. 192053 5 eric 2010-02-19 14:28:12 -0800 I expect the cq+ will fail, but if it doesn't it saves me time landing! :) 192076 6 47408 commit-queue 2010-02-19 15:07:07 -0800 Comment on attachment 47408 Patch Clearing flags on attachment: 47408 Committed r55034: <http://trac.webkit.org/changeset/55034> 192077 7 commit-queue 2010-02-19 15:07:12 -0800 All reviewed patches have been landed. Closing bug. 47408 2010-01-26 06:58:00 -0800 2010-02-19 15:07:07 -0800 Patch bug-33745-20100126065758.patch text/plain 15121 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0NDI3YTlkLi5iM2E3ZTBkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEt MjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwbGl0IG91dCAicHJlcGFyZS1yb2xsb3V0IiBm cm9tICJyb2xsb3V0IiBhbmQgbWFrZSAtLWNvbXBsZXRlLXJvbGxvdXQgZGVmYXVsdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM3NDUKKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvZG93bmxvYWQucHk6CisgICAgICAgICAtIEFk ZCBhIG5ldyBBYnN0cmFjdFJvbGxvdXRQcmVwQ29tbWFuZCB0byBzaGFyZSBjb2RlIGJldHdlZW4g UHJlcGFyZVJvbGxvdXQgYW5kIFJvbGxvdXQKKyAgICAgICAgIC0gQWRkIFByZXBhcmVSb2xsb3V0 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5w eTogVGVzdCBQcmVwYXJlUm9sbG91dCwgcmVtb3ZlIENvbXBsZXRlUm9sbG91dCB0ZXN0cy4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0ZXBzL19faW5pdF9fLnB5OiBpbmNsdWRlIFJlb3Bl bkJ1Z0FmdGVyUm9sbG91dCBzdGVwLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3RlcHMv Y29tcGxldGVyb2xsb3V0LnB5OiBSZW1vdmVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv c3RlcHMvb3B0aW9ucy5weTogcmVtb3ZlIGNvbXBsZXRlX3JvbGxvdXQKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3N0ZXBzL3Jlb3BlbmJ1Z2FmdGVycm9sbG91dC5weTogQWRkZWQuCisKIDIw MTAtMDEtMjUgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL2Rvd25sb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tYW5kcy9kb3dubG9hZC5weQppbmRleCA0OWE2ODYyLi5hYTQyM2Nm IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL2Rvd25s b2FkLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvZG93bmxv YWQucHkKQEAgLTI0MCwxMSArMjQwLDUwIEBAIGNsYXNzIExhbmRGcm9tQnVnKEFic3RyYWN0UGF0 Y2hMYW5kaW5nQ29tbWFuZCwgUHJvY2Vzc0J1Z3NNaXhpbik6CiAgICAgc2hvd19pbl9tYWluX2hl bHAgPSBUcnVlCiAKIAotY2xhc3MgUm9sbG91dChBYnN0cmFjdFNlcXVlbmNlZENvbW1hbmQpOgor Y2xhc3MgQWJzdHJhY3RSb2xsb3V0UHJlcENvbW1hbmQoQWJzdHJhY3RTZXF1ZW5jZWRDb21tYW5k KToKKyAgICBhcmd1bWVudF9uYW1lcyA9ICJSRVZJU0lPTiBSRUFTT04iCisKKyAgICBkZWYgX3Bh cnNlX2J1Z19pZF9mcm9tX3JldmlzaW9uX2RpZmYoc2VsZiwgcmV2aXNpb24pOgorICAgICAgICBv cmlnaW5hbF9kaWZmID0gc2VsZi50b29sLnNjbSgpLmRpZmZfZm9yX3JldmlzaW9uKHJldmlzaW9u KQorICAgICAgICByZXR1cm4gcGFyc2VfYnVnX2lkKG9yaWdpbmFsX2RpZmYpCisKKyAgICBkZWYg X2J1Z19pZF9mb3JfcmV2aXNpb24oc2VsZiwgcmV2aXNpb24pOgorICAgICAgICByYWlzZSBOb3RJ bXBsZW1lbnRlZEVycm9yKCJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IikKKworICAgIGRlZiBf cHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgcmV2aXNp b24gPSBhcmdzWzBdCisgICAgICAgIHJldHVybiB7CisgICAgICAgICAgICAicmV2aXNpb24iIDog cmV2aXNpb24sCisgICAgICAgICAgICAiYnVnX2lkIiA6IHNlbGYuX2J1Z19pZF9mb3JfcmV2aXNp b24ocmV2aXNpb24pLAorICAgICAgICAgICAgInJlYXNvbiIgOiBhcmdzWzFdLAorICAgICAgICB9 CisKKworY2xhc3MgUHJlcGFyZVJvbGxvdXQoQWJzdHJhY3RSb2xsb3V0UHJlcENvbW1hbmQpOgor ICAgIG5hbWUgPSAicHJlcGFyZS1yb2xsb3V0IgorICAgIGhlbHBfdGV4dCA9ICJSZXZlcnQgdGhl IGdpdmVuIHJldmlzaW9uIGluIHRoZSB3b3JraW5nIGNvcHkgYW5kIHByZXBhcmUgQ2hhbmdlTG9n cyB3aXRoIHJldmVydCByZWFzb24iCisgICAgbG9uZ19oZWxwID0gIiIiVXBkYXRlcyB0aGUgd29y a2luZyBjb3B5LgorQXBwbGllcyB0aGUgaW52ZXJzZSBkaWZmIGZvciB0aGUgcHJvdmlkZWQgcmV2 aXNpb24uCitDcmVhdGVzIGFuIGFwcHJvcHJpYXRlIHJvbGxvdXQgQ2hhbmdlTG9nLCBpbmNsdWRp bmcgYSB0cmFjIGxpbmsgYW5kIGJ1ZyBsaW5rLgorIiIiCisgICAgc3RlcHMgPSBbCisgICAgICAg IHN0ZXBzLkNsZWFuV29ya2luZ0RpcmVjdG9yeSwKKyAgICAgICAgc3RlcHMuVXBkYXRlLAorICAg ICAgICBzdGVwcy5SZXZlcnRSZXZpc2lvbiwKKyAgICAgICAgc3RlcHMuUHJlcGFyZUNoYW5nZUxv Z0ZvclJldmVydCwKKyAgICBdCisKKyAgICBkZWYgX2J1Z19pZF9mb3JfcmV2aXNpb24oc2VsZiwg cmV2aXNpb24pOgorICAgICAgICBidWdfaWQgPSBzZWxmLl9wYXJzZV9idWdfaWRfZnJvbV9yZXZp c2lvbl9kaWZmKHJldmlzaW9uKQorICAgICAgICBpZiBidWdfaWQ6CisgICAgICAgICAgICByZXR1 cm4gYnVnX2lkCisgICAgICAgIGxvZygiRmFpbGVkIHRvIHBhcnNlIGJ1ZyBudW1iZXIgZnJvbSBk aWZmLiIpCisKKworY2xhc3MgUm9sbG91dChBYnN0cmFjdFJvbGxvdXRQcmVwQ29tbWFuZCk6CiAg ICAgbmFtZSA9ICJyb2xsb3V0IgogICAgIHNob3dfaW5fbWFpbl9oZWxwID0gVHJ1ZQogICAgIGhl bHBfdGV4dCA9ICJSZXZlcnQgdGhlIGdpdmVuIHJldmlzaW9uIGluIHRoZSB3b3JraW5nIGNvcHkg YW5kIG9wdGlvbmFsbHkgY29tbWl0IHRoZSByZXZlcnQgYW5kIHJlLW9wZW4gdGhlIG9yaWdpbmFs IGJ1ZyIKLSAgICBhcmd1bWVudF9uYW1lcyA9ICJSRVZJU0lPTiBSRUFTT04iCiAgICAgbG9uZ19o ZWxwID0gIiIiVXBkYXRlcyB0aGUgd29ya2luZyBjb3B5LgogQXBwbGllcyB0aGUgaW52ZXJzZSBk aWZmIGZvciB0aGUgcHJvdmlkZWQgcmV2aXNpb24uCiBDcmVhdGVzIGFuIGFwcHJvcHJpYXRlIHJv bGxvdXQgQ2hhbmdlTG9nLCBpbmNsdWRpbmcgYSB0cmFjIGxpbmsgYW5kIGJ1ZyBsaW5rLgpAQCAt MjU4LDI3ICsyOTcsMTQgQEAgQ29tbWl0cyB0aGUgcmV2ZXJ0IGFuZCB1cGRhdGVzIHRoZSBidWcg KGluY2x1ZGluZyByZS1vcGVuaW5nIHRoZSBidWcgaWYgbmVjZXNzYXIKICAgICAgICAgc3RlcHMu UHJlcGFyZUNoYW5nZUxvZ0ZvclJldmVydCwKICAgICAgICAgc3RlcHMuRWRpdENoYW5nZUxvZywK ICAgICAgICAgc3RlcHMuQ29uZmlybURpZmYsCi0gICAgICAgIHN0ZXBzLkNvbXBsZXRlUm9sbG91 dCwKKyAgICAgICAgc3RlcHMuQnVpbGQsCisgICAgICAgIHN0ZXBzLkNvbW1pdCwKKyAgICAgICAg c3RlcHMuUmVvcGVuQnVnQWZ0ZXJSb2xsb3V0LAogICAgIF0KIAotICAgIEBzdGF0aWNtZXRob2QK LSAgICBkZWYgX3BhcnNlX2J1Z19pZF9mcm9tX3JldmlzaW9uX2RpZmYodG9vbCwgcmV2aXNpb24p OgotICAgICAgICBvcmlnaW5hbF9kaWZmID0gdG9vbC5zY20oKS5kaWZmX2Zvcl9yZXZpc2lvbihy ZXZpc2lvbikKLSAgICAgICAgcmV0dXJuIHBhcnNlX2J1Z19pZChvcmlnaW5hbF9kaWZmKQotCi0g ICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAgICAgIHJldmlz aW9uID0gYXJnc1swXQotICAgICAgICByZWFzb24gPSBhcmdzWzFdCi0gICAgICAgIGJ1Z19pZCA9 IHNlbGYuX3BhcnNlX2J1Z19pZF9mcm9tX3JldmlzaW9uX2RpZmYodG9vbCwgcmV2aXNpb24pCi0g ICAgICAgIGlmIG9wdGlvbnMuY29tcGxldGVfcm9sbG91dDoKLSAgICAgICAgICAgIGlmIGJ1Z19p ZDoKLSAgICAgICAgICAgICAgICBsb2coIldpbGwgcmUtb3BlbiBidWcgJXMgYWZ0ZXIgcm9sbG91 dC4iICUgYnVnX2lkKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBsb2coIkZh aWxlZCB0byBwYXJzZSBidWcgbnVtYmVyIGZyb20gZGlmZi4gIE5vIGJ1Z3Mgd2lsbCBiZSB1cGRh dGVkL3Jlb3BlbmVkIGFmdGVyIHRoZSByb2xsb3V0LiIpCi0KLSAgICAgICAgc3RhdGUgPSB7Ci0g ICAgICAgICAgICAicmV2aXNpb24iIDogcmV2aXNpb24sCi0gICAgICAgICAgICAiYnVnX2lkIiA6 IGJ1Z19pZCwKLSAgICAgICAgICAgICJyZWFzb24iIDogcmVhc29uLAotICAgICAgICB9Ci0gICAg ICAgIHNlbGYuX3NlcXVlbmNlLnJ1bl9hbmRfaGFuZGxlX2Vycm9ycyh0b29sLCBvcHRpb25zLCBz dGF0ZSkKKyAgICBkZWYgX2J1Z19pZF9mb3JfcmV2aXNpb24oc2VsZiwgcmV2aXNpb24pOgorICAg ICAgICBidWdfaWQgPSBzZWxmLl9wYXJzZV9idWdfaWRfZnJvbV9yZXZpc2lvbl9kaWZmKHJldmlz aW9uKQorICAgICAgICBpZiBidWdfaWQ6CisgICAgICAgICAgICBsb2coIldpbGwgcmUtb3BlbiBi dWcgJXMgYWZ0ZXIgcm9sbG91dC4iICUgYnVnX2lkKQorICAgICAgICAgICAgcmV0dXJuIGJ1Z19p ZAorICAgICAgICBsb2coIkZhaWxlZCB0byBwYXJzZSBidWcgbnVtYmVyIGZyb20gZGlmZi4gIE5v IGJ1Z3Mgd2lsbCBiZSB1cGRhdGVkL3Jlb3BlbmVkIGFmdGVyIHRoZSByb2xsb3V0LiIpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL2Rvd25sb2FkX3Vu aXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9kb3dubG9h ZF91bml0dGVzdC5weQppbmRleCA5OTU5YjYwLi4yZTQ0YjkzIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3Qu cHkKQEAgLTQ0LDcgKzQ0LDYgQEAgY2xhc3MgRG93bmxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNU ZXN0KToKICAgICAgICAgb3B0aW9ucy5idWlsZCA9IFRydWUKICAgICAgICAgb3B0aW9ucy50ZXN0 ID0gVHJ1ZQogICAgICAgICBvcHRpb25zLmNsb3NlX2J1ZyA9IFRydWUKLSAgICAgICAgb3B0aW9u cy5jb21wbGV0ZV9yb2xsb3V0ID0gRmFsc2UKICAgICAgICAgcmV0dXJuIG9wdGlvbnMKIAogICAg IGRlZiB0ZXN0X2J1aWxkKHNlbGYpOgpAQCAtMTE4LDEyICsxMTcsMTEgQEAgTm90IGNsb3Npbmcg YnVnIDQyIGFzIGF0dGFjaG1lbnQgMTk3IGhhcyByZXZpZXc9Ky4gIEFzc3VtaW5nIHRoZXJlIGFy ZSBtb3JlIHBhdGMKICIiIgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoTGFu ZEZyb21CdWcoKSwgWzQyXSwgb3B0aW9ucz1zZWxmLl9kZWZhdWx0X29wdGlvbnMoKSwgZXhwZWN0 ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAorICAgIGRlZiB0ZXN0X3ByZXBhcmVfcm9sbG91 dChzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyPSJVcGRhdGluZyB3b3JraW5nIGRpcmVj dG9yeVxuUnVubmluZyBwcmVwYXJlLUNoYW5nZUxvZ1xuIgorICAgICAgICBzZWxmLmFzc2VydF9l eGVjdXRlX291dHB1dHMoUHJlcGFyZVJvbGxvdXQoKSwgWzg1MiwgIlJlYXNvbiJdLCBvcHRpb25z PXNlbGYuX2RlZmF1bHRfb3B0aW9ucygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJy KQorCiAgICAgZGVmIHRlc3Rfcm9sbG91dChzZWxmKToKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJy ID0gIlVwZGF0aW5nIHdvcmtpbmcgZGlyZWN0b3J5XG5SdW5uaW5nIHByZXBhcmUtQ2hhbmdlTG9n XG5cbk5PVEU6IFJvbGxvdXQgc3VwcG9ydCBpcyBleHBlcmltZW50YWwuXG5QbGVhc2UgdmVyaWZ5 IHRoZSByb2xsb3V0IGRpZmYgYW5kIHVzZSBcIndlYmtpdC1wYXRjaCBsYW5kIDEyMzQ1XCIgdG8g Y29tbWl0IHRoZSByb2xsb3V0LlxuIgorICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiV2lsbCBy ZS1vcGVuIGJ1ZyAxMjM0NSBhZnRlciByb2xsb3V0LlxuVXBkYXRpbmcgd29ya2luZyBkaXJlY3Rv cnlcblJ1bm5pbmcgcHJlcGFyZS1DaGFuZ2VMb2dcbkJ1aWxkaW5nIFdlYktpdFxuIgogICAgICAg ICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoUm9sbG91dCgpLCBbODUyLCAiUmVhc29uIl0s IG9wdGlvbnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVkX3N0ZGVycj1leHBlY3Rl ZF9zdGRlcnIpCiAKLSAgICBkZWYgdGVzdF9jb21wbGV0ZV9yb2xsb3V0KHNlbGYpOgotICAgICAg ICBvcHRpb25zID0gc2VsZi5fZGVmYXVsdF9vcHRpb25zKCkKLSAgICAgICAgb3B0aW9ucy5jb21w bGV0ZV9yb2xsb3V0ID0gVHJ1ZQotICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiV2lsbCByZS1v cGVuIGJ1ZyAxMjM0NSBhZnRlciByb2xsb3V0LlxuVXBkYXRpbmcgd29ya2luZyBkaXJlY3Rvcnlc blJ1bm5pbmcgcHJlcGFyZS1DaGFuZ2VMb2dcbkJ1aWxkaW5nIFdlYktpdFxuIgotICAgICAgICBz ZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoUm9sbG91dCgpLCBbODUyLCAiUmVhc29uIl0sIG9w dGlvbnM9b3B0aW9ucywgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3RlcHMvX19pbml0X18ucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0ZXBzL19faW5pdF9fLnB5CmluZGV4IDVhZTRiZWEu LjliNzdmNGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3RlcHMv X19pbml0X18ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdGVwcy9fX2lu aXRfXy5weQpAQCAtMzcsNyArMzcsNiBAQCBmcm9tIHdlYmtpdHB5LnN0ZXBzLmNsb3NlYnVnIGlt cG9ydCBDbG9zZUJ1ZwogZnJvbSB3ZWJraXRweS5zdGVwcy5jbG9zZWJ1Z2ZvcmxhbmRkaWZmIGlt cG9ydCBDbG9zZUJ1Z0ZvckxhbmREaWZmCiBmcm9tIHdlYmtpdHB5LnN0ZXBzLmNsb3NlcGF0Y2gg aW1wb3J0IENsb3NlUGF0Y2gKIGZyb20gd2Via2l0cHkuc3RlcHMuY29tbWl0IGltcG9ydCBDb21t aXQKLWZyb20gd2Via2l0cHkuc3RlcHMuY29tcGxldGVyb2xsb3V0IGltcG9ydCBDb21wbGV0ZVJv bGxvdXQKIGZyb20gd2Via2l0cHkuc3RlcHMuY29uZmlybWRpZmYgaW1wb3J0IENvbmZpcm1EaWZm CiBmcm9tIHdlYmtpdHB5LnN0ZXBzLmNyZWF0ZWJ1ZyBpbXBvcnQgQ3JlYXRlQnVnCiBmcm9tIHdl YmtpdHB5LnN0ZXBzLmVkaXRjaGFuZ2Vsb2cgaW1wb3J0IEVkaXRDaGFuZ2VMb2cKQEAgLTUwLDYg KzQ5LDcgQEAgZnJvbSB3ZWJraXRweS5zdGVwcy5wb3N0ZGlmZmZvcmNvbW1pdCBpbXBvcnQgUG9z dERpZmZGb3JDb21taXQKIGZyb20gd2Via2l0cHkuc3RlcHMucHJlcGFyZWNoYW5nZWxvZ2ZvcnJl dmVydCBpbXBvcnQgUHJlcGFyZUNoYW5nZUxvZ0ZvclJldmVydAogZnJvbSB3ZWJraXRweS5zdGVw cy5wcmVwYXJlY2hhbmdlbG9nIGltcG9ydCBQcmVwYXJlQ2hhbmdlTG9nCiBmcm9tIHdlYmtpdHB5 LnN0ZXBzLnByb21wdGZvcmJ1Z29ydGl0bGUgaW1wb3J0IFByb21wdEZvckJ1Z09yVGl0bGUKK2Zy b20gd2Via2l0cHkuc3RlcHMucmVvcGVuYnVnYWZ0ZXJyb2xsb3V0IGltcG9ydCBSZW9wZW5CdWdB ZnRlclJvbGxvdXQKIGZyb20gd2Via2l0cHkuc3RlcHMucmV2ZXJ0cmV2aXNpb24gaW1wb3J0IFJl dmVydFJldmlzaW9uCiBmcm9tIHdlYmtpdHB5LnN0ZXBzLnJ1bnRlc3RzIGltcG9ydCBSdW5UZXN0 cwogZnJvbSB3ZWJraXRweS5zdGVwcy51cGRhdGVjaGFuZ2Vsb2dzd2l0aHJldmlld2VyIGltcG9y dCBVcGRhdGVDaGFuZ2VMb2dzV2l0aFJldmlld2VyCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0ZXBzL2NvbXBsZXRlcm9sbG91dC5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3RlcHMvY29tcGxldGVyb2xsb3V0LnB5CmRlbGV0ZWQgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCA4NTM0OTU2Li4wMDAwMDAwCi0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3RlcHMvY29tcGxldGVyb2xsb3V0LnB5CisrKyAvZGV2L251bGwKQEAgLTEsNjYg KzAsMCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KLSMgCi0jIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAotIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCi0jIG1ldDoKLSMgCi0jICAg ICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0Ci0jIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KLSMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQotIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0jIGluIHRoZSBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKLSMgZGlz dHJpYnV0aW9uLgotIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0 aGUgbmFtZXMgb2YgaXRzCi0jIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9y IHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCi0jIHRoaXMgc29mdHdhcmUgd2l0aG91dCBz cGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCi0jIAotIyBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0jICJB UyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UCi0jIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgotIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xB SU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAotIyBPV05FUiBPUiBDT05UUklC VVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKLSMg U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVAotIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKLSMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1Mg SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCi0jIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSMg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFCi0jIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0KLWZyb20gd2Via2l0cHkuY29tbWVudHMgaW1w b3J0IGJ1Z19jb21tZW50X2Zyb21fY29tbWl0X3RleHQKLWZyb20gd2Via2l0cHkuc3RlcHMuYnVp bGQgaW1wb3J0IEJ1aWxkCi1mcm9tIHdlYmtpdHB5LnN0ZXBzLmNvbW1pdCBpbXBvcnQgQ29tbWl0 Ci1mcm9tIHdlYmtpdHB5LnN0ZXBzLm1ldGFzdGVwIGltcG9ydCBNZXRhU3RlcAotZnJvbSB3ZWJr aXRweS5zdGVwcy5vcHRpb25zIGltcG9ydCBPcHRpb25zCi1mcm9tIHdlYmtpdHB5LndlYmtpdF9s b2dnaW5nIGltcG9ydCBsb2cKLQotCi1jbGFzcyBDb21wbGV0ZVJvbGxvdXQoTWV0YVN0ZXApOgot ICAgIHN1YnN0ZXBzID0gWwotICAgICAgICBCdWlsZCwKLSAgICAgICAgQ29tbWl0LAotICAgIF0K LQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBvcHRpb25zKGNscyk6Ci0gICAgICAgIGNvbGxl Y3RlZF9vcHRpb25zID0gY2xzLl9jb2xsZWN0X29wdGlvbnNfZnJvbV9zdGVwcyhjbHMuc3Vic3Rl cHMpCi0gICAgICAgIGNvbGxlY3RlZF9vcHRpb25zLmFwcGVuZChPcHRpb25zLmNvbXBsZXRlX3Jv bGxvdXQpCi0gICAgICAgIHJldHVybiBjb2xsZWN0ZWRfb3B0aW9ucwotCi0gICAgZGVmIHJ1bihz ZWxmLCBzdGF0ZSk6Ci0gICAgICAgIGJ1Z19pZCA9IHN0YXRlWyJidWdfaWQiXQotICAgICAgICAj IEZJWE1FOiBGdWxseSBhdXRvbWF0ZWQgcm9sbG91dCBpcyBub3QgMTAwJSBpZGlvdC1wcm9vZiB5 ZXQsIHNvIGZvciBub3cganVzdCBsb2cgd2l0aCBpbnN0cnVjdGlvbnMgb24gaG93IHRvIGNvbXBs ZXRlIHRoZSByb2xsb3V0LgotICAgICAgICAjIE9uY2Ugd2UgdHJ1c3Qgcm9sbG91dCB3ZSB3aWxs IHJlbW92ZSB0aGlzIG9wdGlvbi4KLSAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuY29tcGxl dGVfcm9sbG91dDoKLSAgICAgICAgICAgIGxvZygiXG5OT1RFOiBSb2xsb3V0IHN1cHBvcnQgaXMg ZXhwZXJpbWVudGFsLlxuUGxlYXNlIHZlcmlmeSB0aGUgcm9sbG91dCBkaWZmIGFuZCB1c2UgXCJ3 ZWJraXQtcGF0Y2ggbGFuZCAlc1wiIHRvIGNvbW1pdCB0aGUgcm9sbG91dC4iICUgYnVnX2lkKQot ICAgICAgICAgICAgcmV0dXJuCi0KLSAgICAgICAgTWV0YVN0ZXAucnVuKHNlbGYsIHN0YXRlKQot Ci0gICAgICAgIGNvbW1pdF9jb21tZW50ID0gYnVnX2NvbW1lbnRfZnJvbV9jb21taXRfdGV4dChz ZWxmLl90b29sLnNjbSgpLCBzdGF0ZVsiY29tbWl0X3RleHQiXSkKLSAgICAgICAgY29tbWVudF90 ZXh0ID0gIlJldmVydGVkIHIlcyBmb3IgcmVhc29uOlxuXG4lc1xuXG4lcyIgJSAoc3RhdGVbInJl dmlzaW9uIl0sIHN0YXRlWyJyZWFzb24iXSwgY29tbWl0X2NvbW1lbnQpCi0KLSAgICAgICAgaWYg bm90IGJ1Z19pZDoKLSAgICAgICAgICAgIGxvZyhjb21tZW50X3RleHQpCi0gICAgICAgICAgICBs b2coIk5vIGJ1Z3Mgd2VyZSB1cGRhdGVkLiIpCi0gICAgICAgICAgICByZXR1cm4KLSAgICAgICAg c2VsZi5fdG9vbC5idWdzLnJlb3Blbl9idWcoYnVnX2lkLCBjb21tZW50X3RleHQpCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0ZXBzL29wdGlvbnMucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0ZXBzL29wdGlvbnMucHkKaW5kZXggOGIyOGYyNy4u ZWE0M2Q2ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdGVwcy9v cHRpb25zLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3RlcHMvb3B0aW9u cy5weQpAQCAtMzYsNyArMzYsNiBAQCBjbGFzcyBPcHRpb25zKG9iamVjdCk6CiAgICAgY2hlY2tf c3R5bGUgPSBtYWtlX29wdGlvbigiLS1pZ25vcmUtc3R5bGUiLCBhY3Rpb249InN0b3JlX2ZhbHNl IiwgZGVzdD0iY2hlY2tfc3R5bGUiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRvbid0IGNoZWNrIHRv IHNlZSBpZiB0aGUgcGF0Y2ggaGFzIHByb3BlciBzdHlsZSBiZWZvcmUgdXBsb2FkaW5nLiIpCiAg ICAgY2xlYW4gPSBtYWtlX29wdGlvbigiLS1uby1jbGVhbiIsIGFjdGlvbj0ic3RvcmVfZmFsc2Ui LCBkZXN0PSJjbGVhbiIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG9uJ3QgY2hlY2sgaWYgdGhlIHdv cmtpbmcgZGlyZWN0b3J5IGlzIGNsZWFuIGJlZm9yZSBhcHBseWluZyBwYXRjaGVzIikKICAgICBj bG9zZV9idWcgPSBtYWtlX29wdGlvbigiLS1uby1jbG9zZSIsIGFjdGlvbj0ic3RvcmVfZmFsc2Ui LCBkZXN0PSJjbG9zZV9idWciLCBkZWZhdWx0PVRydWUsIGhlbHA9IkxlYXZlIGJ1ZyBvcGVuIGFm dGVyIGxhbmRpbmcuIikKLSAgICBjb21wbGV0ZV9yb2xsb3V0ID0gbWFrZV9vcHRpb24oIi0tY29t cGxldGUtcm9sbG91dCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImNvbXBsZXRlX3JvbGxv dXQiLCBoZWxwPSJDb21taXQgdGhlIHJldmVydCBhbmQgcmUtb3BlbiB0aGUgb3JpZ2luYWwgYnVn LiIpCiAgICAgY29tcG9uZW50ID0gbWFrZV9vcHRpb24oIi0tY29tcG9uZW50IiwgYWN0aW9uPSJz dG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImNvbXBvbmVudCIsIGhlbHA9IkNvbXBvbmVudCBm b3IgdGhlIG5ldyBidWcuIikKICAgICBjb25maXJtID0gbWFrZV9vcHRpb24oIi0tbm8tY29uZmly bSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJjb25maXJtIiwgZGVmYXVsdD1UcnVlLCBo ZWxwPSJTa2lwIGNvbmZpcm1hdGlvbiBzdGVwcy4iKQogICAgIGRlc2NyaXB0aW9uID0gbWFrZV9v cHRpb24oIi1tIiwgIi0tZGVzY3JpcHRpb24iLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5n IiwgZGVzdD0iZGVzY3JpcHRpb24iLCBoZWxwPSJEZXNjcmlwdGlvbiBzdHJpbmcgZm9yIHRoZSBh dHRhY2htZW50IChkZWZhdWx0OiBcInBhdGNoXCIpIikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3RlcHMvcmVvcGVuYnVnYWZ0ZXJyb2xsb3V0LnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdGVwcy9yZW9wZW5idWdhZnRlcnJvbGxvdXQucHkKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmM2M2NmZQotLS0gL2Rldi9udWxsCisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3RlcHMvcmVvcGVuYnVnYWZ0ZXJyb2xs b3V0LnB5CkBAIC0wLDAgKzEsNDQgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIAorIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQor IyBtZXQ6CisjIAorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l cgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBH b29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVz ZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIyAKKyMg VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENP TlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMg T1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQor IyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitmcm9tIHdlYmtp dHB5LmNvbW1lbnRzIGltcG9ydCBidWdfY29tbWVudF9mcm9tX2NvbW1pdF90ZXh0Citmcm9tIHdl YmtpdHB5LnN0ZXBzLmFic3RyYWN0c3RlcCBpbXBvcnQgQWJzdHJhY3RTdGVwCitmcm9tIHdlYmtp dHB5LndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2cKKworCitjbGFzcyBSZW9wZW5CdWdBZnRlclJv bGxvdXQoQWJzdHJhY3RTdGVwKToKKyAgICBkZWYgcnVuKHNlbGYsIHN0YXRlKToKKyAgICAgICAg Y29tbWl0X2NvbW1lbnQgPSBidWdfY29tbWVudF9mcm9tX2NvbW1pdF90ZXh0KHNlbGYuX3Rvb2wu c2NtKCksIHN0YXRlWyJjb21taXRfdGV4dCJdKQorICAgICAgICBjb21tZW50X3RleHQgPSAiUmV2 ZXJ0ZWQgciVzIGZvciByZWFzb246XG5cbiVzXG5cbiVzIiAlIChzdGF0ZVsicmV2aXNpb24iXSwg c3RhdGVbInJlYXNvbiJdLCBjb21taXRfY29tbWVudCkKKworICAgICAgICBidWdfaWQgPSBzdGF0 ZVsiYnVnX2lkIl0KKyAgICAgICAgaWYgbm90IGJ1Z19pZDoKKyAgICAgICAgICAgIGxvZyhjb21t ZW50X3RleHQpCisgICAgICAgICAgICBsb2coIk5vIGJ1Z3Mgd2VyZSB1cGRhdGVkLiIpCisgICAg ICAgICAgICByZXR1cm4KKyAgICAgICAgc2VsZi5fdG9vbC5idWdzLnJlb3Blbl9idWcoYnVnX2lk LCBjb21tZW50X3RleHQpCg==