<!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>[167751] 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/167751">167751</a></dd>
<dt>Author</dt> <dd>jcraig@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 00:07:06 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
https://bugs.webkit.org/show_bug.cgi?id=131115
Reviewed by Daniel Bates.
Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.
* Scripts/commit-log-editor: Added --no-style.
* Scripts/prepare-ChangeLog: Primary patch.
(main): Primary patch.
(createPatchCommand): Added --no-style.
* Scripts/svn-create-patch: Primary patch.
* Scripts/webkit-tools-completion.sh: Added --style and --no-style.
* Scripts/webkitpy/common/checkout/scm/svn.py: Added --no-style.
(SVN.create_patch): Added --no-style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscommitlogeditor">trunk/Tools/Scripts/commit-log-editor</a></li>
<li><a href="#trunkToolsScriptsprepareChangeLog">trunk/Tools/Scripts/prepare-ChangeLog</a></li>
<li><a href="#trunkToolsScriptssvncreatepatch">trunk/Tools/Scripts/svn-create-patch</a></li>
<li><a href="#trunkToolsScriptswebkittoolscompletionsh">trunk/Tools/Scripts/webkit-tools-completion.sh</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmsvnpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/ChangeLog 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-23 James Craig <jcraig@apple.com>
+
+ prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
+ https://bugs.webkit.org/show_bug.cgi?id=131115
+
+ Reviewed by Daniel Bates.
+
+ Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.
+
+ * Scripts/commit-log-editor: Added --no-style.
+ * Scripts/prepare-ChangeLog: Primary patch.
+ (main): Primary patch.
+ (createPatchCommand): Added --no-style.
+ * Scripts/svn-create-patch: Primary patch.
+ * Scripts/webkit-tools-completion.sh: Added --style and --no-style.
+ * Scripts/webkitpy/common/checkout/scm/svn.py: Added --no-style.
+ (SVN.create_patch): Added --no-style.
+
</ins><span class="cx"> 2014-04-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix iOS build.
</span></span></pre></div>
<a id="trunkToolsScriptscommitlogeditor"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/commit-log-editor (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/commit-log-editor 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/Scripts/commit-log-editor 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> chomp($webkitGenerateCommitMessage = `git config --bool core.webkitGenerateCommitMessage`);
</span><span class="cx"> }
</span><span class="cx"> if ($webkitGenerateCommitMessage ne "false") {
</span><del>- open CHANGELOG_ENTRIES, "-|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write" or die "prepare-ChangeLog failed: $!.\n";
</del><ins>+ open CHANGELOG_ENTRIES, "-|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write --no-style" or die "prepare-ChangeLog failed: $!.\n";
</ins><span class="cx"> while (<CHANGELOG_ENTRIES>) {
</span><span class="cx"> print NEWLOG normalizeLineEndings($_, $endl);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsprepareChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/prepare-ChangeLog (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/prepare-ChangeLog 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> my $gitCommit = 0;
</span><span class="cx"> my $gitIndex = "";
</span><span class="cx"> my $gitReviewer = "";
</span><ins>+ my $checkWebKitStyle = 1;
</ins><span class="cx"> my $openChangeLogs = 0;
</span><span class="cx"> my $writeChangeLogs = 1;
</span><span class="cx"> my $showHelp = 0;
</span><span class="lines">@@ -144,6 +145,7 @@
</span><span class="cx"> "git-index" => \$gitIndex,
</span><span class="cx"> "git-reviewer:s" => \$gitReviewer,
</span><span class="cx"> "help|h!" => \$showHelp,
</span><ins>+ "style!" => \$checkWebKitStyle,
</ins><span class="cx"> "open|o!" => \$openChangeLogs,
</span><span class="cx"> "write!" => \$writeChangeLogs,
</span><span class="cx"> "update!" => \$updateChangeLogs);
</span><span class="lines">@@ -158,6 +160,7 @@
</span><span class="cx"> print STDERR " --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
</span><span class="cx"> print STDERR " This option is useful when the git commit lacks a Signed-Off-By: line\n";
</span><span class="cx"> print STDERR " -h|--help Show this help message\n";
</span><ins>+ print STDERR " --[no-]style Run check-webkit-style script when done (default: style)\n";
</ins><span class="cx"> print STDERR " -o|--open Open ChangeLogs in an editor when done\n";
</span><span class="cx"> print STDERR " --[no-]update Update ChangeLogs from svn before adding entry (default: update)\n";
</span><span class="cx"> print STDERR " --[no-]write Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";
</span><span class="lines">@@ -225,6 +228,11 @@
</span><span class="cx"> printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($checkWebKitStyle) {
+ print STDERR " Running check-webkit-style.\n ";
+ system "$FindBin::Bin/check-webkit-style";
+ }
+
</ins><span class="cx"> # Open ChangeLogs.
</span><span class="cx"> if ($openChangeLogs && @$changeLogs) {
</span><span class="cx"> openChangeLogs($changeLogs);
</span><span class="lines">@@ -1657,7 +1665,7 @@
</span><span class="cx">
</span><span class="cx"> my $command;
</span><span class="cx"> if (isSVN()) {
</span><del>- $command = "'$FindBin::Bin/svn-create-patch' $changedFilesString";
</del><ins>+ $command = "'$FindBin::Bin/svn-create-patch --no-style' $changedFilesString";
</ins><span class="cx"> } elsif (isGit()) {
</span><span class="cx"> $command = GIT . " diff -M -C " . diffFromToString($gitCommit, $gitIndex, $mergeBase);
</span><span class="cx"> $command .= " -- $changedFilesString" unless $gitCommit;
</span></span></pre></div>
<a id="trunkToolsScriptssvncreatepatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/svn-create-patch (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/svn-create-patch 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/Scripts/svn-create-patch 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -77,15 +77,17 @@
</span><span class="cx"> $ENV{'LC_ALL'} = 'C';
</span><span class="cx">
</span><span class="cx"> my $showHelp;
</span><ins>+my $checkWebKitStyle = 1;
</ins><span class="cx"> my $ignoreChangelogs = 0;
</span><span class="cx"> my $devNull = File::Spec->devnull();
</span><span class="cx">
</span><span class="cx"> my $result = GetOptions(
</span><span class="cx"> "help" => \$showHelp,
</span><del>- "ignore-changelogs" => \$ignoreChangelogs
</del><ins>+ "ignore-changelogs" => \$ignoreChangelogs,
+ "style!" => \$checkWebKitStyle,
</ins><span class="cx"> );
</span><span class="cx"> if (!$result || $showHelp) {
</span><del>- print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [svndir1 [svndir2 ...]]\n";
</del><ins>+ print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
</ins><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -106,6 +108,11 @@
</span><span class="cx"> generateDiff($path, $prefix);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ($checkWebKitStyle) {
+ print STDERR " Running check-webkit-style.\n ";
+ system "$FindBin::Bin/check-webkit-style";
+}
+
</ins><span class="cx"> exit 0;
</span><span class="cx">
</span><span class="cx"> # Overall sort, considering multiple criteria.
</span></span></pre></div>
<a id="trunkToolsScriptswebkittoolscompletionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkit-tools-completion.sh (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkit-tools-completion.sh 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/Scripts/webkit-tools-completion.sh 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -109,6 +109,6 @@
</span><span class="cx">
</span><span class="cx"> complete -F _webkit-patch_complete webkit-patch
</span><span class="cx"> complete -o default -W "--continue --fix-merged --help --no-continue --no-warnings --warnings -c -f -h -w" resolve-ChangeLogs
</span><del>-complete -o default -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-update --no-write --open --update --write -d -h -o" prepare-ChangeLog
</del><ins>+complete -o default -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-style --no-update --no-write --open --style --update --write -d -h -o" prepare-ChangeLog
</ins><span class="cx"> complete -W "--clean --debug --help -h" build-webkit
</span><span class="cx"> complete -o default -W "--add-platform-exceptions --complex-text --configuration --guard-malloc --help --http --ignore-tests --launch-safari --leaks --merge-leak-depth --new-test-results --no-http --no-show-results --no-new-test-results --no-sample-on-timeout --no-strip-editing-callbacks --pixel-tests --platform --port --quiet --random --reset-results --results-directory --reverse --root --sample-on-timeout --singly --skipped --slowest --strict --strip-editing-callbacks --threaded --timeout --tolerance --use-remote-links-to-tests --valgrind --verbose -1 -c -g -h -i -l -m -o -p -q -t -v" run-webkit-tests
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmsvnpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (167750 => 167751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2014-04-24 06:37:51 UTC (rev 167750)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2014-04-24 07:07:06 UTC (rev 167751)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> elif changed_files == None:
</span><span class="cx"> changed_files = []
</span><span class="cx"> script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
</span><del>- return self.run([script_path] + changed_files,
</del><ins>+ return self.run([script_path, "--no-style"] + changed_files,
</ins><span class="cx"> cwd=self.checkout_root, return_stderr=False,
</span><span class="cx"> decode_output=False)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>