<!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>[195658] 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/195658">195658</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 23:43:50 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sort incoming commits via date instead of revision number.
https://bugs.webkit.org/show_bug.cgi?id=153467
Reviewed by Alexey Proskuryakov.
Future Trac instances may use Git or other revision control systems where we cannnot rely on the revision number
for sorting revisions. Instead we use the commit date to sort revisions chronologically.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
(Trac.prototype._loaded): Sort via date instead of revision number.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js:
(MockTrac): Fix up the mock data to look more like real-world data.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml: Added.
Fake RSS feed that adds three more commits.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit tests to test
Trac._loaded().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsTracjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptstestsMockTracjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestfixturetracrssxml">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsTracjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js (195657 => 195658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js 2016-01-27 07:13:31 UTC (rev 195657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js 2016-01-27 07:43:50 UTC (rev 195658)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (newCommits.length)
</span><del>- this.recordedCommits = newCommits.concat(this.recordedCommits).sort(function(a, b) { return a.revisionNumber - b.revisionNumber; });
</del><ins>+ this.recordedCommits = newCommits.concat(this.recordedCommits).sort(function(a, b) { return a.date - b.date; });
</ins><span class="cx">
</span><span class="cx"> if (newCommits.length || knownCommitsWereUpdated)
</span><span class="cx"> this.dispatchEventToListeners(Trac.Event.CommitsUpdated, null);
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptstestsMockTracjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js (195657 => 195658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js 2016-01-27 07:13:31 UTC (rev 195657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js 2016-01-27 07:43:50 UTC (rev 195658)
</span><span class="lines">@@ -29,50 +29,50 @@
</span><span class="cx"> this.recordedCommits = [
</span><span class="cx"> {
</span><span class="cx"> "revisionNumber": 33018,
</span><del>- "link": "http://trac.webkit.org/repository/changeset/77018/safari",
- "title": {},
- "author": "John",
- "date": "2015-11-15T17:05:44.000Z",
</del><ins>+ "link": "https://trac.webkit.org/changeset/33018",
+ "title": { innerHTML: "commit message" },
+ "author": "john@webkit.org",
+ "date": new Date("2015-11-15T17:05:44.000Z"),
</ins><span class="cx"> "description": "description",
</span><span class="cx"> "containsBranchLocation": true,
</span><span class="cx"> "branchName": "trunk"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "revisionNumber": 33019,
</span><del>- "link": "http://trac.webkit.org/repository/changeset/77019/safari",
- "title": {},
- "author": "Paul",
- "date": "2015-11-16T01:18:23.000Z",
</del><ins>+ "link": "https://trac.webkit.org/changeset/33019",
+ "title": { innerHTML: "commit message" },
+ "author": "paul@webkit.org",
+ "date": new Date("2015-11-16T01:18:23.000Z"),
</ins><span class="cx"> "description": "description",
</span><span class="cx"> "containsBranchLocation": true,
</span><span class="cx"> "branchName": "trunk"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "revisionNumber": 33020,
</span><del>- "link": "http://trac.webkit.org/repository/changeset/77020/safari",
- "title": {},
- "author": "George",
- "date": "2015-11-16T01:19:27.000Z",
</del><ins>+ "link": "https://trac.webkit.org/changeset/33020",
+ "title": { innerHTML: "commit message" },
+ "author": "george@webkit.org",
+ "date": new Date("2015-11-16T01:19:27.000Z"),
</ins><span class="cx"> "description": "description",
</span><span class="cx"> "containsBranchLocation": true,
</span><span class="cx"> "branchName": "trunk"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "revisionNumber": 33021,
</span><del>- "link": "http://trac.webkit.org/repository/changeset/77021/safari",
- "title": {},
- "author": "Ringo",
- "date": "2015-11-16T01:20:58.000Z",
</del><ins>+ "link": "https://trac.webkit.org/changeset/33021",
+ "title": { innerHTML: "commit message" },
+ "author": "ringo@webkit.org",
+ "date": new Date("2015-11-16T01:20:58.000Z"),
</ins><span class="cx"> "description": "description",
</span><span class="cx"> "containsBranchLocation": true,
</span><span class="cx"> "branchName": "someOtherBranch"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "revisionNumber": 33022,
</span><del>- "link": "http://trac.webkit.org/repository/changeset/77022/safari",
- "title": {},
- "author": "Bob",
- "date": "2015-11-16T01:22:01.000Z",
</del><ins>+ "link": "https://trac.webkit.org/changeset/33022",
+ "title": { innerHTML: "commit message" },
+ "author": "bob@webkit.org",
+ "date": new Date("2015-11-16T01:22:01.000Z"),
</ins><span class="cx"> "description": "description",
</span><span class="cx"> "containsBranchLocation": true,
</span><span class="cx"> "branchName": "trunk"
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestfixturetracrssxml"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml (0 => 195658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml 2016-01-27 07:43:50 UTC (rev 195658)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<?xml version="1.0"?>
+<!--
+Copyright (C) 2016 Apple, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
+ <channel>
+ <title>WebKit</title>
+ <link>https://trac.webkit.org/timeline</link>
+ <description>Trac Timeline</description>
+ <language>en-US</language>
+ <generator>Trac 0.12.3</generator>
+ <image>
+ <title>WebKit</title>
+ <url>https://trac.webkit.org/chrome/site/favicon.png</url>
+ <link>https://trac.webkit.org/timeline</link>
+ </image>
+ <item>
+ <title>Changeset [33025]: Ita prorsus inquam Ad corpus diceres pertinere, sed ea, quae dixi</title>
+
+ <author>george@webkit.org</author>
+
+ <pubDate>Tue, 26 Jan 2016 22:48:15 GMT</pubDate>
+ <link>https://trac.webkit.org/changeset/33025</link>
+ <guid isPermaLink="false">https://trac.webkit.org/changeset/33025/1453848495332569</guid>
+ <description>Description</description>
+ <category>changeset</category>
+ </item><item>
+ <title>Changeset [33024]: An eum discere ea mavis, quae cum plane perdidiceriti nihil sciat</title>
+
+ <author>paul@webkit.org</author>
+
+ <pubDate>Tue, 26 Jan 2016 22:22:25 GMT</pubDate>
+ <link>https://trac.webkit.org/changeset/33024</link>
+ <guid isPermaLink="false">https://trac.webkit.org/changeset/33024/1453846945244007</guid>
+ <description>Description</description>
+ <category>changeset</category>
+ </item><item>
+ <title>Changeset [33023]: Lorem ipsum dolor sit amet, consectetur adipiscing elit.</title>
+
+ <author>john@webkit.org</author>
+
+ <pubDate>Tue, 26 Jan 2016 22:22:14 GMT</pubDate>
+ <link>https://trac.webkit.org/changeset/33023</link>
+ <guid isPermaLink="false">https://trac.webkit.org/changeset/33023/1453846934034550</guid>
+ <description>Description</description>
+ <category>changeset</category>
+ </item>
+ </channel>
+</rss>
</ins><span class="cx">\ No newline at end of file
</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 (195657 => 195658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-27 07:13:31 UTC (rev 195657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-27 07:43:50 UTC (rev 195658)
</span><span class="lines">@@ -23,6 +23,30 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+module("Trac", {
+ setup: function() {
+ this.trac = new MockTrac();
+ }
+});
+
+test("_loaded", function()
+{
+ var client = new XMLHttpRequest();
+ client.open('GET', 'test-fixture-trac-rss.xml', false);
+ client.onreadystatechange = function () {
+ if (client.readyState === client.DONE)
+ this.trac._loaded(client.responseXML);
+ }.bind(this);
+ client.send();
+ var commits = this.trac.recordedCommits;
+ strictEqual(commits.length, 8, "should have 8 commits");
+ for (var i = 1; i < commits.length; i++) {
+ var firstRevision = commits[i - 1].revisionNumber;
+ var secondRevision = commits[i].revisionNumber;
+ strictEqual(secondRevision - firstRevision, 1, "commits should be in order " + firstRevision + ", " + secondRevision);
+ }
+});
+
</ins><span class="cx"> module("BuildBotQueueView");
</span><span class="cx">
</span><span class="cx"> var settings = new Settings;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195657 => 195658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-27 07:13:31 UTC (rev 195657)
+++ trunk/Tools/ChangeLog 2016-01-27 07:43:50 UTC (rev 195658)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-26 Jason Marcell <jmarcell@apple.com>
+
+ Sort incoming commits via date instead of revision number.
+ https://bugs.webkit.org/show_bug.cgi?id=153467
+
+ Reviewed by Alexey Proskuryakov.
+
+ Future Trac instances may use Git or other revision control systems where we cannnot rely on the revision number
+ for sorting revisions. Instead we use the commit date to sort revisions chronologically.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
+ (Trac.prototype._loaded): Sort via date instead of revision number.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js:
+ (MockTrac): Fix up the mock data to look more like real-world data.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-trac-rss.xml: Added.
+ Fake RSS feed that adds three more commits.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit tests to test
+ Trac._loaded().
+
</ins><span class="cx"> 2016-01-26 I-Ting Liu <iting_liu@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a test for WebKit::stringMatchesWildcardString.
</span></span></pre>
</div>
</div>
</body>
</html>