<!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>[172892] 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/172892">172892</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-08-23 18:35:16 -0700 (Sat, 23 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build.webkit.org/dashboard: Further improve Trac loading
https://bugs.webkit.org/show_bug.cgi?id=136174
Reviewed by Timothy Hatcher.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
(Trac.prototype._xmlTimelineURL): Passing -1 as "max" resulted in an off by one
error, the oldest commit within the range wasn't returned. The correct argument for
"no limit" is 0.
(Trac.prototype.load): Added a function to load a specific time range.
(Trac.prototype._loaded): Updated to support loading revisions that are arbitrarily
positioned with regards to ones that were already known.</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="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (172891 => 172892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js 2014-08-24 01:22:00 UTC (rev 172891)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js 2014-08-24 01:35:16 UTC (rev 172892)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx"> Trac.UpdateInterval = 45000; // 45 seconds
</span><span class="cx">
</span><span class="cx"> Trac.Event = {
</span><del>- CommitsUpdated: "commits-updated"
</del><ins>+ CommitsUpdated: "commits-updated",
+ Loaded: "loaded"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Trac.prototype = {
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> var fromDay = new Date(fromDate.getFullYear(), fromDate.getMonth(), fromDate.getDate());
</span><span class="cx"> var toDay = new Date(toDate.getFullYear(), toDate.getMonth(), toDate.getDate());
</span><span class="cx">
</span><del>- return this.baseURL + "timeline?changeset=on&format=rss&max=-1" +
</del><ins>+ return this.baseURL + "timeline?changeset=on&format=rss&max=0" +
</ins><span class="cx"> "&from=" + (toDay.getMonth() + 1) + "%2F" + toDay.getDate() + "%2F" + (toDay.getFullYear() % 100) +
</span><span class="cx"> "&daysback=" + ((toDay - fromDay) / 1000 / 60 / 60 / 24);
</span><span class="cx"> },
</span><span class="lines">@@ -126,59 +127,44 @@
</span><span class="cx">
</span><span class="cx"> _loaded: function(dataDocument)
</span><span class="cx"> {
</span><del>- var earliestKnownRevision = 0;
- var latestKnownRevision = 0;
- if (this.recordedCommits.length) {
- earliestKnownRevision = this.recordedCommits[0].revisionNumber;
- latestKnownRevision = this.recordedCommits[this.recordedCommits.length - 1].revisionNumber;
- }
</del><ins>+ var recordedRevisionNumbers = this.recordedCommits.reduce(function(previousResult, commit) {
+ previousResult[commit.revisionNumber] = commit;
+ return previousResult;
+ }, {});
</ins><span class="cx">
</span><span class="cx"> var knownCommitsWereUpdated = false;
</span><span class="cx"> var newCommits = [];
</span><del>- var newCommitsBeforeEarliestKnownRevision = [];
</del><span class="cx">
</span><span class="cx"> var commitInfoElements = dataDocument.evaluate("/rss/channel/item", dataDocument, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE);
</span><del>- var commitInfoElement = undefined;
- var indexInRecordedCommits = undefined;
</del><ins>+ var commitInfoElement;
</ins><span class="cx"> while (commitInfoElement = commitInfoElements.iterateNext()) {
</span><span class="cx"> var commit = this._convertCommitInfoElementToObject(dataDocument, commitInfoElement);
</span><del>- if (commit.revisionNumber > latestKnownRevision) {
- console.assert(typeof indexInRecordedCommits === "undefined");
- newCommits.push(commit);
- } else if (commit.revisionNumber < earliestKnownRevision) {
- console.assert(typeof indexInRecordedCommits === "undefined" || indexInRecordedCommits === -1);
- newCommitsBeforeEarliestKnownRevision.push(commit);
- } else {
- if (typeof indexInRecordedCommits === "undefined") {
- // We could have started anywhere in the recorded commits array, let's find where.
- // With periodic updates, this will be the latest recorded commit, so starting from the end.
- for (var i = this.recordedCommits.length - 1; i >= 0; --i) {
- if (this.recordedCommits[i].revisionNumber === commit.revisionNumber) {
- indexInRecordedCommits = i;
- break;
- }
- }
- }
-
- console.assert(indexInRecordedCommits >= 0);
- console.assert(this.recordedCommits[indexInRecordedCommits].revisionNumber === commit.revisionNumber);
-
</del><ins>+ if (commit.revisionNumber in recordedRevisionNumbers) {
</ins><span class="cx"> // Author could have changed, as commit queue replaces it after the fact.
</span><del>- if (this.recordedCommits[indexInRecordedCommits].author !== commit.author) {
- this.recordedCommits[indexInRecordedCommits].author = commit.author;
</del><ins>+ console.assert(recordedRevisionNumbers[commit.revisionNumber].revisionNumber === commit.revisionNumber);
+ if (recordedRevisionNumbers[commit.revisionNumber].author != commit.author) {
+ recordedRevisionNumbers[commit.revisionNumber].author = commit.author;
</ins><span class="cx"> knownCommitWasUpdated = true;
</span><span class="cx"> }
</span><del>- --indexInRecordedCommits;
- }
</del><ins>+ } else
+ newCommits.push(commit);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (newCommits.length || newCommitsBeforeEarliestKnownRevision.length)
- this.recordedCommits = newCommitsBeforeEarliestKnownRevision.reverse().concat(this.recordedCommits, newCommits.reverse());
</del><ins>+ if (newCommits.length)
+ this.recordedCommits = newCommits.concat(this.recordedCommits).sort(function(a, b) { return a.revisionNumber - b.revisionNumber; });
</ins><span class="cx">
</span><del>- if (newCommits.length || newCommitsBeforeEarliestKnownRevision.length || knownCommitsWereUpdated)
</del><ins>+ if (newCommits.length || knownCommitsWereUpdated)
</ins><span class="cx"> this.dispatchEventToListeners(Trac.Event.CommitsUpdated, null);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ load: function(fromDate, toDate)
+ {
+ loadXML(this._xmlTimelineURL(fromDate, toDate), function(dataDocument) {
+ this._loaded(dataDocument);
+ this.dispatchEventToListeners(Trac.Event.Loaded, [fromDate, toDate]);
+ }.bind(this), this._needsAuthentication ? { withCredentials: true } : {});
+ },
+
</ins><span class="cx"> update: function()
</span><span class="cx"> {
</span><span class="cx"> loadXML(this._xmlTimelineURL(), this._loaded.bind(this), this._needsAuthentication ? { withCredentials: true } : {});
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172891 => 172892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-24 01:22:00 UTC (rev 172891)
+++ trunk/Tools/ChangeLog 2014-08-24 01:35:16 UTC (rev 172892)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-08-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ build.webkit.org/dashboard: Further improve Trac loading
+ https://bugs.webkit.org/show_bug.cgi?id=136174
+
+ Reviewed by Timothy Hatcher.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
+ (Trac.prototype._xmlTimelineURL): Passing -1 as "max" resulted in an off by one
+ error, the oldest commit within the range wasn't returned. The correct argument for
+ "no limit" is 0.
+ (Trac.prototype.load): Added a function to load a specific time range.
+ (Trac.prototype._loaded): Updated to support loading revisions that are arbitrarily
+ positioned with regards to ones that were already known.
+
+2014-08-23 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> build.webkit.org/dashboard: Make it possible to pull historic data from Buildbot
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136182
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>