<!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>[174468] trunk/Websites/perf.webkit.org</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/174468">174468</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 12:21:58 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove superfluously duplicated code in public/api/report-commits.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapireportcommitsphp">trunk/Websites/perf.webkit.org/public/api/report-commits.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (174467 => 174468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2014-10-08 19:21:36 UTC (rev 174467)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2014-10-08 19:21:58 UTC (rev 174468)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2014-10-08 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Remove superfluously duplicated code in public/api/report-commits.php.
+
+2014-10-08 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Perf dashboard should store commit logs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137510
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapireportcommitsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/report-commits.php (174467 => 174468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/report-commits.php 2014-10-08 19:21:36 UTC (rev 174467)
+++ trunk/Websites/perf.webkit.org/public/api/report-commits.php 2014-10-08 19:21:58 UTC (rev 174468)
</span><span class="lines">@@ -79,84 +79,3 @@
</span><span class="cx"> main($HTTP_RAW_POST_DATA);
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-<?php
-
-require('../include/json-header.php');
-
-function main($post_data) {
- $db = new Database;
- if (!$db->connect())
- exit_with_error('DatabaseConnectionFailure');
-
- $report = json_decode($post_data, true);
-
- verify_builder($db, $report);
-
- $commits = array_get($report, 'commits', array());
-
- foreach ($commits as $commit_info) {
- if (!array_key_exists('repository', $commit_info))
- exit_with_error('MissingRepositoryName', array('commit' => $commit_info));
- if (!array_key_exists('revision', $commit_info))
- exit_with_error('MissingRevision', array('commit' => $commit_info));
- if (!ctype_alnum($commit_info['revision']))
- exit_with_error('InvalidRevision', array('commit' => $commit_info));
- if (!array_key_exists('time', $commit_info))
- exit_with_error('MissingTimestamp', array('commit' => $commit_info));
- if (!array_key_exists('author', $commit_info) || !is_array($commit_info['author']))
- exit_with_error('MissingAuthorOrInvalidFormat', array('commit' => $commit_info));
- }
-
- $db->begin_transaction();
- foreach ($commits as $commit_info) {
- $repository_id = $db->select_or_insert_row('repositories', 'repository', array('name' => $commit_info['repository']));
- if (!$repository_id) {
- $db->rollback_transaction();
- exit_with_error('FailedToInsertRepository', array('commit' => $commit_info));
- }
-
- $parent_revision = array_get($commit_info, 'parent');
- $parent_id = NULL;
- if ($parent_revision) {
- $parent_commit = $db->select_first_row('commits', 'commit', array('repository' => $repository_id, 'revision' => $parent_revision));
- if (!$parent_commit) {
- $db->rollback_transaction();
- exit_with_error('FailedToFindParentCommit', array('commit' => $commit_info));
- }
- $parent_id = $parent_commit['commit_id'];
- }
-
- $data = array(
- 'repository' => $repository_id,
- 'revision' => $commit_info['revision'],
- 'parent' => $parent_id,
- 'time' => $commit_info['time'],
- 'author_name' => array_get($commit_info['author'], 'name'),
- 'author_email' => array_get($commit_info['author'], 'email'),
- 'message' => $commit_info['message'],
- 'reported' => true,
- );
- $db->update_or_insert_row('commits', 'commit', array('repository' => $repository_id, 'revision' => $data['revision']), $data);
- }
- $db->commit_transaction();
-
- exit_with_success();
-}
-
-function verify_builder($db, $report) {
- array_key_exists('builderName', $report) or exit_with_error('MissingBuilderName');
- array_key_exists('builderPassword', $report) or exit_with_error('MissingBuilderPassword');
-
- $builder_info = array(
- 'name' => $report['builderName'],
- 'password_hash' => hash('sha256', $report['builderPassword'])
- );
-
- $matched_builder = $db->select_first_row('builders', 'builder', $builder_info);
- if (!$matched_builder)
- exit_with_error('BuilderNotFound', array('name' => $builder_info['name']));
-}
-
-main($HTTP_RAW_POST_DATA);
-
-?>
</del></span></pre>
</div>
</div>
</body>
</html>