<!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>[196109] 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/196109">196109</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-02-03 22:07:21 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Format revisions for display according to repository type https://bugs.webkit.org/show_bug.cgi?id=153818
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._popoverLinesForCommitRange): Use new _formatRevisionForDisplay to display revisions according
to repository type.
(BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
(BuildbotQueueView.prototype._formatRevisionForDisplay): Formats revisions for display according to repository type.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit tests to test new
_formatRevisionForDisplay function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (196108 => 196109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2016-02-04 05:41:03 UTC (rev 196108)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2016-02-04 06:07:21 UTC (rev 196109)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> linkElement.className = "revision";
</span><span class="cx"> linkElement.href = trac.revisionURL(commit.revisionNumber);
</span><span class="cx"> linkElement.target = "_blank";
</span><del>- linkElement.textContent = "r" + commit.revisionNumber;
</del><ins>+ linkElement.textContent = this._formatRevisionForDisplay(commit.revisionNumber, branch.repository);
</ins><span class="cx"> result.appendChild(linkElement);
</span><span class="cx">
</span><span class="cx"> var authorElement = document.createElement("span");
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> // the queue, see _should_file_trigger_build in wkbuild.py.
</span><span class="cx"> var commits = trac.commitsOnBranch(branch.name, function(commit) { return commit.revisionNumber >= firstRevisionNumber && commit.revisionNumber <= lastRevisionNumber; });
</span><span class="cx"> return commits.map(function(commit) {
</span><del>- return lineForCommit(trac, commit);
</del><ins>+ return lineForCommit.call(this, trac, commit);
</ins><span class="cx"> }, this).reverse();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -221,14 +221,7 @@
</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>- 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.");
</del><ins>+ content.textContent = this._formatRevisionForDisplay(iteration.revision[repositoryName], repository);
</ins><span class="cx"> content.classList.add("revision-number");
</span><span class="cx">
</span><span class="cx"> if (previousIteration) {
</span><span class="lines">@@ -340,6 +333,14 @@
</span><span class="cx"> _unauthorizedAccess: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.updateSoon();
</span><ins>+ },
+
+ _formatRevisionForDisplay: function(revision, repository)
+ {
+ console.assert(repository.isSVN || repository.isGit, "Should not get here; " + repository.name + " did not specify a known VCS type.");
+ if (repository.isSVN)
+ return "r" + revision;
+ // Truncating for display. Git traditionally uses seven characters for a short hash.
+ return revision.substr(0, 7);
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js (196108 => 196109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-02-04 05:41:03 UTC (rev 196108)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-02-04 06:07:21 UTC (rev 196109)
</span><span class="lines">@@ -173,6 +173,22 @@
</span><span class="cx"> strictEqual(nodeList.length, 2, "has 2 commits");
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+test("_formatRevisionForDisplay Subversion", function()
+{
+ var repository = this.trunkBranch.repository;
+ repository.isSVN = true;
+ repository.isGit = false;
+ strictEqual(this.view._formatRevisionForDisplay(33018, repository), "r33018", "Should be r33018")
+});
+
+test("_formatRevisionForDisplay Git", function()
+{
+ var repository = this.trunkBranch.repository;
+ repository.isSVN = false;
+ repository.isGit = true;
+ strictEqual(this.view._formatRevisionForDisplay("0e498db5d8e5b5a342631", repository), "0e498db", "Should be 0e498db");
+});
+
</ins><span class="cx"> module("BuildBotQueue", {
</span><span class="cx"> setup: function() {
</span><span class="cx"> this.queue = new MockBuildbotQueue();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196108 => 196109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-04 05:41:03 UTC (rev 196108)
+++ trunk/Tools/ChangeLog 2016-02-04 06:07:21 UTC (rev 196109)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-03 Jason Marcell <jmarcell@apple.com>
+
+ Format revisions for display according to repository type
+ https://bugs.webkit.org/show_bug.cgi?id=153818
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView.prototype._popoverLinesForCommitRange): Use new _formatRevisionForDisplay to display revisions according
+ to repository type.
+ (BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Ditto.
+ (BuildbotQueueView.prototype._formatRevisionForDisplay): Formats revisions for display according to repository type.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit tests to test new
+ _formatRevisionForDisplay function.
+
</ins><span class="cx"> 2016-02-03 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Logs/CoreSimulator filling up OS disk on WebKit testers
</span></span></pre>
</div>
</div>
</body>
</html>