136237 2014-08-25 15:48:07 -0700 Make build.webkit.org/dashboard work with changeset_show_files=location 2014-08-25 16:06:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap joepeck lforschler thorton timothy oldest_to_newest 1031242 0 ap 2014-08-25 15:48:07 -0700 trac.webkit.org initialization now contains changeset_show_files=location, which broke Dashboard a little - we now have location information instead of change description in popover. 1031245 1 237111 ap 2014-08-25 15:55:59 -0700 Created attachment 237111 proposed patch 1031250 2 237111 thorton 2014-08-25 16:01:59 -0700 Comment on attachment 237111 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=237111&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:106 > + // changes element may or may not be present depending on server configuration (preferably "changeset_show_files=location"); is 'preferably' the right word here? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:137 > + result.tag = location.substr(5, location.indexOf("/", 5) - 5); This is unfortunate but I don't know how to do it better. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:142 > + else if (location.startsWith("trunk/") || location === "trunk") I don't think you need this === 1031252 3 ap 2014-08-25 16:06:56 -0700 Committed <http://trac.webkit.org/changeset/172941>. 237111 2014-08-25 15:55:59 -0700 2014-08-25 16:01:59 -0700 proposed patch TracLocation.txt text/plain 4681 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3Mjk0MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE0LTA4LTI1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIE1ha2UgYnVpbGQud2Via2l0Lm9yZy9kYXNoYm9hcmQgd29yayB3aXRoIGNo YW5nZXNldF9zaG93X2ZpbGVzPWxvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYyMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1RyYWMuanM6CisgICAgICAgIChU cmFjLnByb3RvdHlwZS5fY29udmVydENvbW1pdEluZm9FbGVtZW50VG9PYmplY3QpOiBSZW1vdmUg bG9jYXRpb24gaW5mb3JtYXRpb24KKyAgICAgICAgZnJvbSBkZXNjcmlwdGlvbiBiZWZvcmUgZ2V0 dGluZyB0aXRsZSwgYW5kIGFsc28gYWN0dWFsbHkgcGFyc2UgdGhlIGxvY2F0aW9uIGludG8KKyAg ICAgICAgcmVzdWx0IG9iamVjdCB3aGVuIGF2YWlsYWJsZS4KKworICAgICAgICAqIEJ1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL1V0aWxpdGllcy5qczoKKyAgICAgICAgKFN0cmluZy5wcm90b3R5cGUuc3RhcnRzV2l0 aCk6IEFkZGVkLgorCiAyMDE0LTA4LTI1ICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4K IAogICAgICAgICBbRUZMXVtXSzJdIE1pbmlicm93c2VyIDogRW5oYW5jZSBhcHBsaWNhdGlvbiB0 byBiZSBhYmxlIHRvIHN1cHBvcnQgaGlzdG9yeSBsaXN0IG5hdmlnYXRpb24KSW5kZXg6IFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TY3JpcHRzL1RyYWMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvVHJhYy5qcwkocmV2aXNpb24gMTcyOTI2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvVHJh Yy5qcwkod29ya2luZyBjb3B5KQpAQCAtOTgsOSArOTgsMTcgQEAgVHJhYy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGRhdGUgPSBuZXcgRGF0ZShEYXRlLnBhcnNlKGRhdGUpKTsKICAgICAgICAgdmFy IGRlc2NyaXB0aW9uID0gZG9jLmV2YWx1YXRlKCIuL2Rlc2NyaXB0aW9uIiwgY29tbWl0RWxlbWVu dCwgbnVsbCwgWFBhdGhSZXN1bHQuU1RSSU5HX1RZUEUpLnN0cmluZ1ZhbHVlOwogCi0gICAgICAg IC8vIFRoZSBmZWVkIGNvbnRhaW5zIGEgPHRpdGxlPiwgYnV0IGl0J3Mgbm90IHBhcnNlZCBhcyB3 ZWxsIGFzIHdoYXQgd2UgYXJlIGdldHRpbmcgZnJvbSBkZXNjcmlwdGlvbi4KICAgICAgICAgdmFy IHBhcnNlZERlc2NyaXB0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAg ICAgIHBhcnNlZERlc2NyaXB0aW9uLmlubmVySFRNTCA9IGRlc2NyaXB0aW9uOworCisgICAgICAg IHZhciBsb2NhdGlvbiA9ICIiOworICAgICAgICBpZiAocGFyc2VkRGVzY3JpcHRpb24uZmlyc3RD aGlsZC5jbGFzc05hbWUgPT09ICJjaGFuZ2VzIikgeworICAgICAgICAgICAgLy8gY2hhbmdlcyBl bGVtZW50IG1heSBvciBtYXkgbm90IGJlIHByZXNlbnQgZGVwZW5kaW5nIG9uIHNlcnZlciBjb25m aWd1cmF0aW9uIChwcmVmZXJhYmx5ICJjaGFuZ2VzZXRfc2hvd19maWxlcz1sb2NhdGlvbiIpOwor ICAgICAgICAgICAgbG9jYXRpb24gPSBkb2MuZXZhbHVhdGUoIi8vc3Ryb25nIiwgcGFyc2VkRGVz Y3JpcHRpb24uZmlyc3RDaGlsZCwgbnVsbCwgWFBhdGhSZXN1bHQuU1RSSU5HX1RZUEUpLnN0cmlu Z1ZhbHVlCisgICAgICAgICAgICBwYXJzZWREZXNjcmlwdGlvbi5yZW1vdmVDaGlsZChwYXJzZWRE ZXNjcmlwdGlvbi5maXJzdENoaWxkKTsKKyAgICAgICAgfQorCisgICAgICAgIC8vIFRoZSBmZWVk IGNvbnRhaW5zIGEgPHRpdGxlPiwgYnV0IGl0J3Mgbm90IHBhcnNlZCBhcyB3ZWxsIGFzIHdoYXQg d2UgYXJlIGdldHRpbmcgZnJvbSBkZXNjcmlwdGlvbi4KICAgICAgICAgdmFyIHRpdGxlID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHZhciBub2RlID0gcGFyc2VkRGVz Y3JpcHRpb24uZmlyc3RDaGlsZC5maXJzdENoaWxkOwogICAgICAgICB3aGlsZSAobm9kZSAmJiBu b2RlLnRhZ05hbWUgIT0gIkJSIikgewpAQCAtMTEyLDE0ICsxMjAsMzQgQEAgVHJhYy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICh0aXRsZS5maXJzdENoaWxkICYmIHRpdGxlLmZpcnN0Q2hpbGQu bm9kZVR5cGUgPT0gTm9kZS5URVhUX05PREUgJiYgdGl0bGUuZmlyc3RDaGlsZC50ZXh0Q29udGVu dC5sZW5ndGggPiAwICYmIHRpdGxlLmZpcnN0Q2hpbGQudGV4dENvbnRlbnRbMF0gPT0gIlxuIikK ICAgICAgICAgICAgIHRpdGxlLmZpcnN0Q2hpbGQudGV4dENvbnRlbnQgPSB0aXRsZS5maXJzdENo aWxkLnRleHRDb250ZW50LnN1YnN0cmluZygxKTsKIAotICAgICAgICByZXR1cm4geworICAgICAg ICB2YXIgcmVzdWx0ID0gewogICAgICAgICAgICAgcmV2aXNpb25OdW1iZXI6IHJldmlzaW9uTnVt YmVyLAogICAgICAgICAgICAgbGluazogbGluaywKICAgICAgICAgICAgIHRpdGxlOiB0aXRsZSwK ICAgICAgICAgICAgIGF1dGhvcjogYXV0aG9yLAogICAgICAgICAgICAgZGF0ZTogZGF0ZSwKLSAg ICAgICAgICAgIGRlc2NyaXB0aW9uOiBkZXNjcmlwdGlvbgorICAgICAgICAgICAgZGVzY3JpcHRp b246IHBhcnNlZERlc2NyaXB0aW9uLmlubmVySFRNTCwKKyAgICAgICAgICAgIGNvbnRhaW5zQnJh bmNoTG9jYXRpb246IGxvY2F0aW9uICE9PSAiIgogICAgICAgICB9OworCisgICAgICAgIGlmIChy ZXN1bHQuY29udGFpbnNCcmFuY2hMb2NhdGlvbikgeworICAgICAgICAgICAgY29uc29sZS5hc3Nl cnQobG9jYXRpb25bbG9jYXRpb24ubGVuZ3RoIC0gMV0gIT09ICIvIik7CisgICAgICAgICAgICBs b2NhdGlvbiA9IGxvY2F0aW9uICs9ICIvIjsKKyAgICAgICAgICAgIGlmIChsb2NhdGlvbi5zdGFy dHNXaXRoKCJ0YWdzLyIpKQorICAgICAgICAgICAgICAgIHJlc3VsdC50YWcgPSBsb2NhdGlvbi5z dWJzdHIoNSwgbG9jYXRpb24uaW5kZXhPZigiLyIsIDUpIC0gNSk7CisgICAgICAgICAgICBlbHNl IGlmIChsb2NhdGlvbi5zdGFydHNXaXRoKCJicmFuY2hlcy8iKSkKKyAgICAgICAgICAgICAgICBy ZXN1bHQuYnJhbmNoID0gbG9jYXRpb24uc3Vic3RyKDksIGxvY2F0aW9uLmluZGV4T2YoIi8iLCA5 KSAtIDkpOworICAgICAgICAgICAgZWxzZSBpZiAobG9jYXRpb24uc3RhcnRzV2l0aCgicmVsZWFz ZXMvIikpCisgICAgICAgICAgICAgICAgcmVzdWx0LnJlbGVhc2UgPSBsb2NhdGlvbi5zdWJzdHIo OSwgbG9jYXRpb24uaW5kZXhPZigiLyIsIDkpIC0gOSk7CisgICAgICAgICAgICBlbHNlIGlmIChs b2NhdGlvbi5zdGFydHNXaXRoKCJ0cnVuay8iKSB8fCBsb2NhdGlvbiA9PT0gInRydW5rIikKKyAg ICAgICAgICAgICAgICByZXN1bHQuYnJhbmNoID0gInRydW5rIjsKKyAgICAgICAgICAgIGVsc2Ug eworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZhbHNlKTsKKyAgICAgICAgICAgICAg ICByZXN1bHQuY29udGFpbnNCcmFuY2hMb2NhdGlvbiA9IGZhbHNlOworICAgICAgICAgICAgfQor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9LAogCiAgICAgX2xvYWRl ZDogZnVuY3Rpb24oZGF0YURvY3VtZW50KQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvVXRp bGl0aWVzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1V0aWxpdGllcy5q cwkocmV2aXNpb24gMTcyOTI2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvVXRpbGl0aWVzLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsMyArMTcwLDggQEAgU3RyaW5nLnByb3RvdHlwZS5jb250 YWlucyA9IGZ1bmN0aW9uKHN1YgogewogICAgIHJldHVybiB0aGlzLmluZGV4T2Yoc3Vic3RyaW5n KSA+PSAwOwogfTsKKworU3RyaW5nLnByb3RvdHlwZS5zdGFydHNXaXRoID0gZnVuY3Rpb24oc3Vi c3RyaW5nKQoreworICAgIHJldHVybiB0aGlzLmxhc3RJbmRleE9mKHN1YnN0cmluZywgMCkgPT09 IDA7Cit9Cg==