<!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>[162971] 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/162971">162971</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-28 15:30:29 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Teach Buildbot dashboard to parse alternative revision format
https://bugs.webkit.org/show_bug.cgi?id=127561
Reviewed by Alexey Proskuryakov.
Add support for extracting the OpenSource and Internal revision numbers when Buildbot
returns a dictionary for the value of property got_revision.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(isMultiCodebaseGotRevisionProperty): Added.
(parseRevisionProperty): Added; parses Buildbot revision property, which can either be a
string or a dictionary.
(BuildbotIteration.prototype.update.): Modified to call parseRevisionProperty() to determine
the OpenSource and Internal revision numbers.</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="#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 (162970 => 162971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js        2014-01-28 23:29:30 UTC (rev 162970)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js        2014-01-28 23:30:29 UTC (rev 162971)
</span><span class="lines">@@ -62,6 +62,20 @@
</span><span class="cx"> Updated: "updated"
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// See <http://docs.buildbot.net/0.8.8/manual/cfg-properties.html>.
+function isMultiCodebaseGotRevisionProperty(property)
+{
+ return property[0] === "got_revision" && typeof property[1] === "object";
+}
+
+function parseRevisionProperty(property, key)
+{
+ if (!property)
+ return null;
+ var value = property[1];
+ return parseInt(isMultiCodebaseGotRevisionProperty(property) ? value[key] : value, 10);
+}
+
</ins><span class="cx"> BuildbotIteration.prototype = {
</span><span class="cx"> constructor: BuildbotIteration,
</span><span class="cx"> __proto__: BaseObject.prototype,
</span><span class="lines">@@ -200,11 +214,25 @@
</span><span class="cx"> if (!data || !data.properties)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // The property got_revision may have the following forms:
+ //
+ // ["got_revision",{"Internal":"1357","WebKitOpenSource":"2468"},"Source"]
+ // OR
+ // ["got_revision","2468_1357","Source"]
+ // OR
+ // ["got_revision","2468","Source"]
+ //
+ // When extracting the OpenSource revision from property got_revision we don't need to check whether the
+ // value of got_revision is a dictionary (represents multiple codebases) or a string literal because we
+ // assume that got_revision contains the OpenSource revision. However, it may not have the Internal
+ // revision. Therefore, we only look at got_revision to extract the Internal revision when it's
+ // a dictionary.
+
</ins><span class="cx"> var openSourceRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "got_revision" || property[0] === "revision" || property[0] === "opensource_got_revision"; });
</span><del>- this.openSourceRevision = openSourceRevisionProperty ? parseInt(openSourceRevisionProperty[1], 10) : null;
</del><ins>+ this.openSourceRevision = parseRevisionProperty(openSourceRevisionProperty, "WebKitOpenSource");
</ins><span class="cx">
</span><del>- var internalRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "internal_got_revision"; });
- this.internalRevision = internalRevisionProperty ? parseInt(internalRevisionProperty[1], 10) : null;
</del><ins>+ var internalRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "internal_got_revision" || isMultiCodebaseGotRevisionProperty(property); });
+ this.internalRevision = parseRevisionProperty(internalRevisionProperty, "Internal");
</ins><span class="cx">
</span><span class="cx"> var layoutTestResults = collectTestResults.call(this, data, "layout-test");
</span><span class="cx"> this.layoutTestResults = layoutTestResults ? new BuildbotTestResults(this, layoutTestResults) : null;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162970 => 162971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-01-28 23:29:30 UTC (rev 162970)
+++ trunk/Tools/ChangeLog        2014-01-28 23:30:29 UTC (rev 162971)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-28 Daniel Bates <dabates@apple.com>
+
+ Teach Buildbot dashboard to parse alternative revision format
+ https://bugs.webkit.org/show_bug.cgi?id=127561
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add support for extracting the OpenSource and Internal revision numbers when Buildbot
+ returns a dictionary for the value of property got_revision.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (isMultiCodebaseGotRevisionProperty): Added.
+ (parseRevisionProperty): Added; parses Buildbot revision property, which can either be a
+ string or a dictionary.
+ (BuildbotIteration.prototype.update.): Modified to call parseRevisionProperty() to determine
+ the OpenSource and Internal revision numbers.
+
</ins><span class="cx"> 2014-01-28 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add API to allow setting the process model in WebKitWebContext
</span></span></pre>
</div>
</div>
</body>
</html>