174036 2017-06-30 13:58:39 -0700 [Xcode] webkit-patch should run sort-Xcode-project-file 2017-08-15 13:34:44 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead webkit-unassigned aestes bburg buildbot commit-queue don.olmstead glenn lforschler matthew_hanson rniwa ross.kirsling ryanhaddad simon.fraser stephan.szabo webkit-bug-importer oldest_to_newest 1324513 0 don.olmstead 2017-06-30 13:58:39 -0700 When applicable it should be run to ensure changes are sorted properly. 1335419 1 317274 stephan.szabo 2017-08-04 13:24:05 -0700 Created attachment 317274 Run sort-Xcode-project-file from some webkit-patch commands 1335487 2 317274 commit-queue 2017-08-04 14:45:16 -0700 Comment on attachment 317274 Run sort-Xcode-project-file from some webkit-patch commands Clearing flags on attachment: 317274 Committed r220295: <http://trac.webkit.org/changeset/220295> 1335488 3 commit-queue 2017-08-04 14:45:18 -0700 All reviewed patches have been landed. Closing bug. 1335493 4 webkit-bug-importer 2017-08-04 14:47:08 -0700 <rdar://problem/33732709> 1335862 5 ryanhaddad 2017-08-06 19:40:44 -0700 This change caused 4 webkitpy test errors: [1468/1638] webkitpy.tool.commands.download_unittest.DownloadCommandsTest.test_land_cowhand erred: Traceback (most recent call last): File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/commands/download_unittest.py", line 182, in test_land_cowhand self.assert_execute_outputs(LandCowhand(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/commands/commandtest.py", line 49, in assert_execute_outputs OutputCapture().assert_outputs(self, command.execute, [options, args, tool], expected_stdout=expected_stdout, expected_stderr=expected_stderr, expected_exception=expected_exception, expected_logs=expected_logs) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/common/system/outputcapture.py", line 93, in assert_outputs return_value = function(*args, **kwargs) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/slave/sierra-release-tests-wk2/build/Tools/Scripts/webkitpy/tool/steps/sortxcodeprojectfiles.py", line 48, in run if self._options.sort_xcode_project: AttributeError: 'MockOptions' object has no attribute 'sort_xcode_project' https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20(Tests)/builds/3410 1335869 6 ryanhaddad 2017-08-06 20:25:00 -0700 Reverted r220295 for reason: This change introduced 4 errors in webkitpy tests. Committed r220328: <http://trac.webkit.org/changeset/220328> 1336052 7 317443 stephan.szabo 2017-08-07 11:25:31 -0700 Created attachment 317443 Run sort-Xcode-project-file from some webkit-patch commands w/test changes Sorry, missed that the webkitpy tests for tool doesn't run by default on Win32 so didn't see the failures. 1336279 8 317443 commit-queue 2017-08-07 17:25:24 -0700 Comment on attachment 317443 Run sort-Xcode-project-file from some webkit-patch commands w/test changes Clearing flags on attachment: 317443 Committed r220372: <http://trac.webkit.org/changeset/220372> 1336280 9 commit-queue 2017-08-07 17:25:26 -0700 All reviewed patches have been landed. Closing bug. 1338760 10 aestes 2017-08-15 11:43:08 -0700 I don't think this was a good idea. Not everyone uses `webkit-patch`, so for those of us who do, our patches end up with lots of unrelated Xcode project file changes. I'd be fine with having an option to run sort-Xcode-project-file, but I object to this being done by default. 1338765 11 don.olmstead 2017-08-15 11:48:15 -0700 ccing rniwa since he asked for this change. 1338769 12 aestes 2017-08-15 11:53:37 -0700 (In reply to Andy Estes from comment #10)> > I'd be fine with having an option to run sort-Xcode-project-file, but I > object to this being done by default. Reasons for my objection: 1. It makes patches harder to review when they have unrelated Xcode project file changes in them. 2. It makes patches harder to merge to branches (I've already experienced one merge conflict due to this feature). 3. Engineers tend to keep items in sorted order in the UI, which means that sort-Xcode-project-file is often just rearranging lists that aren't visible to the user. Having my patch include unrelated sorting changes to non-user-visible lists in .pbxproj files seems pretty low-value to me. 1338770 13 simon.fraser 2017-08-15 11:54:01 -0700 Maybe we should have the style checker check that the projects are sorted? 1338771 14 rniwa 2017-08-15 11:57:15 -0700 Yeah, adding checks to the style checker will prevent this regardless of whether you're using webkit-patch or not. In general, people shouldn't be adding out-of-order files in the first place. 1338774 15 bburg 2017-08-15 12:00:27 -0700 (In reply to Ryosuke Niwa from comment #14) > Yeah, adding checks to the style checker will prevent this regardless of > whether you're using webkit-patch or not. > > In general, people shouldn't be adding out-of-order files in the first place. So what, we are supposed to manually order the raw XML? Which doesn't fit into most screens? I think style checker is fine, as long as it suggests how to run the script to fix the problem. And it should only run if the xcproj files are actually touched. 1338779 16 matthew_hanson 2017-08-15 12:05:12 -0700 Perhaps we could server-side commit hook in combination with a tool that sorts the project files. That would require an initial sorting of all project files, but would allow us to guarantee the sorted-ness of project files going forward. The commit hook rejection message could include the location of the tool that will sort project files. 1338782 17 aestes 2017-08-15 12:09:26 -0700 (In reply to Ryosuke Niwa from comment #14) > Yeah, adding checks to the style checker will prevent this regardless of > whether you're using webkit-patch or not. I'd be fine with that. > > In general, people shouldn't be adding out-of-order files in the first place. I agree, but you can add a file to the Xcode UI in correct sorted order and still have sections of the .pbxproj file that aren't sorted correctly. 1338785 18 rniwa 2017-08-15 12:16:53 -0700 (In reply to Andy Estes from comment #17) > (In reply to Ryosuke Niwa from comment #14) > > Yeah, adding checks to the style checker will prevent this regardless of > > whether you're using webkit-patch or not. > > I'd be fine with that. > > > > > In general, people shouldn't be adding out-of-order files in the first place. > > I agree, but you can add a file to the Xcode UI in correct sorted order and > still have sections of the .pbxproj file that aren't sorted correctly. In many instances, that ends up in the file shown in a wrong order somewhere else in UI so I'd argue that we should just always sort them in the right order for the sake of simplicity. Figuring out which entry does and doesn't affect UI is way too much work given the inhumane format of xcodeproj files. 1338796 19 simon.fraser 2017-08-15 12:43:38 -0700 (In reply to Brian Burg from comment #15) > (In reply to Ryosuke Niwa from comment #14) > > Yeah, adding checks to the style checker will prevent this regardless of > > whether you're using webkit-patch or not. > > > > In general, people shouldn't be adding out-of-order files in the first place. > > So what, we are supposed to manually order the raw XML? Which doesn't fit > into most screens? ./Tools/Scripts/sort-Xcode-project-file 1338831 20 aestes 2017-08-15 13:24:38 -0700 (In reply to Matthew Hanson from comment #16) > Perhaps we could server-side commit hook in combination with a tool that > sorts the project files. That would require an initial sorting of all > project files, but would allow us to guarantee the sorted-ness of project > files going forward. > > The commit hook rejection message could include the location of the tool > that will sort project files. I actually like this idea even more than a style checker change. With the style checker, I'd still end up ignoring it if it complains about unrelated sorting issues. With a commit hook guaranteeing that projects in the repository are always sorted, I'll know that any issue is due to my patch and not some unrelated change. 1338838 21 simon.fraser 2017-08-15 13:30:43 -0700 I don't think you can have the style checker not warn, but the commit hook failing on an unsorted project. That results in annoyance when doing the commit, and failed commit queue commits. 1338843 22 aestes 2017-08-15 13:34:44 -0700 (In reply to Simon Fraser (smfr) from comment #21) > I don't think you can have the style checker not warn, but the commit hook > failing on an unsorted project. That results in annoyance when doing the > commit, and failed commit queue commits. That's true. Let me rephrase: I think both a style checker warning and a commit hook is better than just a style checker warning. 317274 2017-08-04 13:24:05 -0700 2017-08-07 11:25:31 -0700 Run sort-Xcode-project-file from some webkit-patch commands 174036-1.diff text/plain 8007 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNGYw MGRiYjcxMS4uNTRjNzNhOTBhMDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNy0wOC0wNCAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1hDb2RlXSB3ZWJraXQtcGF0 Y2ggc2hvdWxkIHJ1biBzb3J0LVhjb2RlLXByb2plY3QtZmlsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j b25maWcvcG9ydHMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L2Rvd25sb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91 cGxvYWQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL19faW5pdF9f LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zb3J0eGNvZGVwcm9qZWN0Zmls ZXMucHk6IEFkZGVkLgorCiAyMDE3LTA3LTMwICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFA Z21haWwuY29tPgogCiAgICAgICAgIFtXVEZdIEludHJvZHVjZSBQcml2YXRlIFN5bWJvbHMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQppbmRleCBhM2Q2 ZGQ3NmVjMS4uZDNkZmRmM2ZjNTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NvbmZpZy9wb3J0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvcG9ydHMucHkKQEAgLTEzNCw2ICsxMzQsOSBAQCBjbGFzcyBEZXByZWNhdGVkUG9y dChvYmplY3QpOgogICAgICAgICBjb21tYW5kID0gc2VsZi5zY3JpcHRfc2hlbGxfY29tbWFuZCgi cnVuLWFwaS10ZXN0cyIpCiAgICAgICAgIHJldHVybiBzZWxmLl9hcHBlbmRfYnVpbGRfc3R5bGVf ZmxhZyhjb21tYW5kLCBidWlsZF9zdHlsZSkKIAorICAgIGRlZiBydW5fc29ydF94Y29kZV9wcm9q ZWN0X2ZpbGVfY29tbWFuZChzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc2NyaXB0X3NoZWxs X2NvbW1hbmQoInNvcnQtWGNvZGUtcHJvamVjdC1maWxlIikKKwogCiBjbGFzcyBJT1NQb3J0KERl cHJlY2F0ZWRQb3J0KToKICAgICBwb3J0X2ZsYWdfbmFtZSA9ICJpb3MtZGV2aWNlIgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkLnB5CmluZGV4IDE0 YjU1YmMzZjdjLi5kOTI3NzBlZTY2YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL2Rvd25sb2FkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9kb3dubG9hZC5weQpAQCAtMTI3LDYgKzEyNyw3IEBAIGNsYXNzIExhbmRD b3doYW5kKEFic3RyYWN0U2VxdWVuY2VkQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJsYW5kLWNvd2hh bmQiCiAgICAgaGVscF90ZXh0ID0gIlByZXBhcmVzIGEgQ2hhbmdlTG9nIGFuZCBsYW5kcyB0aGUg Y3VycmVudCB3b3JraW5nIGRpcmVjdG9yeSBkaWZmLiIKICAgICBzdGVwcyA9IFsKKyAgICAgICAg c3RlcHMuU29ydFhjb2RlUHJvamVjdEZpbGVzLAogICAgICAgICBzdGVwcy5QcmVwYXJlQ2hhbmdl TG9nLAogICAgICAgICBzdGVwcy5FZGl0Q2hhbmdlTG9nLAogICAgICAgICBzdGVwcy5DaGVja1N0 eWxlLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Vw bG9hZC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHkK aW5kZXggYjNkYWRhNTA0ZjguLmM1OTI1MTk3ZWFjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHkKQEAgLTI1Nyw2ICsyNTcsNyBAQCBjbGFzcyBQ cmVwYXJlKEFic3RyYWN0U2VxdWVuY2VkQ29tbWFuZCk6CiAgICAgc3RlcHMgPSBbCiAgICAgICAg IHN0ZXBzLlByb21wdEZvckJ1Z09yVGl0bGUsCiAgICAgICAgIHN0ZXBzLkNyZWF0ZUJ1ZywKKyAg ICAgICAgc3RlcHMuU29ydFhjb2RlUHJvamVjdEZpbGVzLAogICAgICAgICBzdGVwcy5QcmVwYXJl Q2hhbmdlTG9nLAogICAgIF0KIApAQCAtMjc1LDYgKzI3Niw3IEBAIGNsYXNzIFVwbG9hZChBYnN0 cmFjdFBhdGNoVXBsb2FkaW5nQ29tbWFuZCk6CiAgICAgICAgIHN0ZXBzLkNoZWNrU3R5bGUsCiAg ICAgICAgIHN0ZXBzLlByb21wdEZvckJ1Z09yVGl0bGUsCiAgICAgICAgIHN0ZXBzLkNyZWF0ZUJ1 ZywKKyAgICAgICAgc3RlcHMuU29ydFhjb2RlUHJvamVjdEZpbGVzLAogICAgICAgICBzdGVwcy5Q cmVwYXJlQ2hhbmdlTG9nLAogICAgICAgICBzdGVwcy5FZGl0Q2hhbmdlTG9nLAogICAgICAgICBz dGVwcy5Db25maXJtRGlmZiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zdGVwcy9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9f X2luaXRfXy5weQppbmRleCA2YzljMDlhYzUyYS4uOWNhYmM0ZmE2ODIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9fX2luaXRfXy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19pbml0X18ucHkKQEAgLTU5LDYgKzU5LDcgQEAg ZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnByb21wdGZvcmJ1Z29ydGl0bGUgaW1wb3J0IFByb21w dEZvckJ1Z09yVGl0bGUKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5yZW9wZW5idWdhZnRlcnJv bGxvdXQgaW1wb3J0IFJlb3BlbkJ1Z0FmdGVyUm9sbG91dAogZnJvbSB3ZWJraXRweS50b29sLnN0 ZXBzLnJldmVydHJldmlzaW9uIGltcG9ydCBSZXZlcnRSZXZpc2lvbgogZnJvbSB3ZWJraXRweS50 b29sLnN0ZXBzLnJ1bnRlc3RzIGltcG9ydCBSdW5UZXN0cworZnJvbSB3ZWJraXRweS50b29sLnN0 ZXBzLnNvcnR4Y29kZXByb2plY3RmaWxlcyBpbXBvcnQgU29ydFhjb2RlUHJvamVjdEZpbGVzCiBm cm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMuc3VnZ2VzdHJldmlld2VycyBpbXBvcnQgU3VnZ2VzdFJl dmlld2VycwogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnVwZGF0ZSBpbXBvcnQgVXBkYXRlCiBm cm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMudXBkYXRlY2hhbmdlbG9nc3dpdGhyZXZpZXdlciBpbXBv cnQgVXBkYXRlQ2hhbmdlTG9nc1dpdGhSZXZpZXdlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvc3RlcHMvb3B0aW9ucy5weQppbmRleCBmNWUwZGVmMzI3MS4uYTZlZTA0MjNlYmYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5CkBAIC01Nyw2 ICs1Nyw3IEBAIGNsYXNzIE9wdGlvbnMob2JqZWN0KToKICAgICByZXF1ZXN0X2NvbW1pdCA9IG1h a2Vfb3B0aW9uKCItLXJlcXVlc3QtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0i cmVxdWVzdF9jb21taXQiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJSZXF1ZXN0IHRoYXQgdGhlIHBh dGNoIGJlIGFkZGVkIHRvIHRoZSBjb21taXQgcXVldWUgYWZ0ZXIgcmV2aWV3LiIpCiAgICAgcmV2 aWV3ID0gbWFrZV9vcHRpb24oIi0tbm8tcmV2aWV3IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRl c3Q9InJldmlldyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG1hcmsgdGhlIHBhdGNoIGZv ciByZXZpZXcuIikKICAgICByZXZpZXdlciA9IG1ha2Vfb3B0aW9uKCItciIsICItLXJldmlld2Vy IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9InJldmlld2VyIiwgaGVscD0i VXBkYXRlIENoYW5nZUxvZ3MgdG8gc2F5IFJldmlld2VkIGJ5IFJFVklFV0VSLiIpCisgICAgc29y dF94Y29kZV9wcm9qZWN0ID0gbWFrZV9vcHRpb24oIi0tbm8tc29ydC14Y29kZS1wcm9qZWN0Iiwg YWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InNvcnRfeGNvZGVfcHJvamVjdCIsIGRlZmF1bHQ9 VHJ1ZSwgaGVscD0iRG9uJ3Qgc29ydCBtb2RpZmllZCB4Y29kZSBwcm9qZWN0cy4iKQogICAgIHN1 Z2dlc3RfcmV2aWV3ZXJzID0gbWFrZV9vcHRpb24oIi0tc3VnZ2VzdC1yZXZpZXdlcnMiLCBhY3Rp b249InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJPZmZlciB0byBDQyBhcHByb3By aWF0ZSByZXZpZXdlcnMuIikKICAgICB0ZXN0ID0gbWFrZV9vcHRpb24oIi0tdGVzdCIsIGFjdGlv bj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJSdW4gcnVu LXdlYmtpdC10ZXN0cyBiZWZvcmUgY29tbWl0dGluZy4iKQogICAgIGl0ZXJhdGVfb25fbmV3X3Rl c3RzID0gbWFrZV9vcHRpb24oIi0taXRlcmF0ZS1vbi1uZXctdGVzdHMiLCBhY3Rpb249InN0b3Jl IiwgdHlwZT0iaW50IiwgZGVzdD0iaXRlcmF0ZV9vbl9uZXdfdGVzdHMiLCBkZWZhdWx0PTAsIGhl bHA9IlJ1biBydW4td2Via2l0LXRlc3RzIG9uIG5ldyB0ZXN0cyBvbmx5IGJlZm9yZSBjb21taXR0 aW5nLCBpdGVyYXRpbmcgYSBnaXZlbiBudW1iZXIgb2YgdGltZS4iKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3NvcnR4Y29kZXByb2plY3RmaWxlcy5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zb3J0eGNvZGVwcm9qZWN0ZmlsZXMu cHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjVjMDI2Y2NmY2Q2Ci0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3NvcnR4 Y29kZXByb2plY3RmaWxlcy5weQpAQCAtMCwwICsxLDU4IEBACisjIENvcHlyaWdodCAoQykgMjAx NyBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQKKyMKKyMgUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29w eXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUg bmFtZSBvZiBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQgbm9yIHRoZSBuYW1lcworIyBv ZiBpdHMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9k dWN0cyBkZXJpdmVkCisjIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9y IHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBU SEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1J VEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor IyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorCitpbXBvcnQgbG9nZ2luZworaW1wb3J0IHJlCitpbXBvcnQgc3lzCisK K2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9y Citmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMuYWJzdHJhY3RzdGVwIGltcG9ydCBBYnN0cmFjdFN0 ZXAKK2Zyb20gd2Via2l0cHkudG9vbC5zdGVwcy5vcHRpb25zIGltcG9ydCBPcHRpb25zCisKK19s b2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKKworCitjbGFzcyBTb3J0WGNvZGVQcm9q ZWN0RmlsZXMoQWJzdHJhY3RTdGVwKToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgb3B0aW9u cyhjbHMpOgorICAgICAgICByZXR1cm4gQWJzdHJhY3RTdGVwLm9wdGlvbnMoKSArIFsKKyAgICAg ICAgICAgIE9wdGlvbnMuc29ydF94Y29kZV9wcm9qZWN0LAorICAgICAgICBdCisKKyAgICBkZWYg cnVuKHNlbGYsIHN0YXRlKToKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5zb3J0X3hjb2RlX3By b2plY3Q6CisgICAgICAgICAgICBjaGFuZ2VkX3BieHByb2ogPSBbZmlsZSBmb3IgZmlsZSBpbiBz ZWxmLl9jaGFuZ2VkX2ZpbGVzKHN0YXRlKSBpZiBmaWxlLmVuZHN3aXRoKCIucGJ4cHJvaiIpXQor ICAgICAgICAgICAgaWYgKGxlbihjaGFuZ2VkX3BieHByb2opID4gMCk6CisgICAgICAgICAgICAg ICAgYXJncyA9IHNlbGYuX3Rvb2wuZGVwcmVjYXRlZF9wb3J0KCkucnVuX3NvcnRfeGNvZGVfcHJv amVjdF9maWxlX2NvbW1hbmQoKQorICAgICAgICAgICAgICAgIGFyZ3MgPSBhcmdzICsgY2hhbmdl ZF9wYnhwcm9qCisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICBvdXRw dXQgPSBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgc2Vs Zi5fb3B0aW9ucy5xdWlldCwgY3dkPXNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCkKKyAg ICAgICAgICAgICAgICAgICAgc2VsZi5kaWRfbW9kaWZ5X2NoZWNrb3V0KHN0YXRlKQorICAgICAg ICAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgICAgICAgICAgX2xv Zy5lcnJvcigiVW5hYmxlIHRvIHNvcnQgbW9kaWZpZWQgeGNvZGUgcHJvamVjdHMuIikKKyAgICAg ICAgICAgICAgICAgICAgc3lzLmV4aXQoMSkK 317443 2017-08-07 11:25:31 -0700 2017-08-07 17:25:24 -0700 Run sort-Xcode-project-file from some webkit-patch commands w/test changes 174036-2.diff text/plain 10355 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlNTBi MDVkNjc0Zi4uNzQyMWY0MzRiMjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0wOC0wNyAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1hDb2RlXSB3ZWJraXQtcGF0 Y2ggc2hvdWxkIHJ1biBzb3J0LVhjb2RlLXByb2plY3QtZmlsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MDM2CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8zMzczMjcwOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWQucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19pbml0X18ucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3NvcnR4Y29kZXByb2plY3RmaWxlcy5weTogQWRk ZWQuCisKIDIwMTctMDgtMDcgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAg ICAgUmVtb3ZlIENBTlZBU19QQVRIIGNvbXBpbGF0aW9uIGd1YXJkCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKaW5kZXggYTNkNmRkNzZlYzEuLmQzZGZk ZjNmYzU1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv cG9ydHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRz LnB5CkBAIC0xMzQsNiArMTM0LDkgQEAgY2xhc3MgRGVwcmVjYXRlZFBvcnQob2JqZWN0KToKICAg ICAgICAgY29tbWFuZCA9IHNlbGYuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInJ1bi1hcGktdGVzdHMi KQogICAgICAgICByZXR1cm4gc2VsZi5fYXBwZW5kX2J1aWxkX3N0eWxlX2ZsYWcoY29tbWFuZCwg YnVpbGRfc3R5bGUpCiAKKyAgICBkZWYgcnVuX3NvcnRfeGNvZGVfcHJvamVjdF9maWxlX2NvbW1h bmQoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJzb3J0 LVhjb2RlLXByb2plY3QtZmlsZSIpCisKIAogY2xhc3MgSU9TUG9ydChEZXByZWNhdGVkUG9ydCk6 CiAgICAgcG9ydF9mbGFnX25hbWUgPSAiaW9zLWRldmljZSIKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZC5weQppbmRleCAxNGI1NWJjM2Y3Yy4uZDky NzcwZWU2NmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9kb3dubG9hZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv ZG93bmxvYWQucHkKQEAgLTEyNyw2ICsxMjcsNyBAQCBjbGFzcyBMYW5kQ293aGFuZChBYnN0cmFj dFNlcXVlbmNlZENvbW1hbmQpOgogICAgIG5hbWUgPSAibGFuZC1jb3doYW5kIgogICAgIGhlbHBf dGV4dCA9ICJQcmVwYXJlcyBhIENoYW5nZUxvZyBhbmQgbGFuZHMgdGhlIGN1cnJlbnQgd29ya2lu ZyBkaXJlY3RvcnkgZGlmZi4iCiAgICAgc3RlcHMgPSBbCisgICAgICAgIHN0ZXBzLlNvcnRYY29k ZVByb2plY3RGaWxlcywKICAgICAgICAgc3RlcHMuUHJlcGFyZUNoYW5nZUxvZywKICAgICAgICAg c3RlcHMuRWRpdENoYW5nZUxvZywKICAgICAgICAgc3RlcHMuQ2hlY2tTdHlsZSwKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0 dGVzdC5weQppbmRleCA1OWM5NDg4YzA5NC4uMGM5YmFkMDExNTEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3Qu cHkKQEAgLTkwLDYgKzkwLDcgQEAgY2xhc3MgRG93bmxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNU ZXN0KToKICAgICAgICAgb3B0aW9ucy5hcmNoaXRlY3R1cmUgPSAnTU9DSyBBUkNIJwogICAgICAg ICBvcHRpb25zLml0ZXJhdGVfb25fbmV3X3Rlc3RzID0gMAogICAgICAgICBvcHRpb25zLmdyb3Vw ID0gTm9uZQorICAgICAgICBvcHRpb25zLnNvcnRfeGNvZGVfcHJvamVjdCA9IEZhbHNlCiAgICAg ICAgIHJldHVybiBvcHRpb25zCiAKICAgICBkZWYgdGVzdF9idWlsZChzZWxmKToKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5CmluZGV4IGIzZGFkYTUw NGY4Li5jNTkyNTE5N2VhYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3VwbG9hZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvdXBsb2FkLnB5CkBAIC0yNTcsNiArMjU3LDcgQEAgY2xhc3MgUHJlcGFyZShBYnN0cmFj dFNlcXVlbmNlZENvbW1hbmQpOgogICAgIHN0ZXBzID0gWwogICAgICAgICBzdGVwcy5Qcm9tcHRG b3JCdWdPclRpdGxlLAogICAgICAgICBzdGVwcy5DcmVhdGVCdWcsCisgICAgICAgIHN0ZXBzLlNv cnRYY29kZVByb2plY3RGaWxlcywKICAgICAgICAgc3RlcHMuUHJlcGFyZUNoYW5nZUxvZywKICAg ICBdCiAKQEAgLTI3NSw2ICsyNzYsNyBAQCBjbGFzcyBVcGxvYWQoQWJzdHJhY3RQYXRjaFVwbG9h ZGluZ0NvbW1hbmQpOgogICAgICAgICBzdGVwcy5DaGVja1N0eWxlLAogICAgICAgICBzdGVwcy5Q cm9tcHRGb3JCdWdPclRpdGxlLAogICAgICAgICBzdGVwcy5DcmVhdGVCdWcsCisgICAgICAgIHN0 ZXBzLlNvcnRYY29kZVByb2plY3RGaWxlcywKICAgICAgICAgc3RlcHMuUHJlcGFyZUNoYW5nZUxv ZywKICAgICAgICAgc3RlcHMuRWRpdENoYW5nZUxvZywKICAgICAgICAgc3RlcHMuQ29uZmlybURp ZmYsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBs b2FkX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Vw bG9hZF91bml0dGVzdC5weQppbmRleCAyZGY5ZGMyMTFkYy4uNjFmNjA5MDQ1NGMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0 dGVzdC5weQpAQCAtMTAzLDExICsxMDMsMTUgQEAgTU9DSyBhZGRfcGF0Y2hfdG9fYnVnOiBidWdf aWQ9NTAwMDAsIGRlc2NyaXB0aW9uPVBhdGNoIGZvciBsYW5kaW5nLCBtYXJrX2Zvcl9yZXYKICAg ICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKExhbmRTYWZlbHkoKSwgWzUwMDAwXSwg ZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogCiAgICAgZGVmIHRlc3RfcHJlcGFyZV9kaWZm X3dpdGhfYXJnKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoUHJl cGFyZSgpLCBbNTAwMDBdKQorICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQorICAgICAg ICBvcHRpb25zLnNvcnRfeGNvZGVfcHJvamVjdCA9IEZhbHNlCisgICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhQcmVwYXJlKCksIFs1MDAwMF0sIG9wdGlvbnM9b3B0aW9ucykKIAog ICAgIGRlZiB0ZXN0X3ByZXBhcmUoc2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9u cygpCisgICAgICAgIG9wdGlvbnMuc29ydF94Y29kZV9wcm9qZWN0ID0gRmFsc2UKICAgICAgICAg ZXhwZWN0ZWRfbG9ncyA9ICJNT0NLIGNyZWF0ZV9idWdcbmJ1Z190aXRsZTogTW9jayB1c2VyIHJl c3BvbnNlXG5idWdfZGVzY3JpcHRpb246IE1vY2sgdXNlciByZXNwb25zZVxuY29tcG9uZW50OiBN T0NLIGNvbXBvbmVudFxuY2M6IE1PQ0sgY2NcbiIKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0 ZV9vdXRwdXRzKFByZXBhcmUoKSwgW10sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKKyAg ICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFByZXBhcmUoKSwgW10sIGV4cGVjdGVk X2xvZ3M9ZXhwZWN0ZWRfbG9ncywgb3B0aW9ucz1vcHRpb25zKQogCiAgICAgZGVmIHRlc3RfdXBs b2FkKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQpAQCAtMTE5LDYgKzEy Myw3IEBAIE1PQ0sgYWRkX3BhdGNoX3RvX2J1ZzogYnVnX2lkPTUwMDAwLCBkZXNjcmlwdGlvbj1Q YXRjaCBmb3IgbGFuZGluZywgbWFya19mb3JfcmV2CiAgICAgICAgIG9wdGlvbnMubm9uX2ludGVy YWN0aXZlID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCA9IEZhbHNlCiAg ICAgICAgIG9wdGlvbnMucmV2aWV3ID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnNvcnRfeGNvZGVf cHJvamVjdCA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMuc3VnZ2VzdF9yZXZpZXdlcnMgPSBGYWxz ZQogICAgICAgICBleHBlY3RlZF9sb2dzID0gIiIiTU9DSzogdXNlci5vcGVuX3VybDogZmlsZTov Ly4uLgogV2FzIHRoYXQgZGlmZiBjb3JyZWN0PwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL3N0ZXBzL19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL19faW5pdF9fLnB5CmluZGV4IDZjOWMwOWFjNTJhLi45Y2FiYzRmYTY4MiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL19faW5pdF9fLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9fX2luaXRfXy5weQpAQCAtNTks NiArNTksNyBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMucHJvbXB0Zm9yYnVnb3J0aXRsZSBp bXBvcnQgUHJvbXB0Rm9yQnVnT3JUaXRsZQogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnJlb3Bl bmJ1Z2FmdGVycm9sbG91dCBpbXBvcnQgUmVvcGVuQnVnQWZ0ZXJSb2xsb3V0CiBmcm9tIHdlYmtp dHB5LnRvb2wuc3RlcHMucmV2ZXJ0cmV2aXNpb24gaW1wb3J0IFJldmVydFJldmlzaW9uCiBmcm9t IHdlYmtpdHB5LnRvb2wuc3RlcHMucnVudGVzdHMgaW1wb3J0IFJ1blRlc3RzCitmcm9tIHdlYmtp dHB5LnRvb2wuc3RlcHMuc29ydHhjb2RlcHJvamVjdGZpbGVzIGltcG9ydCBTb3J0WGNvZGVQcm9q ZWN0RmlsZXMKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5zdWdnZXN0cmV2aWV3ZXJzIGltcG9y dCBTdWdnZXN0UmV2aWV3ZXJzCiBmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMudXBkYXRlIGltcG9y dCBVcGRhdGUKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy51cGRhdGVjaGFuZ2Vsb2dzd2l0aHJl dmlld2VyIGltcG9ydCBVcGRhdGVDaGFuZ2VMb2dzV2l0aFJldmlld2VyCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9ucy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5CmluZGV4IGY1ZTBkZWYzMjcxLi5hNmVl MDQyM2ViZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29w dGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMu cHkKQEAgLTU3LDYgKzU3LDcgQEAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgIHJlcXVlc3Rf Y29tbWl0ID0gbWFrZV9vcHRpb24oIi0tcmVxdWVzdC1jb21taXQiLCBhY3Rpb249InN0b3JlX3Ry dWUiLCBkZXN0PSJyZXF1ZXN0X2NvbW1pdCIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IlJlcXVlc3Qg dGhhdCB0aGUgcGF0Y2ggYmUgYWRkZWQgdG8gdGhlIGNvbW1pdCBxdWV1ZSBhZnRlciByZXZpZXcu IikKICAgICByZXZpZXcgPSBtYWtlX29wdGlvbigiLS1uby1yZXZpZXciLCBhY3Rpb249InN0b3Jl X2ZhbHNlIiwgZGVzdD0icmV2aWV3IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBub3QgbWFyayB0 aGUgcGF0Y2ggZm9yIHJldmlldy4iKQogICAgIHJldmlld2VyID0gbWFrZV9vcHRpb24oIi1yIiwg Ii0tcmV2aWV3ZXIiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0icmV2aWV3 ZXIiLCBoZWxwPSJVcGRhdGUgQ2hhbmdlTG9ncyB0byBzYXkgUmV2aWV3ZWQgYnkgUkVWSUVXRVIu IikKKyAgICBzb3J0X3hjb2RlX3Byb2plY3QgPSBtYWtlX29wdGlvbigiLS1uby1zb3J0LXhjb2Rl LXByb2plY3QiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0ic29ydF94Y29kZV9wcm9qZWN0 IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEb24ndCBzb3J0IG1vZGlmaWVkIHhjb2RlIHByb2plY3Rz LiIpCiAgICAgc3VnZ2VzdF9yZXZpZXdlcnMgPSBtYWtlX29wdGlvbigiLS1zdWdnZXN0LXJldmll d2VycyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9Ik9mZmVyIHRv IENDIGFwcHJvcHJpYXRlIHJldmlld2Vycy4iKQogICAgIHRlc3QgPSBtYWtlX29wdGlvbigiLS10 ZXN0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0idGVzdCIsIGRlZmF1bHQ9RmFsc2UsIGhl bHA9IlJ1biBydW4td2Via2l0LXRlc3RzIGJlZm9yZSBjb21taXR0aW5nLiIpCiAgICAgaXRlcmF0 ZV9vbl9uZXdfdGVzdHMgPSBtYWtlX29wdGlvbigiLS1pdGVyYXRlLW9uLW5ldy10ZXN0cyIsIGFj dGlvbj0ic3RvcmUiLCB0eXBlPSJpbnQiLCBkZXN0PSJpdGVyYXRlX29uX25ld190ZXN0cyIsIGRl ZmF1bHQ9MCwgaGVscD0iUnVuIHJ1bi13ZWJraXQtdGVzdHMgb24gbmV3IHRlc3RzIG9ubHkgYmVm b3JlIGNvbW1pdHRpbmcsIGl0ZXJhdGluZyBhIGdpdmVuIG51bWJlciBvZiB0aW1lLiIpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc29ydHhjb2RlcHJvamVj dGZpbGVzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3NvcnR4Y29kZXBy b2plY3RmaWxlcy5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNWMw MjZjY2ZjZDYKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvc29ydHhjb2RlcHJvamVjdGZpbGVzLnB5CkBAIC0wLDAgKzEsNTggQEAKKyMgQ29weXJp Z2h0IChDKSAyMDE3IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudAorIworIyBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMg ICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBO ZWl0aGVyIHRoZSBuYW1lIG9mIFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudCBub3IgdGhl IG5hbWVzCisjIG9mIGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBw cm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKKyMgZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3Bl Y2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJ UyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRP UlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBsb2dnaW5nCitpbXBvcnQgcmUKK2lt cG9ydCBzeXMKKworZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQg U2NyaXB0RXJyb3IKK2Zyb20gd2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0ZXAgaW1wb3J0 IEFic3RyYWN0U3RlcAorZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLm9wdGlvbnMgaW1wb3J0IE9w dGlvbnMKKworX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQorCisKK2NsYXNzIFNv cnRYY29kZVByb2plY3RGaWxlcyhBYnN0cmFjdFN0ZXApOgorICAgIEBjbGFzc21ldGhvZAorICAg IGRlZiBvcHRpb25zKGNscyk6CisgICAgICAgIHJldHVybiBBYnN0cmFjdFN0ZXAub3B0aW9ucygp ICsgWworICAgICAgICAgICAgT3B0aW9ucy5zb3J0X3hjb2RlX3Byb2plY3QsCisgICAgICAgIF0K KworICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNv cnRfeGNvZGVfcHJvamVjdDoKKyAgICAgICAgICAgIGNoYW5nZWRfcGJ4cHJvaiA9IFtmaWxlIGZv ciBmaWxlIGluIHNlbGYuX2NoYW5nZWRfZmlsZXMoc3RhdGUpIGlmIGZpbGUuZW5kc3dpdGgoIi5w Ynhwcm9qIildCisgICAgICAgICAgICBpZiAobGVuKGNoYW5nZWRfcGJ4cHJvaikgPiAwKToKKyAg ICAgICAgICAgICAgICBhcmdzID0gc2VsZi5fdG9vbC5kZXByZWNhdGVkX3BvcnQoKS5ydW5fc29y dF94Y29kZV9wcm9qZWN0X2ZpbGVfY29tbWFuZCgpCisgICAgICAgICAgICAgICAgYXJncyA9IGFy Z3MgKyBjaGFuZ2VkX3BieHByb2oKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAg ICAgICAgIG91dHB1dCA9IHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFp bChhcmdzLCBzZWxmLl9vcHRpb25zLnF1aWV0LCBjd2Q9c2VsZi5fdG9vbC5zY20oKS5jaGVja291 dF9yb290KQorICAgICAgICAgICAgICAgICAgICBzZWxmLmRpZF9tb2RpZnlfY2hlY2tvdXQoc3Rh dGUpCisgICAgICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgorICAgICAgICAgICAg ICAgICAgICBfbG9nLmVycm9yKCJVbmFibGUgdG8gc29ydCBtb2RpZmllZCB4Y29kZSBwcm9qZWN0 cy4iKQorICAgICAgICAgICAgICAgICAgICBzeXMuZXhpdCgxKQo=