<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188890] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188890">188890</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-24 15:42:54 -0700 (Mon, 24 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support to dashboard for displaying Git SHA's as revisions.
https://bugs.webkit.org/show_bug.cgi?id=148387
Patch by Jason Marcell <jmarcell@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).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsDashboardjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (188889 => 188890)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> // ["got_revision","2468","Source"]
</span><span class="cx"> if (isMultiCodebaseGotRevisionProperty(property))
</span><span class="cx"> value = (key in value) ? value[key] : value[fallbackKey];
</span><del>- return parseInt(value);
</del><ins>+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BuildbotIteration.prototype = {
</span><span class="lines">@@ -212,7 +212,11 @@
</span><span class="cx"> key = repositoryName;
</span><span class="cx"> fallbackKey = null;
</span><span class="cx"> }
</span><del>- this.revision[repositoryName] = parseRevisionProperty(revisionProperty, key, fallbackKey);
</del><ins>+ var revision = parseRevisionProperty(revisionProperty, key, fallbackKey);
+ if (repository.isSVN)
+ this.revision[repositoryName] = parseInt(revision);
+ else
+ this.revision[repositoryName] = revision;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sourceStampChanges(sourceStamp) {
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (188889 => 188890)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -216,7 +216,14 @@
</span><span class="cx"> var repositoryName = repository.name;
</span><span class="cx"> console.assert(iteration.revision[repositoryName]);
</span><span class="cx"> var content = document.createElement("span");
</span><del>- content.textContent = "r" + iteration.revision[repositoryName];
</del><ins>+ 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.");
</ins><span class="cx"> content.classList.add("revision-number");
</span><span class="cx">
</span><span class="cx"> if (previousIteration) {
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (188889 => 188890)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> },
</span><span class="cx"> Branch: {},
</span><span class="cx"> Repository: {
</span><del>- OpenSource: { name: "openSource", order: 0 },
- Internal: { name: "internal", order: 1 },
</del><ins>+ OpenSource: { name: "openSource", isSVN: true, order: 0 },
+ Internal: { name: "internal", isSVN: true, order: 1 },
</ins><span class="cx"> },
</span><span class="cx"> get sortedPlatforms()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188889 => 188890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-24 22:40:45 UTC (rev 188889)
+++ trunk/Tools/ChangeLog 2015-08-24 22:42:54 UTC (rev 188890)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-08-24 Jason Marcell <jmarcell@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).
+
</ins><span class="cx"> 2015-08-24 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188851): WebKit2.BundleParameters fails on iOS
</span></span></pre>
</div>
</div>
</body>
</html>