147938 2015-08-12 10:40:06 -0700 Refactor BuildbotQueueView._appendPendingRevisionCount to work more generically with repositories other than "openSource" and "internal". 2015-08-14 11:07:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jmarcell webkit-unassigned adele ap bburg commit-queue dbates jmarcell oldest_to_newest 1116973 0 jmarcell 2015-08-12 10:40:06 -0700 Refactor BuildbotQueueView._appendPendingRevisionCount to work more generically with repositories other than "openSource" and "internal". 1116974 1 258828 jmarcell 2015-08-12 10:45:49 -0700 Created attachment 258828 Patch 1117043 2 258828 dbates 2015-08-12 13:33:45 -0700 Comment on attachment 258828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258828&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:84 > + for (var i = 0; i < Dashboard.sortedRepositories.length; i++) { > + var repository = Dashboard.sortedRepositories[i]; Notice that Dashboard.sortedRepositories is a getter function. We should cache Dashboard.sortedRepositories in a local variable instead of computing it twice on each iteration. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:90 > + if (!trac.latestRecordedRevisionNumber || trac.oldestRecordedRevisionNumber > trac.latestProductiveIteration) { I take it you meant to write: if (!trac.latestRecordedRevisionNumber || trac.oldestRecordedRevisionNumber > latestProductiveRevisionNumber) (Notice that I substituted latestProductiveRevisionNumber for trac.latestProductiveIteration in the second disjunct). > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:96 > + totalRevisionsBehind += trac.commitsOnBranch(branch, > + function(commit) { return commit.revisionNumber > latestProductiveRevisionNumber; }).length; Please write this on one line. 1117095 3 258855 jmarcell 2015-08-12 17:14:38 -0700 Created attachment 258855 Patch 1117096 4 jmarcell 2015-08-12 17:16:18 -0700 I addressed all of Daniel Bates' concerns from his previous comment. Additionally I added a local variable repositoryName to cache repository.name. 1117245 5 258855 commit-queue 2015-08-13 09:39:19 -0700 Comment on attachment 258855 Patch Rejecting attachment 258855 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 258855, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file Tools/ChangeLog.rej patching file Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/53373 1117481 6 258960 jmarcell 2015-08-13 17:24:42 -0700 Created attachment 258960 Patch 1117482 7 258960 jmarcell 2015-08-13 17:25:42 -0700 Comment on attachment 258960 Patch Uploaded a new patch because the last one failed to apply in the commit queue. 1117483 8 258960 commit-queue 2015-08-13 17:30:16 -0700 Comment on attachment 258960 Patch Rejecting attachment 258960 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 258960, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Tools/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/55981 1117514 9 jmarcell 2015-08-13 18:43:21 -0700 It failed again but for a different reason this time. It's complaining about the OOPS on the reviewer field this time. I thought that get's automatically added. Oh, is it because I asked for cq? but not review on this one? 1117515 10 258960 jmarcell 2015-08-13 18:44:07 -0700 Comment on attachment 258960 Patch Trying this again. Last time I just asked for cq? but didn't set r?. 1117671 11 258960 commit-queue 2015-08-14 11:07:15 -0700 Comment on attachment 258960 Patch Clearing flags on attachment: 258960 Committed r188478: <http://trac.webkit.org/changeset/188478> 1117672 12 commit-queue 2015-08-14 11:07:20 -0700 All reviewed patches have been landed. Closing bug. 258828 2015-08-12 10:45:49 -0700 2015-08-12 17:14:35 -0700 Patch bug-147938-20150812104533.patch text/plain 4085 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyZTI3 NGVmYjM0NGUzMDFiNWJkOTZjZGQ5ZWNhMDI1OTcyNTlmMDcwLi4zZTYzODU5OGYyMDhmYTY2ZjE2 NTM1YmEwYzUyYTM4NTRhNDE0MWI3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKKzIwMTUtMDgtMTIgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgQnVpbGRib3RRdWV1 ZVZpZXcuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50IHRvIHdvcmsgbW9yZSBnZW5lcmljYWxs eSB3aXRoIHJlcG9zaXRvcmllcworICAgICAgICBvdGhlciB0aGFuICJvcGVuU291cmNlIiBhbmQg ImludGVybmFsIi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NzkzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6CisgICAgICAgIChCdWls ZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTogUmVm YWN0b3JlZCB0byB3b3JrIG1vcmUgZ2VuZXJpY2FsbHkgd2l0aAorICAgICAgICByZXBvc2l0b3Jp ZXMgb3RoZXIgdGhhbiAib3BlblNvdXJjZSIgYW5kICJpbnRlcm5hbCIuCisKIDIwMTUtMDgtMTIg IEphc29uIE1hcmNlbGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3Ig QnVpbGRib3RRdWV1ZVZpZXcucmV2aXNpb25Db250ZW50Rm9ySXRlcmF0aW9uIHRvIHdvcmsgbW9y ZSBnZW5lcmljYWxseSB3aXRoIHJlcG9zaXRvcmllcwogICAgICAgICBvdGhlciB0aGFuICJvcGVu U291cmNlIiBhbmQgImludGVybmFsIi4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0Nzc5NgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv QnVpbGRib3RRdWV1ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl Vmlldy5qcwppbmRleCBhNjIyNDBiMWQ0MmRhYWUwMWExNjMyOGIxODFhOTkzYTQ3NTU3ZWJjLi4z ZDcxY2ZjNzM5ZWQwMDc2NWVkMjc4MjliNDBkNGMzNjk3YTk2OTQ0IDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcworKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwpAQCAtNzYsMjYgKzc2LDI0IEBAIEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFsYXRlc3RQcm9kdWN0aXZlSXRl cmF0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciB3ZWJraXRUcmFjID0g RGFzaGJvYXJkLlJlcG9zaXRvcnkuT3BlblNvdXJjZS50cmFjOwotICAgICAgICB2YXIgaW50ZXJu YWxUcmFjID0gRGFzaGJvYXJkLlJlcG9zaXRvcnkuSW50ZXJuYWwudHJhYzsKLSAgICAgICAgdmFy IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyID0gd2Via2l0VHJhYy5sYXRl c3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwotICAgICAgICBpZiAoIWxhdGVzdFJlY29yZGVkT3Bl blNvdXJjZVJldmlzaW9uTnVtYmVyIHx8IHdlYmtpdFRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lv bk51bWJlciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNpb25bRGFzaGJvYXJkLlJl cG9zaXRvcnkuT3BlblNvdXJjZS5uYW1lXSkgewotICAgICAgICAgICAgd2Via2l0VHJhYy5sb2Fk TW9yZUhpc3RvcmljYWxEYXRhKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAg ICAgICAgdmFyIHRvdGFsUmV2aXNpb25zQmVoaW5kID0gMDsKIAogICAgICAgICAvLyBGSVhNRTog VG8gYmUgMTAwJSBjb3JyZWN0LCB3ZSBzaG91bGQgYWxzbyBmaWx0ZXIgb3V0IGNoYW5nZXMgdGhh dCBhcmUgaWdub3JlZCBieQogICAgICAgICAvLyB0aGUgcXVldWUsIHNlZSBfc2hvdWxkX2ZpbGVf dHJpZ2dlcl9idWlsZCBpbiB3a2J1aWxkLnB5LgotICAgICAgICB2YXIgdG90YWxSZXZpc2lvbnNC ZWhpbmQgPSB3ZWJraXRUcmFjLmNvbW1pdHNPbkJyYW5jaChxdWV1ZS5icmFuY2gub3BlblNvdXJj ZSwgZnVuY3Rpb24oY29tbWl0KSB7IHJldHVybiBjb21taXQucmV2aXNpb25OdW1iZXIgPiBsYXRl c3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJldmlzaW9uW0Rhc2hib2FyZC5SZXBvc2l0b3J5Lk9wZW5T b3VyY2UubmFtZV07IH0pLmxlbmd0aDsKLQotICAgICAgICBpZiAobGF0ZXN0UHJvZHVjdGl2ZUl0 ZXJhdGlvbi5yZXZpc2lvbltEYXNoYm9hcmQuUmVwb3NpdG9yeS5JbnRlcm5hbC5uYW1lXSkgewot ICAgICAgICAgICAgdmFyIGxhdGVzdFJlY29yZGVkSW50ZXJuYWxSZXZpc2lvbk51bWJlciA9IGlu dGVybmFsVHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwotICAgICAgICAgICAgaWYg KCFsYXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1iZXIgfHwgaW50ZXJuYWxUcmFjLm9s ZGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIgPiBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJl dmlzaW9uW0Rhc2hib2FyZC5SZXBvc2l0b3J5LkludGVybmFsLm5hbWVdKSB7Ci0gICAgICAgICAg ICAgICAgaW50ZXJuYWxUcmFjLmxvYWRNb3JlSGlzdG9yaWNhbERhdGEoKTsKKyAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBEYXNoYm9hcmQuc29ydGVkUmVwb3NpdG9yaWVzLmxlbmd0aDsgaSsr KSB7CisgICAgICAgICAgICB2YXIgcmVwb3NpdG9yeSA9IERhc2hib2FyZC5zb3J0ZWRSZXBvc2l0 b3JpZXNbaV07CisgICAgICAgICAgICB2YXIgdHJhYyA9IHJlcG9zaXRvcnkudHJhYzsKKyAgICAg ICAgICAgIHZhciBicmFuY2ggPSBxdWV1ZS5icmFuY2hbcmVwb3NpdG9yeS5uYW1lXTsKKyAgICAg ICAgICAgIHZhciBsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1iZXIgPSBsYXRlc3RQcm9kdWN0 aXZlSXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnkubmFtZV07CisgICAgICAgICAgICBpZiAo IWxhdGVzdFByb2R1Y3RpdmVSZXZpc2lvbk51bWJlcikKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIGlmICghdHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyIHx8 IHRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlciA+IHRyYWMubGF0ZXN0UHJvZHVjdGl2 ZUl0ZXJhdGlvbikgeworICAgICAgICAgICAgICAgIHRyYWMubG9hZE1vcmVIaXN0b3JpY2FsRGF0 YSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgdG90YWxSZXZpc2lvbnNCZWhpbmQgKz0gaW50ZXJuYWxUcmFjLmNvbW1pdHNPbkJyYW5jaChx dWV1ZS5icmFuY2guaW50ZXJuYWwsIGZ1bmN0aW9uKGNvbW1pdCkgeyByZXR1cm4gY29tbWl0LnJl dmlzaW9uTnVtYmVyID4gbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5yZXZpc2lvbltEYXNoYm9h cmQuUmVwb3NpdG9yeS5JbnRlcm5hbC5uYW1lXTsgfSkubGVuZ3RoOworICAgICAgICAgICAgdG90 YWxSZXZpc2lvbnNCZWhpbmQgKz0gdHJhYy5jb21taXRzT25CcmFuY2goYnJhbmNoLAorICAgICAg ICAgICAgICAgIGZ1bmN0aW9uKGNvbW1pdCkgeyByZXR1cm4gY29tbWl0LnJldmlzaW9uTnVtYmVy ID4gbGF0ZXN0UHJvZHVjdGl2ZVJldmlzaW9uTnVtYmVyOyB9KS5sZW5ndGg7CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoIXRvdGFsUmV2aXNpb25zQmVoaW5kKQo= 258855 2015-08-12 17:14:38 -0700 2015-08-13 17:24:38 -0700 Patch bug-147938-20150812171421.patch text/plain 4127 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1ZWE4 ZDU0MzQwOGUwNjU4Y2U2N2ZkOWVkMDc3NDFlNWY3MzRhNjljLi4zMmRiZDAwODAwNTVjYTI1YWUy YjMwZDk1NTRkMTM5MmRjZmNjNjkzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKKzIwMTUtMDgtMTIgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgQnVpbGRib3RRdWV1 ZVZpZXcuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50IHRvIHdvcmsgbW9yZSBnZW5lcmljYWxs eSB3aXRoIHJlcG9zaXRvcmllcworICAgICAgICBvdGhlciB0aGFuICJvcGVuU291cmNlIiBhbmQg ImludGVybmFsIi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NzkzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6CisgICAgICAgIChCdWls ZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTogUmVm YWN0b3JlZCB0byB3b3JrIG1vcmUgZ2VuZXJpY2FsbHkgd2l0aAorICAgICAgICByZXBvc2l0b3Jp ZXMgb3RoZXIgdGhhbiAib3BlblNvdXJjZSIgYW5kICJpbnRlcm5hbCIuCisKIDIwMTUtMDgtMTIg IEphc29uIE1hcmNlbGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3Ig QnVpbGRib3RRdWV1ZVZpZXcucmV2aXNpb25Db250ZW50Rm9ySXRlcmF0aW9uIHRvIHdvcmsgbW9y ZSBnZW5lcmljYWxseSB3aXRoIHJlcG9zaXRvcmllcwogICAgICAgICBvdGhlciB0aGFuICJvcGVu U291cmNlIiBhbmQgImludGVybmFsIi4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0Nzc5NgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv QnVpbGRib3RRdWV1ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl Vmlldy5qcwppbmRleCBlMDc4MWMwZTQxYzI0OTE0YzZjOWRkZTJiZDI0NzZiMzlmMTQ3ZDUyLi5j NzU0NGJhNTk4MjY5NmIzYmE0MjFiMWRjYmM3YjBlMjNiYjU1OGI0IDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcworKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwpAQCAtNzYsMjYgKzc2LDI0IEBAIEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFsYXRlc3RQcm9kdWN0aXZlSXRl cmF0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciB3ZWJraXRUcmFjID0g RGFzaGJvYXJkLlJlcG9zaXRvcnkuT3BlblNvdXJjZS50cmFjOwotICAgICAgICB2YXIgaW50ZXJu YWxUcmFjID0gRGFzaGJvYXJkLlJlcG9zaXRvcnkuSW50ZXJuYWwudHJhYzsKLSAgICAgICAgdmFy IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyID0gd2Via2l0VHJhYy5sYXRl c3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwotICAgICAgICBpZiAoIWxhdGVzdFJlY29yZGVkT3Bl blNvdXJjZVJldmlzaW9uTnVtYmVyIHx8IHdlYmtpdFRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lv bk51bWJlciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNpb25bRGFzaGJvYXJkLlJl cG9zaXRvcnkuT3BlblNvdXJjZS5uYW1lXSkgewotICAgICAgICAgICAgd2Via2l0VHJhYy5sb2Fk TW9yZUhpc3RvcmljYWxEYXRhKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAg ICAgICAgdmFyIHRvdGFsUmV2aXNpb25zQmVoaW5kID0gMDsKIAogICAgICAgICAvLyBGSVhNRTog VG8gYmUgMTAwJSBjb3JyZWN0LCB3ZSBzaG91bGQgYWxzbyBmaWx0ZXIgb3V0IGNoYW5nZXMgdGhh dCBhcmUgaWdub3JlZCBieQogICAgICAgICAvLyB0aGUgcXVldWUsIHNlZSBfc2hvdWxkX2ZpbGVf dHJpZ2dlcl9idWlsZCBpbiB3a2J1aWxkLnB5LgotICAgICAgICB2YXIgdG90YWxSZXZpc2lvbnNC ZWhpbmQgPSB3ZWJraXRUcmFjLmNvbW1pdHNPbkJyYW5jaChxdWV1ZS5icmFuY2gub3BlblNvdXJj ZSwgZnVuY3Rpb24oY29tbWl0KSB7IHJldHVybiBjb21taXQucmV2aXNpb25OdW1iZXIgPiBsYXRl c3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJldmlzaW9uW0Rhc2hib2FyZC5SZXBvc2l0b3J5Lk9wZW5T b3VyY2UubmFtZV07IH0pLmxlbmd0aDsKLQotICAgICAgICBpZiAobGF0ZXN0UHJvZHVjdGl2ZUl0 ZXJhdGlvbi5yZXZpc2lvbltEYXNoYm9hcmQuUmVwb3NpdG9yeS5JbnRlcm5hbC5uYW1lXSkgewot ICAgICAgICAgICAgdmFyIGxhdGVzdFJlY29yZGVkSW50ZXJuYWxSZXZpc2lvbk51bWJlciA9IGlu dGVybmFsVHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwotICAgICAgICAgICAgaWYg KCFsYXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1iZXIgfHwgaW50ZXJuYWxUcmFjLm9s ZGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIgPiBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJl dmlzaW9uW0Rhc2hib2FyZC5SZXBvc2l0b3J5LkludGVybmFsLm5hbWVdKSB7Ci0gICAgICAgICAg ICAgICAgaW50ZXJuYWxUcmFjLmxvYWRNb3JlSGlzdG9yaWNhbERhdGEoKTsKKyAgICAgICAgdmFy IHNvcnRlZFJlcG9zaXRvcmllcyA9IERhc2hib2FyZC5zb3J0ZWRSZXBvc2l0b3JpZXM7CisgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc29ydGVkUmVwb3NpdG9yaWVzLmxlbmd0aDsgaSsrKSB7 CisgICAgICAgICAgICB2YXIgcmVwb3NpdG9yeSA9IHNvcnRlZFJlcG9zaXRvcmllc1tpXTsKKyAg ICAgICAgICAgIHZhciB0cmFjID0gcmVwb3NpdG9yeS50cmFjOworICAgICAgICAgICAgdmFyIHJl cG9zaXRvcnlOYW1lID0gcmVwb3NpdG9yeS5uYW1lOworICAgICAgICAgICAgdmFyIGxhdGVzdFBy b2R1Y3RpdmVSZXZpc2lvbk51bWJlciA9IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNp b25bcmVwb3NpdG9yeU5hbWVdOworICAgICAgICAgICAgaWYgKCFsYXRlc3RQcm9kdWN0aXZlUmV2 aXNpb25OdW1iZXIpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAo IXRyYWMubGF0ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlciB8fCB0cmFjLm9sZGVzdFJlY29yZGVk UmV2aXNpb25OdW1iZXIgPiBsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1iZXIpIHsKKyAgICAg ICAgICAgICAgICB0cmFjLmxvYWRNb3JlSGlzdG9yaWNhbERhdGEoKTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHRvdGFsUmV2aXNpb25zQmVo aW5kICs9IGludGVybmFsVHJhYy5jb21taXRzT25CcmFuY2gocXVldWUuYnJhbmNoLmludGVybmFs LCBmdW5jdGlvbihjb21taXQpIHsgcmV0dXJuIGNvbW1pdC5yZXZpc2lvbk51bWJlciA+IGxhdGVz dFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNpb25bRGFzaGJvYXJkLlJlcG9zaXRvcnkuSW50ZXJu YWwubmFtZV07IH0pLmxlbmd0aDsKKyAgICAgICAgICAgIHRvdGFsUmV2aXNpb25zQmVoaW5kICs9 IHRyYWMuY29tbWl0c09uQnJhbmNoKHF1ZXVlLmJyYW5jaFtyZXBvc2l0b3J5TmFtZV0sIGZ1bmN0 aW9uKGNvbW1pdCkgeyByZXR1cm4gY29tbWl0LnJldmlzaW9uTnVtYmVyID4gbGF0ZXN0UHJvZHVj dGl2ZVJldmlzaW9uTnVtYmVyOyB9KS5sZW5ndGg7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAo IXRvdGFsUmV2aXNpb25zQmVoaW5kKQo= 258960 2015-08-13 17:24:42 -0700 2015-08-14 11:07:15 -0700 Patch bug-147938-20150813172424.patch text/plain 3985 jmarcell ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkOWRl MjcwZmE3ODc3MzNlMzY4MDRiMzc1NzlhMmQyZmFiZDg2YjA4Li5iNDRmNTZkNTRiMDViZjg4ZmVi MDgwZTY3Y2MzMDBkNmJhNzAzNGY3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDgtMTMgIEphc29uIE1hcmNl bGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgQnVpbGRib3RRdWV1 ZVZpZXcuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50IHRvIHdvcmsgbW9yZSBnZW5lcmljYWxs eSB3aXRoIHJlcG9zaXRvcmllcworICAgICAgICBvdGhlciB0aGFuICJvcGVuU291cmNlIiBhbmQg ImludGVybmFsIi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NzkzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6CisgICAgICAgIChCdWls ZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTogUmVm YWN0b3JlZCB0byB3b3JrIG1vcmUgZ2VuZXJpY2FsbHkgd2l0aAorICAgICAgICByZXBvc2l0b3Jp ZXMgb3RoZXIgdGhhbiAib3BlblNvdXJjZSIgYW5kICJpbnRlcm5hbCIuCisKIDIwMTUtMDgtMTMg IEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFwcFNjYWxl OiBBc3NlcnRpb24gaGl0IHdoZW4gaG92ZXJpbmcgYSB3ZWJraXQtcXVldWUgYnViYmxlCmRpZmYg LS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCmluZGV4IGUwNzgxYzBlNDFjMjQ5 MTRjNmM5ZGRlMmJkMjQ3NmIzOWYxNDdkNTIuLmM3NTQ0YmE1OTgyNjk2YjNiYTQyMWIxZGNiYzdi MGUyM2JiNTU4YjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVl dWVWaWV3LmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3Lmpz CkBAIC03NiwyNiArNzYsMjQgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICBpZiAoIWxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24pCiAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgdmFyIHdlYmtpdFRyYWMgPSBEYXNoYm9hcmQuUmVwb3NpdG9yeS5PcGVuU291 cmNlLnRyYWM7Ci0gICAgICAgIHZhciBpbnRlcm5hbFRyYWMgPSBEYXNoYm9hcmQuUmVwb3NpdG9y eS5JbnRlcm5hbC50cmFjOwotICAgICAgICB2YXIgbGF0ZXN0UmVjb3JkZWRPcGVuU291cmNlUmV2 aXNpb25OdW1iZXIgPSB3ZWJraXRUcmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXI7Ci0g ICAgICAgIGlmICghbGF0ZXN0UmVjb3JkZWRPcGVuU291cmNlUmV2aXNpb25OdW1iZXIgfHwgd2Vi a2l0VHJhYy5vbGRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyID4gbGF0ZXN0UHJvZHVjdGl2ZUl0 ZXJhdGlvbi5yZXZpc2lvbltEYXNoYm9hcmQuUmVwb3NpdG9yeS5PcGVuU291cmNlLm5hbWVdKSB7 Ci0gICAgICAgICAgICB3ZWJraXRUcmFjLmxvYWRNb3JlSGlzdG9yaWNhbERhdGEoKTsKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAgICB2YXIgdG90YWxSZXZpc2lvbnNCZWhp bmQgPSAwOwogCiAgICAgICAgIC8vIEZJWE1FOiBUbyBiZSAxMDAlIGNvcnJlY3QsIHdlIHNob3Vs ZCBhbHNvIGZpbHRlciBvdXQgY2hhbmdlcyB0aGF0IGFyZSBpZ25vcmVkIGJ5CiAgICAgICAgIC8v IHRoZSBxdWV1ZSwgc2VlIF9zaG91bGRfZmlsZV90cmlnZ2VyX2J1aWxkIGluIHdrYnVpbGQucHku Ci0gICAgICAgIHZhciB0b3RhbFJldmlzaW9uc0JlaGluZCA9IHdlYmtpdFRyYWMuY29tbWl0c09u QnJhbmNoKHF1ZXVlLmJyYW5jaC5vcGVuU291cmNlLCBmdW5jdGlvbihjb21taXQpIHsgcmV0dXJu IGNvbW1pdC5yZXZpc2lvbk51bWJlciA+IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNp b25bRGFzaGJvYXJkLlJlcG9zaXRvcnkuT3BlblNvdXJjZS5uYW1lXTsgfSkubGVuZ3RoOwotCi0g ICAgICAgIGlmIChsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJldmlzaW9uW0Rhc2hib2FyZC5S ZXBvc2l0b3J5LkludGVybmFsLm5hbWVdKSB7Ci0gICAgICAgICAgICB2YXIgbGF0ZXN0UmVjb3Jk ZWRJbnRlcm5hbFJldmlzaW9uTnVtYmVyID0gaW50ZXJuYWxUcmFjLmxhdGVzdFJlY29yZGVkUmV2 aXNpb25OdW1iZXI7Ci0gICAgICAgICAgICBpZiAoIWxhdGVzdFJlY29yZGVkSW50ZXJuYWxSZXZp c2lvbk51bWJlciB8fCBpbnRlcm5hbFRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlciA+ IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNpb25bRGFzaGJvYXJkLlJlcG9zaXRvcnku SW50ZXJuYWwubmFtZV0pIHsKLSAgICAgICAgICAgICAgICBpbnRlcm5hbFRyYWMubG9hZE1vcmVI aXN0b3JpY2FsRGF0YSgpOworICAgICAgICB2YXIgc29ydGVkUmVwb3NpdG9yaWVzID0gRGFzaGJv YXJkLnNvcnRlZFJlcG9zaXRvcmllczsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzb3J0 ZWRSZXBvc2l0b3JpZXMubGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIHZhciByZXBvc2l0b3J5 ID0gc29ydGVkUmVwb3NpdG9yaWVzW2ldOworICAgICAgICAgICAgdmFyIHRyYWMgPSByZXBvc2l0 b3J5LnRyYWM7CisgICAgICAgICAgICB2YXIgcmVwb3NpdG9yeU5hbWUgPSByZXBvc2l0b3J5Lm5h bWU7CisgICAgICAgICAgICB2YXIgbGF0ZXN0UHJvZHVjdGl2ZVJldmlzaW9uTnVtYmVyID0gbGF0 ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV07CisgICAgICAg ICAgICBpZiAoIWxhdGVzdFByb2R1Y3RpdmVSZXZpc2lvbk51bWJlcikKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmICghdHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9u TnVtYmVyIHx8IHRyYWMub2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlciA+IGxhdGVzdFByb2R1 Y3RpdmVSZXZpc2lvbk51bWJlcikgeworICAgICAgICAgICAgICAgIHRyYWMubG9hZE1vcmVIaXN0 b3JpY2FsRGF0YSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAot ICAgICAgICAgICAgdG90YWxSZXZpc2lvbnNCZWhpbmQgKz0gaW50ZXJuYWxUcmFjLmNvbW1pdHNP bkJyYW5jaChxdWV1ZS5icmFuY2guaW50ZXJuYWwsIGZ1bmN0aW9uKGNvbW1pdCkgeyByZXR1cm4g Y29tbWl0LnJldmlzaW9uTnVtYmVyID4gbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5yZXZpc2lv bltEYXNoYm9hcmQuUmVwb3NpdG9yeS5JbnRlcm5hbC5uYW1lXTsgfSkubGVuZ3RoOworICAgICAg ICAgICAgdG90YWxSZXZpc2lvbnNCZWhpbmQgKz0gdHJhYy5jb21taXRzT25CcmFuY2gocXVldWUu YnJhbmNoW3JlcG9zaXRvcnlOYW1lXSwgZnVuY3Rpb24oY29tbWl0KSB7IHJldHVybiBjb21taXQu cmV2aXNpb25OdW1iZXIgPiBsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1iZXI7IH0pLmxlbmd0 aDsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghdG90YWxSZXZpc2lvbnNCZWhpbmQpCg==