<!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>[188814] 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/188814">188814</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-21 18:39:48 -0700 (Fri, 21 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make Dashboard.Branches be objects of the form (repository, "branch name") and update existing code
to work with these new objects.
https://bugs.webkit.org/show_bug.cgi?id=148188
Patch by Jason Marcell <jmarcell@apple.com> on 2015-08-21
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot.prototype._normalizeQueueInfo): Renamed BuildbotQueue.branch to BuildbotQueue.branches.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
(BuildbotCombinedQueueView): Changed to work with new branch objects which represent a
(repository, "branch name")-pair.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js: Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue): Renamed BuildbotQueue.branch to BuildbotQueue.branches.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._appendPendingRevisionCount): Changed to work with new branch
objects which represent a (repository, "branch name")-pair.
(BuildbotQueueView.prototype._presentPopoverForPendingCommits): Ditto.
(BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
(BuildbotQueueView.prototype._addDividerToPopover): Ditto.
(BuildbotQueueView.prototype.revisionContentForIteration): Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Renamed
BuildbotQueue.branch to BuildbotQueue.branches.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot.prototype.get defaultBranches): Changed to new (repository, "branch name") format.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.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_htmldashboardScriptsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> _normalizeQueueInfo: function(queueInfo)
</span><span class="cx"> {
</span><span class="cx"> if (!queueInfo.combinedQueues)
</span><del>- queueInfo.branch = queueInfo.branch || this.defaultBranches;
</del><ins>+ queueInfo.branches = queueInfo.branches || this.defaultBranches;
</ins><span class="cx"> queueInfo.debug = queueInfo.debug || false;
</span><span class="cx"> queueInfo.builder = queueInfo.builder || false;
</span><span class="cx"> queueInfo.tester = queueInfo.tester || false;
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -25,21 +25,26 @@
</span><span class="cx">
</span><span class="cx"> BuildbotCombinedQueueView = function(queue)
</span><span class="cx"> {
</span><del>- console.assert(queue.branch === undefined);
- var indexOfFirstQueueWithRepository = {};
- for (var i = 0, end = queue.combinedQueues.length; i < end; ++i) {
- console.assert(queue.combinedQueues[0].buildbot === queue.combinedQueues[i].buildbot);
- var branches = queue.combinedQueues[i].branch;
- for (var repository in branches) {
- var indexOfFirstQueue = indexOfFirstQueueWithRepository[repository];
- if (indexOfFirstQueue === undefined) {
- indexOfFirstQueueWithRepository[repository] = i;
</del><ins>+ console.assert(queue.branches === undefined);
+ var indicesOfFirstQueueWithRepository = {};
+ var combinedQueues = queue.combinedQueues;
+ var buildbot = combinedQueues[0].buildbot;
+ for (var i = 0; i < combinedQueues.length; ++i) {
+ var subQueue = combinedQueues[i];
+ console.assert(buildbot === subQueue.buildbot);
+ var branches = subQueue.branches;
+ for (var j = 0; j < branches.length; ++j) {
+ var branch = branches[j];
+ var repositoryName = branch.repository.name;
+ var expected = indicesOfFirstQueueWithRepository[repositoryName];
+ if (expected === undefined) {
+ indicesOfFirstQueueWithRepository[repositoryName] = { queueIndex: i, branchIndex: j };
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- var message = queue.id + ": combinedQueues[" + i + "].branch[" + repository + "]";
- message += " === combinedQueues[" + indexOfFirstQueue + "].branch[" + repository + "]";
- console.assert(queue.combinedQueues[i].branch[repository]
- === queue.combinedQueues[indexOfFirstQueue].branch[repository], message);
</del><ins>+ var expectedBranch = combinedQueues[expected.queueIndex].branches[expected.branchIndex];
+ var message = queue.id + ": " + branch.name + " === combinedQueues[" + i + "].branch[" + j + "] ";
+ message += "=== combinedQueues[" + expected.queueIndex + "].branch[" + expected.branchIndex + "] === " + expectedBranch.name;
+ console.assert(branch.name === expectedBranch.name, message);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -196,20 +196,23 @@
</span><span class="cx"> var revisionProperty = data.properties.findFirst(function(property) {
</span><span class="cx"> return property[0] === "got_revision";
</span><span class="cx"> });
</span><del>- for (repository in this.queue.branch) {
</del><ins>+ var branches = this.queue.branches;
+ for (var i = 0; i < branches.length; ++i) {
+ var repository = branches[i].repository;
+ var repositoryName = repository.name;
</ins><span class="cx"> var key;
</span><span class="cx"> var fallbackKey;
</span><del>- if (repository === Dashboard.Repository.OpenSource.name) {
</del><ins>+ if (repository === Dashboard.Repository.OpenSource) {
</ins><span class="cx"> key = "WebKit";
</span><span class="cx"> fallbackKey = "opensource";
</span><del>- } else if (repository === Dashboard.Repository.Internal.name) {
</del><ins>+ } else if (repository === Dashboard.Repository.Internal) {
</ins><span class="cx"> key = "Internal";
</span><span class="cx"> fallbackKey = "internal";
</span><span class="cx"> } else {
</span><del>- key = repository;
</del><ins>+ key = repositoryName;
</ins><span class="cx"> fallbackKey = null;
</span><span class="cx"> }
</span><del>- this.revision[repository] = parseRevisionProperty(revisionProperty, key, fallbackKey);
</del><ins>+ this.revision[repositoryName] = parseRevisionProperty(revisionProperty, key, fallbackKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sourceStampChanges(sourceStamp) {
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> this.id = id;
</span><span class="cx">
</span><span class="cx"> // FIXME: Some of these are presentation only, and should be handled above BuildbotQueue level.
</span><del>- this.branch = info.branch;
</del><ins>+ this.branches = info.branches;
</ins><span class="cx"> this.platform = info.platform.name;
</span><span class="cx"> this.debug = info.debug;
</span><span class="cx"> this.builder = info.builder;
</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 (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -80,11 +80,12 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: To be 100% correct, we should also filter out changes that are ignored by
</span><span class="cx"> // the queue, see _should_file_trigger_build in wkbuild.py.
</span><del>- var sortedRepositories = Dashboard.sortedRepositories;
- for (var i = 0; i < sortedRepositories.length; i++) {
- var repository = sortedRepositories[i];
</del><ins>+ var branches = queue.branches;
+ for (var i = 0; i < branches.length; ++i) {
+ var branch = branches[i];
+ var repository = branch.repository;
+ var repositoryName = repository.name;
</ins><span class="cx"> var trac = repository.trac;
</span><del>- var repositoryName = repository.name;
</del><span class="cx"> var latestProductiveRevisionNumber = latestProductiveIteration.revision[repositoryName];
</span><span class="cx"> if (!latestProductiveRevisionNumber)
</span><span class="cx"> continue;
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- totalRevisionsBehind += trac.commitsOnBranch(queue.branch[repositoryName], function(commit) { return commit.revisionNumber > latestProductiveRevisionNumber; }).length;
</del><ins>+ totalRevisionsBehind += trac.commitsOnBranch(branch.name, function(commit) { return commit.revisionNumber > latestProductiveRevisionNumber; }).length;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!totalRevisionsBehind)
</span><span class="lines">@@ -154,15 +155,16 @@
</span><span class="cx"> content.className = "commit-history-popover";
</span><span class="cx">
</span><span class="cx"> var shouldAddDivider = false;
</span><del>- var sortedRepositories = Dashboard.sortedRepositories;
- for (var i = 0; i < sortedRepositories.length; ++i) {
- var repository = sortedRepositories[i];
</del><ins>+ var branches = queue.branches;
+ for (var i = 0; i < branches.length; ++i) {
+ var branch = branches[i];
+ var repository = branch.repository;
+ var repositoryName = repository.name;
</ins><span class="cx"> var trac = repository.trac;
</span><del>- var repositoryName = repository.name;
</del><span class="cx"> var latestProductiveRevisionNumber = latestProductiveIteration.revision[repositoryName];
</span><span class="cx"> if (!latestProductiveRevisionNumber || !trac.latestRecordedRevisionNumber)
</span><span class="cx"> continue;
</span><del>- var lines = this._popoverLinesForCommitRange(trac, queue.branch[repositoryName], latestProductiveRevisionNumber + 1, trac.latestRecordedRevisionNumber);
</del><ins>+ var lines = this._popoverLinesForCommitRange(trac, branch.name, latestProductiveRevisionNumber + 1, trac.latestRecordedRevisionNumber);
</ins><span class="cx"> var length = lines.length;
</span><span class="cx"> if (length && shouldAddDivider)
</span><span class="cx"> this._addDividerToPopover(content);
</span><span class="lines">@@ -208,8 +210,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _revisionContentWithPopoverForIteration: function(iteration, previousIteration, repository)
</del><ins>+ _revisionContentWithPopoverForIteration: function(iteration, previousIteration, branch)
</ins><span class="cx"> {
</span><ins>+ var repository = branch.repository;
</ins><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><span class="lines">@@ -220,7 +223,7 @@
</span><span class="cx"> console.assert(previousIteration.revision[repositoryName]);
</span><span class="cx"> var context = {
</span><span class="cx"> trac: repository.trac,
</span><del>- branch: iteration.queue.branch[repositoryName],
</del><ins>+ branch: branch.name,
</ins><span class="cx"> firstRevision: previousIteration.revision[repositoryName] + 1,
</span><span class="cx"> lastRevision: iteration.revision[repositoryName]
</span><span class="cx"> };
</span><span class="lines">@@ -269,12 +272,12 @@
</span><span class="cx"> {
</span><span class="cx"> var fragment = document.createDocumentFragment();
</span><span class="cx"> var shouldAddPlusSign = false;
</span><del>- var sortedRepositories = Dashboard.sortedRepositories;
- for (var i = 0; i < sortedRepositories.length; ++i) {
- var repository = sortedRepositories[i];
- if (!iteration.revision[repository.name])
</del><ins>+ var branches = iteration.queue.branches;
+ for (var i = 0; i < branches.length; ++i) {
+ var branch = branches[i];
+ if (!iteration.revision[branch.repository.name])
</ins><span class="cx"> continue;
</span><del>- var content = this._revisionContentWithPopoverForIteration(iteration, previousDisplayedIteration, repository);
</del><ins>+ var content = this._revisionContentWithPopoverForIteration(iteration, previousDisplayedIteration, branch);
</ins><span class="cx"> if (shouldAddPlusSign)
</span><span class="cx"> fragment.appendChild(document.createTextNode(" \uff0b "));
</span><span class="cx"> fragment.appendChild(content);
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> var info = buildbot.queuesInfo[id];
</span><span class="cx"> var queue = {
</span><span class="cx"> id: id,
</span><del>- branch: info.branch,
</del><ins>+ branches: info.branches,
</ins><span class="cx"> platform: info.platform.name,
</span><span class="cx"> heading: info.heading,
</span><span class="cx"> builder: info.builder,
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> get defaultBranches()
</span><span class="cx"> {
</span><del>- return { openSource: "trunk" };
</del><ins>+ return [{ repository: Dashboard.Repository.OpenSource, name: "trunk" }];
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> layoutTestResultsDirectoryURLForIteration: function(iteration)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188813 => 188814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-22 01:34:47 UTC (rev 188813)
+++ trunk/Tools/ChangeLog 2015-08-22 01:39:48 UTC (rev 188814)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-08-21 Jason Marcell <jmarcell@apple.com>
+
+ Make Dashboard.Branches be objects of the form (repository, "branch name") and update existing code
+ to work with these new objects.
+ https://bugs.webkit.org/show_bug.cgi?id=148188
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot.prototype._normalizeQueueInfo): Renamed BuildbotQueue.branch to BuildbotQueue.branches.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
+ (BuildbotCombinedQueueView): Changed to work with new branch objects which represent a
+ (repository, "branch name")-pair.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js: Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue): Renamed BuildbotQueue.branch to BuildbotQueue.branches.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView.prototype._appendPendingRevisionCount): Changed to work with new branch
+ objects which represent a (repository, "branch name")-pair.
+ (BuildbotQueueView.prototype._presentPopoverForPendingCommits): Ditto.
+ (BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
+ (BuildbotQueueView.prototype._addDividerToPopover): Ditto.
+ (BuildbotQueueView.prototype.revisionContentForIteration): Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Renamed
+ BuildbotQueue.branch to BuildbotQueue.branches.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ (WebKitBuildbot.prototype.get defaultBranches): Changed to new (repository, "branch name") format.
+
</ins><span class="cx"> 2015-08-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop building WebKitTestRunner for 32-bit platforms
</span></span></pre>
</div>
</div>
</body>
</html>