<!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>[200900] 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/200900">200900</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 17:01:21 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>v3 UI shows full git hash instead of the first 8 characters for a blame range
https://bugs.webkit.org/show_bug.cgi?id=157691
Reviewed by Stephanie Lewis.
Fixed the bug that v3 UI shows the full 40 character git hash instead of the first 8 character as done in v2 UI.
* public/v3/models/commit-log.js:
(CommitLog.prototype.diff): Fixed the bug.
* tools/run-tests.py:
(main): Add the support for running a subset of tests as mocha does.
* unit-tests/commit-log-tests.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelscommitlogjs">trunk/Websites/perf.webkit.org/public/v3/models/commit-log.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolsruntestspy">trunk/Websites/perf.webkit.org/tools/run-tests.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgunittestscommitlogtestsjs">trunk/Websites/perf.webkit.org/unit-tests/commit-log-tests.js</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 (200899 => 200900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-05-13 23:53:51 UTC (rev 200899)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-05-14 00:01:21 UTC (rev 200900)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-05-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ v3 UI shows full git hash instead of the first 8 characters for a blame range
+ https://bugs.webkit.org/show_bug.cgi?id=157691
+
+ Reviewed by Stephanie Lewis.
+
+ Fixed the bug that v3 UI shows the full 40 character git hash instead of the first 8 character as done in v2 UI.
+
+ * public/v3/models/commit-log.js:
+ (CommitLog.prototype.diff): Fixed the bug.
+ * tools/run-tests.py:
+ (main): Add the support for running a subset of tests as mocha does.
+ * unit-tests/commit-log-tests.js: Added.
+
+2016-05-13 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Unreviewed. Added the missing executable bits.
</span><span class="cx">
</span><span class="cx"> * tools/bundle-v3-scripts.py: Added property svn:executable.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelscommitlogjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/commit-log.js (200899 => 200900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/commit-log.js 2016-05-13 23:53:51 UTC (rev 200899)
+++ trunk/Websites/perf.webkit.org/public/v3/models/commit-log.js 2016-05-14 00:01:21 UTC (rev 200900)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> from = parseInt(from) + 1;
</span><span class="cx"> label = `r${from}-r${this.revision()}`;
</span><span class="cx"> } else if (to.length == 40) { // e.g. git hash
</span><del>- label = `${from}..${to}`;
</del><ins>+ label = `${from.substring(0, 8)}..${to.substring(0, 8)}`;
</ins><span class="cx"> } else
</span><span class="cx"> label = `${from} - ${to}`;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsruntestspy"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/run-tests.py (200899 => 200900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/run-tests.py 2016-05-13 23:53:51 UTC (rev 200899)
+++ trunk/Websites/perf.webkit.org/tools/run-tests.py 2016-05-14 00:01:21 UTC (rev 200900)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx"> import subprocess
</span><ins>+import sys
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main():
</span><span class="lines">@@ -17,7 +18,8 @@
</span><span class="cx"> subprocess.call(['npm', 'install', package_name])
</span><span class="cx">
</span><span class="cx"> mocha_path = os.path.join(node_modules_dir, 'mocha/bin/mocha')
</span><del>- return subprocess.call([mocha_path, 'unit-tests', 'server-tests'])
</del><ins>+ test_paths = sys.argv[1:] or ['unit-tests', 'server-tests']
+ return subprocess.call([mocha_path] + test_paths)
</ins><span class="cx">
</span><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> main()
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestscommitlogtestsjs"></a>
<div class="addfile"><h4>Added: trunk/Websites/perf.webkit.org/unit-tests/commit-log-tests.js (0 => 200900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/commit-log-tests.js (rev 0)
+++ trunk/Websites/perf.webkit.org/unit-tests/commit-log-tests.js 2016-05-14 00:01:21 UTC (rev 200900)
</span><span class="lines">@@ -0,0 +1,150 @@
</span><ins>+'use strict';
+
+const assert = require('assert');
+
+require('../tools/js/v3-models.js');
+const MockModels = require('./resources/mock-v3-models.js').MockModels;
+
+function webkitCommit()
+{
+ return new CommitLog(1, {
+ repository: MockModels.webkit,
+ revision: '200805',
+ time: +(new Date('2016-05-13T00:55:57.841344Z')),
+ });
+}
+
+function oldWebKitCommit()
+{
+ return new CommitLog(2, {
+ repository: MockModels.webkit,
+ revision: '200574',
+ time: +(new Date('2016-05-09T14:59:23.553767Z')),
+ });
+}
+
+function gitWebKitCommit()
+{
+ return new CommitLog(3, {
+ repository: MockModels.webkit,
+ revision: '6f8b0dbbda95a440503b88db1dd03dad3a7b07fb',
+ time: +(new Date('2016-05-13T00:55:57.841344Z')),
+ });
+}
+
+function oldGitWebKitCommit()
+{
+ return new CommitLog(4, {
+ repository: MockModels.webkit,
+ revision: 'ffda14e6db0746d10d0f050907e4a7325851e502',
+ time: +(new Date('2016-05-09T14:59:23.553767Z')),
+ });
+}
+
+function osxCommit()
+{
+ return new CommitLog(5, {
+ repository: MockModels.osx,
+ revision: '10.11.4 15E65',
+ time: null,
+ });
+}
+
+function oldOSXCommit()
+{
+ return new CommitLog(6, {
+ repository: MockModels.osx,
+ revision: '10.11.3 15D21',
+ time: null,
+ });
+}
+
+describe('CommitLog', function () {
+ MockModels.inject();
+
+ describe('label', function () {
+ it('should prefix SVN revision with "r"', function () {
+ assert.equal(webkitCommit().label(), 'r200805');
+ });
+
+ it('should truncate a Git hash at 8th character', function () {
+ assert.equal(gitWebKitCommit().label(), '6f8b0dbb');
+ });
+
+ it('should not modify OS X version', function () {
+ assert.equal(osxCommit().label(), '10.11.4 15E65');
+ });
+ });
+
+ describe('title', function () {
+ it('should prefix SVN revision with "r"', function () {
+ assert.equal(webkitCommit().title(), 'WebKit at r200805');
+ });
+
+ it('should truncate a Git hash at 8th character', function () {
+ assert.equal(gitWebKitCommit().title(), 'WebKit at 6f8b0dbb');
+ });
+
+ it('should not modify OS X version', function () {
+ assert.equal(osxCommit().title(), 'OS X at 10.11.4 15E65');
+ });
+ });
+
+ describe('diff', function () {
+ it('should use label() as the label the previous commit is missing', function () {
+ assert.deepEqual(webkitCommit().diff(), {
+ from: null,
+ to: '200805',
+ label: 'r200805',
+ url: 'http://trac.webkit.org/changeset/200805',
+ repository: MockModels.webkit
+ });
+
+ assert.deepEqual(gitWebKitCommit().diff(), {
+ from: null,
+ to: '6f8b0dbbda95a440503b88db1dd03dad3a7b07fb',
+ label: '6f8b0dbb',
+ url: 'http://trac.webkit.org/changeset/6f8b0dbbda95a440503b88db1dd03dad3a7b07fb',
+ repository: MockModels.webkit,
+ });
+
+ assert.deepEqual(osxCommit().diff(), {
+ from: null,
+ to: '10.11.4 15E65',
+ label: '10.11.4 15E65',
+ url: '',
+ repository: MockModels.osx,
+ });
+ });
+
+ it('should use increment the old SVN revision by 1', function () {
+ assert.deepEqual(webkitCommit().diff(oldWebKitCommit()), {
+ from: '200575',
+ to: '200805',
+ label: 'r200575-r200805',
+ url: '',
+ repository: MockModels.webkit
+ });
+ });
+
+ it('should truncate a Git hash at 8th character', function () {
+ assert.deepEqual(gitWebKitCommit().diff(oldGitWebKitCommit()), {
+ from: 'ffda14e6db0746d10d0f050907e4a7325851e502',
+ to: '6f8b0dbbda95a440503b88db1dd03dad3a7b07fb',
+ label: 'ffda14e6..6f8b0dbb',
+ url: '',
+ repository: MockModels.webkit
+ });
+ });
+
+ it('should surround "-" with spaces', function () {
+ assert.deepEqual(osxCommit().diff(oldOSXCommit()), {
+ from: '10.11.3 15D21',
+ to: '10.11.4 15E65',
+ label: '10.11.3 15D21 - 10.11.4 15E65',
+ url: '',
+ repository: MockModels.osx
+ });
+ });
+ });
+});
</ins></span></pre>
</div>
</div>
</body>
</html>