148387 2015-08-24 12:27:15 -0700 Add support to dashboard for displaying Git SHA's as revisions. 2015-08-24 15:43:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jmarcell webkit-unassigned adele ap bburg commit-queue dbates ddkilzer dean_johnson jake.nielsen.webkit jmarcell oldest_to_newest 1120344 0 jmarcell 2015-08-24 12:27:15 -0700 Add support to dashboard for displaying Git SHA's as revisions. 1120346 1 259764 jmarcell 2015-08-24 12:29:04 -0700 Created attachment 259764 Patch 1120347 2 259764 jmarcell 2015-08-24 12:31:15 -0700 Comment on attachment 259764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259764&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:223 > + content.textContent = revision.substr(0, 7); Are we okay with truncating this to 7 characters for display? Do we need to add any commit explaining the choice to truncate or the choice of 7 characters? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:225 > + content.textContent = revision; Should we instead throw an exception here? Or perhaps just leave the "else" clause out? 1120360 3 259764 dbates 2015-08-24 13:28:05 -0700 Comment on attachment 259764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259764&action=review We should add the isSVN property to the definition of the OpenSource repository in this patch. Otherwise, we will no longer prefix OpenSource revisions with 'r' following this patch. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:223 >> + content.textContent = revision.substr(0, 7); > > Are we okay with truncating this to 7 characters for display? Do we need to add any commit explaining the choice to truncate or the choice of 7 characters? You could add a comment to explain that a SHA of 7 characters is sufficiently unique for our purposes. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:225 >> + content.textContent = revision; > > Should we instead throw an exception here? Or perhaps just leave the "else" clause out? If you are going to handle each kind of SCM then you could add a console.assert(false, "Should not get here; " + repository.name + " did not specify a known VCS type."); Alternatively, you could write this logic such that Git is the special case and SVN is the fallback case. 1120385 4 259774 jmarcell 2015-08-24 14:37:13 -0700 Created attachment 259774 Patch 1120389 5 259774 jmarcell 2015-08-24 14:38:46 -0700 Comment on attachment 259774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259774&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:41 > + Internal: { name: "internal", isSVN: true, order: 1 }, I believe we can now remove "Internal" from this file, but we could do that in a separate patch. 1120398 6 259774 dbates 2015-08-24 14:41:47 -0700 Comment on attachment 259774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259774&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:225 > + else if (repository.isGit) > + // Truncating for display. Git traditionally uses seven characters for a short hash. > + content.textContent = revision.substr(0, 7); > + else Please add curly-braces. 1120410 7 259779 jmarcell 2015-08-24 14:44:55 -0700 Created attachment 259779 Patch 1120427 8 259779 commit-queue 2015-08-24 15:43:08 -0700 Comment on attachment 259779 Patch Clearing flags on attachment: 259779 Committed r188890: <http://trac.webkit.org/changeset/188890> 1120428 9 commit-queue 2015-08-24 15:43:13 -0700 All reviewed patches have been landed. Closing bug. 259764 2015-08-24 12:29:04 -0700 2015-08-24 14:37:09 -0700 Patch bug-148387-20150824122855.patch text/plain 3555 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NTRj NDM5MDYzNjY2NjQ2MGY3OTk5MWM3OGUzYjRhZWYwYWQ5ZTViLi44YWVjNTE2OWE0NGU5NWNjNDU3 ZGRlYjQ3Y2YxYzdkZmQ1Njc1NGQ5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDgtMjQgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgdG8gZGFzaGJv YXJkIGZvciBkaXNwbGF5aW5nIEdpdCBTSEEncyBhcyByZXZpc2lvbnMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgzODcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90SXRlcmF0aW9uLmpzOgorICAgICAgICAocGFyc2VSZXZpc2lvblByb3BlcnR5KTogQWRkZWQg c3VwcG9ydCB0byBkYXNoYm9hcmQgZm9yIGRpc3BsYXlpbmcgR2l0IFNIQSdzIGFzIHJldmlzaW9u cy4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAg ICAgKEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92 ZXJGb3JJdGVyYXRpb24pOiBEaXR0by4KKwogMjAxNS0wOC0yMyAgQW5keSBFc3RlcyAgPGFlc3Rl c0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkcmVzc2VkIGEgbWlzc2VkIHBpZWNlIG9mIHJldmll dyBmZWVkYmFjayBmcm9tIHIxODg4NTEuCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRl cmF0aW9uLmpzCmluZGV4IDNkMGNkMWJjZWQ4YTk5MTQyMzE0Y2RjYjU2OWRkNDdhZmQ4OTA5YjQu LjFkZDRiY2I5NzU3ZDNlMjg4YTJlMGM1NGUzYTE3MmY5NGE5YjdhNjUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1s L2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCisrKyBiL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCkBAIC0xMDksNyArMTA5LDcgQEAgZnVuY3Rp b24gcGFyc2VSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KQogICAg IC8vIFsiZ290X3JldmlzaW9uIiwiMjQ2OCIsIlNvdXJjZSJdCiAgICAgaWYgKGlzTXVsdGlDb2Rl YmFzZUdvdFJldmlzaW9uUHJvcGVydHkocHJvcGVydHkpKQogICAgICAgICB2YWx1ZSA9IChrZXkg aW4gdmFsdWUpID8gdmFsdWVba2V5XSA6IHZhbHVlW2ZhbGxiYWNrS2V5XTsKLSAgICByZXR1cm4g cGFyc2VJbnQodmFsdWUpOworICAgIHJldHVybiB2YWx1ZTsKIH0KIAogQnVpbGRib3RJdGVyYXRp b24ucHJvdG90eXBlID0gewpAQCAtMjEyLDcgKzIxMiwxMSBAQCBCdWlsZGJvdEl0ZXJhdGlvbi5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAga2V5ID0gcmVwb3NpdG9yeU5hbWU7CiAgICAg ICAgICAgICAgICAgZmFsbGJhY2tLZXkgPSBudWxsOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgdGhpcy5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0gPSBwYXJzZVJldmlzaW9uUHJvcGVydHko cmV2aXNpb25Qcm9wZXJ0eSwga2V5LCBmYWxsYmFja0tleSk7CisgICAgICAgICAgICB2YXIgcmV2 aXNpb24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkocmV2aXNpb25Qcm9wZXJ0eSwga2V5LCBmYWxs YmFja0tleSk7CisgICAgICAgICAgICBpZiAocmVwb3NpdG9yeS5pc1NWTikKKyAgICAgICAgICAg ICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSA9IHBhcnNlSW50KHJldmlzaW9uKTsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRv cnlOYW1lXSA9IHJldmlzaW9uOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gc291cmNl U3RhbXBDaGFuZ2VzKHNvdXJjZVN0YW1wKSB7CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 UXVldWVWaWV3LmpzCmluZGV4IDQzNGU1NDI1YTM0ZmZiMzFhNGJlYzhiMTg4MDQ0NjJmY2IxNGYx ZTYuLjE1ZDFkYTAwZWFlNTM5MWQzZGI2ODliM2U1ZTBiZTcxMWJjZDlkNjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCisrKyBiL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCkBAIC0yMTYsNyArMjE2LDEzIEBAIEJ1 aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHJlcG9zaXRvcnlOYW1l ID0gcmVwb3NpdG9yeS5uYW1lOwogICAgICAgICBjb25zb2xlLmFzc2VydChpdGVyYXRpb24ucmV2 aXNpb25bcmVwb3NpdG9yeU5hbWVdKTsKICAgICAgICAgdmFyIGNvbnRlbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSAiciIg KyBpdGVyYXRpb24ucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdOworICAgICAgICB2YXIgcmV2aXNp b24gPSBpdGVyYXRpb24ucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdOworICAgICAgICBpZiAocmVw b3NpdG9yeS5pc1NWTikKKyAgICAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSAiciIgKyBy ZXZpc2lvbjsKKyAgICAgICAgZWxzZSBpZiAocmVwb3NpdG9yeS5pc0dpdCkKKyAgICAgICAgICAg IGNvbnRlbnQudGV4dENvbnRlbnQgPSByZXZpc2lvbi5zdWJzdHIoMCwgNyk7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSByZXZpc2lvbjsKICAgICAgICAg Y29udGVudC5jbGFzc0xpc3QuYWRkKCJyZXZpc2lvbi1udW1iZXIiKTsKIAogICAgICAgICBpZiAo cHJldmlvdXNJdGVyYXRpb24pIHsK 259774 2015-08-24 14:37:13 -0700 2015-08-24 14:44:51 -0700 Patch bug-148387-20150824143704.patch text/plain 4745 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NTRj NDM5MDYzNjY2NjQ2MGY3OTk5MWM3OGUzYjRhZWYwYWQ5ZTViLi40YzhmZGRjMWViMDVlZDIwNjdi OTdhYWQwNDM0NWI2YTc2MWNlYjcxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDgtMjQgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgdG8gZGFzaGJv YXJkIGZvciBkaXNwbGF5aW5nIEdpdCBTSEEncyBhcyByZXZpc2lvbnMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgzODcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90SXRlcmF0aW9uLmpzOgorICAgICAgICAocGFyc2VSZXZpc2lvblByb3BlcnR5KTogQWRkZWQg c3VwcG9ydCB0byBkYXNoYm9hcmQgZm9yIGRpc3BsYXlpbmcgR2l0IFNIQSdzIGFzIHJldmlzaW9u cy4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAg ICAgKEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92 ZXJGb3JJdGVyYXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9EYXNoYm9h cmQuanM6IEFkZGVkCisgICAgICAgICJpc1NWTiIgcHJvcGVydHkgdG8gRGFzaGJvYXJkLlJlcG9z aXRvcnkuKE9wZW5Tb3VyY2V8SW50ZXJuYWwpLgorCiAyMDE1LTA4LTIzICBBbmR5IEVzdGVzICA8 YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzZWQgYSBtaXNzZWQgcGllY2Ugb2Yg cmV2aWV3IGZlZWRiYWNrIGZyb20gcjE4ODg1MS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RJdGVyYXRpb24uanMKaW5kZXggM2QwY2QxYmNlZDhhOTkxNDIzMTRjZGNiNTY5ZGQ0N2FmZDg5 MDliNC4uMWRkNGJjYjk3NTdkM2UyODhhMmUwYzU0ZTNhMTcyZjk0YTliN2E2NSAxMDA2NDQKLS0t IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKKysrIGIvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKQEAgLTEwOSw3ICsxMDksNyBAQCBm dW5jdGlvbiBwYXJzZVJldmlzaW9uUHJvcGVydHkocHJvcGVydHksIGtleSwgZmFsbGJhY2tLZXkp CiAgICAgLy8gWyJnb3RfcmV2aXNpb24iLCIyNDY4IiwiU291cmNlIl0KICAgICBpZiAoaXNNdWx0 aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSkpCiAgICAgICAgIHZhbHVlID0g KGtleSBpbiB2YWx1ZSkgPyB2YWx1ZVtrZXldIDogdmFsdWVbZmFsbGJhY2tLZXldOwotICAgIHJl dHVybiBwYXJzZUludCh2YWx1ZSk7CisgICAgcmV0dXJuIHZhbHVlOwogfQogCiBCdWlsZGJvdEl0 ZXJhdGlvbi5wcm90b3R5cGUgPSB7CkBAIC0yMTIsNyArMjEyLDExIEBAIEJ1aWxkYm90SXRlcmF0 aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXkgPSByZXBvc2l0b3J5TmFtZTsK ICAgICAgICAgICAgICAgICBmYWxsYmFja0tleSA9IG51bGw7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSA9IHBhcnNlUmV2aXNpb25Qcm9w ZXJ0eShyZXZpc2lvblByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KTsKKyAgICAgICAgICAgIHZh ciByZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShyZXZpc2lvblByb3BlcnR5LCBrZXks IGZhbGxiYWNrS2V5KTsKKyAgICAgICAgICAgIGlmIChyZXBvc2l0b3J5LmlzU1ZOKQorICAgICAg ICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdID0gcGFyc2VJbnQocmV2aXNp b24pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVw b3NpdG9yeU5hbWVdID0gcmV2aXNpb247CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBz b3VyY2VTdGFtcENoYW5nZXMoc291cmNlU3RhbXApIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RRdWV1ZVZpZXcuanMKaW5kZXggNDM0ZTU0MjVhMzRmZmIzMWE0YmVjOGIxODgwNDQ2MmZj YjE0ZjFlNi4uNzZkNjZlNjFkZGU1Y2EyZmMyMDgyYWZiNDlmZGYyZTgzZGIzNTk3MyAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKKysrIGIvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKQEAgLTIxNiw3ICsyMTYsMTQg QEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcmVwb3NpdG9y eU5hbWUgPSByZXBvc2l0b3J5Lm5hbWU7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGl0ZXJhdGlv bi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0pOwogICAgICAgICB2YXIgY29udGVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9 ICJyIiArIGl0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV07CisgICAgICAgIHZhciBy ZXZpc2lvbiA9IGl0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV07CisgICAgICAgIGlm IChyZXBvc2l0b3J5LmlzU1ZOKQorICAgICAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9ICJy IiArIHJldmlzaW9uOworICAgICAgICBlbHNlIGlmIChyZXBvc2l0b3J5LmlzR2l0KQorICAgICAg ICAgICAgLy8gVHJ1bmNhdGluZyBmb3IgZGlzcGxheS4gR2l0IHRyYWRpdGlvbmFsbHkgdXNlcyBz ZXZlbiBjaGFyYWN0ZXJzIGZvciBhIHNob3J0IGhhc2guCisgICAgICAgICAgICBjb250ZW50LnRl eHRDb250ZW50ID0gcmV2aXNpb24uc3Vic3RyKDAsIDcpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlNob3VsZCBub3QgZ2V0IGhlcmU7ICIgKyByZXBv c2l0b3J5Lm5hbWUgKyAiIGRpZCBub3Qgc3BlY2lmeSBhIGtub3duIFZDUyB0eXBlLiIpOwogICAg ICAgICBjb250ZW50LmNsYXNzTGlzdC5hZGQoInJldmlzaW9uLW51bWJlciIpOwogCiAgICAgICAg IGlmIChwcmV2aW91c0l0ZXJhdGlvbikgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvRGFzaGJvYXJkLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvRGFzaGJvYXJkLmpzCmluZGV4 IGNkNTc1YTY4ZTk3ZDE1MGI3NjE0MGMxN2RiMTk4OTIyYzc2ZjRhZjQuLjI5NmQ5NTI3YmY3MWEx ODg0ZjMxNzE2MDViMzQyYWIyMjI5OGI2NmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0Rhc2hib2FyZC5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9EYXNoYm9hcmQuanMK QEAgLTM3LDggKzM3LDggQEAgRGFzaGJvYXJkID0gewogICAgIH0sCiAgICAgQnJhbmNoOiB7fSwK ICAgICBSZXBvc2l0b3J5OiB7Ci0gICAgICAgIE9wZW5Tb3VyY2U6IHsgbmFtZTogIm9wZW5Tb3Vy Y2UiLCBvcmRlcjogMCB9LAotICAgICAgICBJbnRlcm5hbDogeyBuYW1lOiAiaW50ZXJuYWwiLCBv cmRlcjogMSB9LAorICAgICAgICBPcGVuU291cmNlOiB7IG5hbWU6ICJvcGVuU291cmNlIiwgaXNT Vk46IHRydWUsIG9yZGVyOiAwIH0sCisgICAgICAgIEludGVybmFsOiB7IG5hbWU6ICJpbnRlcm5h bCIsIGlzU1ZOOiB0cnVlLCBvcmRlcjogMSB9LAogICAgIH0sCiAgICAgZ2V0IHNvcnRlZFBsYXRm b3JtcygpCiAgICAgewo= 259779 2015-08-24 14:44:55 -0700 2015-08-24 15:43:08 -0700 Patch bug-148387-20150824144446.patch text/plain 4749 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NTRj NDM5MDYzNjY2NjQ2MGY3OTk5MWM3OGUzYjRhZWYwYWQ5ZTViLi40YzhmZGRjMWViMDVlZDIwNjdi OTdhYWQwNDM0NWI2YTc2MWNlYjcxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDgtMjQgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgdG8gZGFzaGJv YXJkIGZvciBkaXNwbGF5aW5nIEdpdCBTSEEncyBhcyByZXZpc2lvbnMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgzODcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90SXRlcmF0aW9uLmpzOgorICAgICAgICAocGFyc2VSZXZpc2lvblByb3BlcnR5KTogQWRkZWQg c3VwcG9ydCB0byBkYXNoYm9hcmQgZm9yIGRpc3BsYXlpbmcgR2l0IFNIQSdzIGFzIHJldmlzaW9u cy4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAg ICAgKEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92 ZXJGb3JJdGVyYXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9EYXNoYm9h cmQuanM6IEFkZGVkCisgICAgICAgICJpc1NWTiIgcHJvcGVydHkgdG8gRGFzaGJvYXJkLlJlcG9z aXRvcnkuKE9wZW5Tb3VyY2V8SW50ZXJuYWwpLgorCiAyMDE1LTA4LTIzICBBbmR5IEVzdGVzICA8 YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzZWQgYSBtaXNzZWQgcGllY2Ugb2Yg cmV2aWV3IGZlZWRiYWNrIGZyb20gcjE4ODg1MS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RJdGVyYXRpb24uanMKaW5kZXggM2QwY2QxYmNlZDhhOTkxNDIzMTRjZGNiNTY5ZGQ0N2FmZDg5 MDliNC4uMWRkNGJjYjk3NTdkM2UyODhhMmUwYzU0ZTNhMTcyZjk0YTliN2E2NSAxMDA2NDQKLS0t IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKKysrIGIvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKQEAgLTEwOSw3ICsxMDksNyBAQCBm dW5jdGlvbiBwYXJzZVJldmlzaW9uUHJvcGVydHkocHJvcGVydHksIGtleSwgZmFsbGJhY2tLZXkp CiAgICAgLy8gWyJnb3RfcmV2aXNpb24iLCIyNDY4IiwiU291cmNlIl0KICAgICBpZiAoaXNNdWx0 aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSkpCiAgICAgICAgIHZhbHVlID0g KGtleSBpbiB2YWx1ZSkgPyB2YWx1ZVtrZXldIDogdmFsdWVbZmFsbGJhY2tLZXldOwotICAgIHJl dHVybiBwYXJzZUludCh2YWx1ZSk7CisgICAgcmV0dXJuIHZhbHVlOwogfQogCiBCdWlsZGJvdEl0 ZXJhdGlvbi5wcm90b3R5cGUgPSB7CkBAIC0yMTIsNyArMjEyLDExIEBAIEJ1aWxkYm90SXRlcmF0 aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXkgPSByZXBvc2l0b3J5TmFtZTsK ICAgICAgICAgICAgICAgICBmYWxsYmFja0tleSA9IG51bGw7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSA9IHBhcnNlUmV2aXNpb25Qcm9w ZXJ0eShyZXZpc2lvblByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KTsKKyAgICAgICAgICAgIHZh ciByZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShyZXZpc2lvblByb3BlcnR5LCBrZXks IGZhbGxiYWNrS2V5KTsKKyAgICAgICAgICAgIGlmIChyZXBvc2l0b3J5LmlzU1ZOKQorICAgICAg ICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdID0gcGFyc2VJbnQocmV2aXNp b24pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVw b3NpdG9yeU5hbWVdID0gcmV2aXNpb247CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBz b3VyY2VTdGFtcENoYW5nZXMoc291cmNlU3RhbXApIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RRdWV1ZVZpZXcuanMKaW5kZXggNDM0ZTU0MjVhMzRmZmIzMWE0YmVjOGIxODgwNDQ2MmZj YjE0ZjFlNi4uODQ4ZWIxYjAxM2IzYzVjODMwYzg1YTg4MTliMGU2YmEyMDJlMDNmYyAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKKysrIGIvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKQEAgLTIxNiw3ICsyMTYsMTQg QEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcmVwb3NpdG9y eU5hbWUgPSByZXBvc2l0b3J5Lm5hbWU7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGl0ZXJhdGlv bi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0pOwogICAgICAgICB2YXIgY29udGVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9 ICJyIiArIGl0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV07CisgICAgICAgIHZhciBy ZXZpc2lvbiA9IGl0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV07CisgICAgICAgIGlm IChyZXBvc2l0b3J5LmlzU1ZOKQorICAgICAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9ICJy IiArIHJldmlzaW9uOworICAgICAgICBlbHNlIGlmIChyZXBvc2l0b3J5LmlzR2l0KSB7CisgICAg ICAgICAgICAvLyBUcnVuY2F0aW5nIGZvciBkaXNwbGF5LiBHaXQgdHJhZGl0aW9uYWxseSB1c2Vz IHNldmVuIGNoYXJhY3RlcnMgZm9yIGEgc2hvcnQgaGFzaC4KKyAgICAgICAgICAgIGNvbnRlbnQu dGV4dENvbnRlbnQgPSByZXZpc2lvbi5zdWJzdHIoMCwgNyk7CisgICAgICAgIH0gZWxzZQorICAg ICAgICAgICAgY29uc29sZS5hc3NlcnQoZmFsc2UsICJTaG91bGQgbm90IGdldCBoZXJlOyAiICsg cmVwb3NpdG9yeS5uYW1lICsgIiBkaWQgbm90IHNwZWNpZnkgYSBrbm93biBWQ1MgdHlwZS4iKTsK ICAgICAgICAgY29udGVudC5jbGFzc0xpc3QuYWRkKCJyZXZpc2lvbi1udW1iZXIiKTsKIAogICAg ICAgICBpZiAocHJldmlvdXNJdGVyYXRpb24pIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL0Rhc2hib2FyZC5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0Rhc2hib2FyZC5qcwpp bmRleCBjZDU3NWE2OGU5N2QxNTBiNzYxNDBjMTdkYjE5ODkyMmM3NmY0YWY0Li4yOTZkOTUyN2Jm NzFhMTg4NGYzMTcxNjA1YjM0MmFiMjIyOThiNjZlIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9EYXNoYm9hcmQuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvRGFzaGJvYXJk LmpzCkBAIC0zNyw4ICszNyw4IEBAIERhc2hib2FyZCA9IHsKICAgICB9LAogICAgIEJyYW5jaDog e30sCiAgICAgUmVwb3NpdG9yeTogewotICAgICAgICBPcGVuU291cmNlOiB7IG5hbWU6ICJvcGVu U291cmNlIiwgb3JkZXI6IDAgfSwKLSAgICAgICAgSW50ZXJuYWw6IHsgbmFtZTogImludGVybmFs Iiwgb3JkZXI6IDEgfSwKKyAgICAgICAgT3BlblNvdXJjZTogeyBuYW1lOiAib3BlblNvdXJjZSIs IGlzU1ZOOiB0cnVlLCBvcmRlcjogMCB9LAorICAgICAgICBJbnRlcm5hbDogeyBuYW1lOiAiaW50 ZXJuYWwiLCBpc1NWTjogdHJ1ZSwgb3JkZXI6IDEgfSwKICAgICB9LAogICAgIGdldCBzb3J0ZWRQ bGF0Zm9ybXMoKQogICAgIHsK