Title: [188890] trunk/Tools
- Revision
- 188890
- Author
- commit-qu...@webkit.org
- Date
- 2015-08-24 15:42:54 -0700 (Mon, 24 Aug 2015)
Log Message
Add support to dashboard for displaying Git SHA's as revisions.
https://bugs.webkit.org/show_bug.cgi?id=148387
Patch by Jason Marcell <jmarc...@apple.com> on 2015-08-24
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(parseRevisionProperty): Added support to dashboard for displaying Git SHA's as revisions.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Added
"isSVN" property to Dashboard.Repository.(OpenSource|Internal).
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (188889 => 188890)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2015-08-24 22:40:45 UTC (rev 188889)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2015-08-24 22:42:54 UTC (rev 188890)
@@ -109,7 +109,7 @@
// ["got_revision","2468","Source"]
if (isMultiCodebaseGotRevisionProperty(property))
value = (key in value) ? value[key] : value[fallbackKey];
- return parseInt(value);
+ return value;
}
BuildbotIteration.prototype = {
@@ -212,7 +212,11 @@
key = repositoryName;
fallbackKey = null;
}
- this.revision[repositoryName] = parseRevisionProperty(revisionProperty, key, fallbackKey);
+ var revision = parseRevisionProperty(revisionProperty, key, fallbackKey);
+ if (repository.isSVN)
+ this.revision[repositoryName] = parseInt(revision);
+ else
+ this.revision[repositoryName] = revision;
}
function sourceStampChanges(sourceStamp) {
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (188889 => 188890)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-24 22:40:45 UTC (rev 188889)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-24 22:42:54 UTC (rev 188890)
@@ -216,7 +216,14 @@
var repositoryName = repository.name;
console.assert(iteration.revision[repositoryName]);
var content = document.createElement("span");
- content.textContent = "r" + iteration.revision[repositoryName];
+ var revision = iteration.revision[repositoryName];
+ if (repository.isSVN)
+ content.textContent = "r" + revision;
+ else if (repository.isGit) {
+ // Truncating for display. Git traditionally uses seven characters for a short hash.
+ content.textContent = revision.substr(0, 7);
+ } else
+ console.assert(false, "Should not get here; " + repository.name + " did not specify a known VCS type.");
content.classList.add("revision-number");
if (previousIteration) {
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (188889 => 188890)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2015-08-24 22:40:45 UTC (rev 188889)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2015-08-24 22:42:54 UTC (rev 188890)
@@ -37,8 +37,8 @@
},
Branch: {},
Repository: {
- OpenSource: { name: "openSource", order: 0 },
- Internal: { name: "internal", order: 1 },
+ OpenSource: { name: "openSource", isSVN: true, order: 0 },
+ Internal: { name: "internal", isSVN: true, order: 1 },
},
get sortedPlatforms()
{
Modified: trunk/Tools/ChangeLog (188889 => 188890)
--- trunk/Tools/ChangeLog 2015-08-24 22:40:45 UTC (rev 188889)
+++ trunk/Tools/ChangeLog 2015-08-24 22:42:54 UTC (rev 188890)
@@ -1,3 +1,17 @@
+2015-08-24 Jason Marcell <jmarc...@apple.com>
+
+ Add support to dashboard for displaying Git SHA's as revisions.
+ https://bugs.webkit.org/show_bug.cgi?id=148387
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (parseRevisionProperty): Added support to dashboard for displaying Git SHA's as revisions.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Added
+ "isSVN" property to Dashboard.Repository.(OpenSource|Internal).
+
2015-08-24 Andy Estes <aes...@apple.com>
REGRESSION (r188851): WebKit2.BundleParameters fails on iOS
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
