<!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>[174501] 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/174501">174501</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 23:50:45 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>StyleQueue should throw a PatchIsNotValid exception to achieve
consistency with CommitQueue and EWS
https://bugs.webkit.org/show_bug.cgi?id=137500
Patch by Jake Nielsen <jacob_nielsen@apple.com> on 2014-10-08
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/tool/bot/stylequeuetask.py:
Adds a call to validate() in run().
(StyleQueueTask.run):
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
Adds a return False in the patch is not valid exception statement.
(AbstractEarlyWarningSystem.review_patch):
* Scripts/webkitpy/tool/commands/queues.py:
Adds a return False in the patch is not valid exception statement in
commit queue, and adds an except statement to catch PatchIsNotValid
exceptions in style queue.
(CommitQueue.process_work_item):
(StyleQueue.review_patch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotstylequeuetaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueuespy">trunk/Tools/Scripts/webkitpy/tool/commands/queues.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174500 => 174501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-09 06:48:17 UTC (rev 174500)
+++ trunk/Tools/ChangeLog 2014-10-09 06:50:45 UTC (rev 174501)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-08 Jake Nielsen <jacob_nielsen@apple.com>
+
+ StyleQueue should throw a PatchIsNotValid exception to achieve
+ consistency with CommitQueue and EWS
+ https://bugs.webkit.org/show_bug.cgi?id=137500
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/tool/bot/stylequeuetask.py:
+ Adds a call to validate() in run().
+ (StyleQueueTask.run):
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ Adds a return False in the patch is not valid exception statement.
+ (AbstractEarlyWarningSystem.review_patch):
+ * Scripts/webkitpy/tool/commands/queues.py:
+ Adds a return False in the patch is not valid exception statement in
+ commit queue, and adds an except statement to catch PatchIsNotValid
+ exceptions in style queue.
+ (CommitQueue.process_work_item):
+ (StyleQueue.review_patch):
+
</ins><span class="cx"> 2014-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Race condition with WebKitWebView:is-loading after starting page load
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotstylequeuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py (174500 => 174501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2014-10-09 06:48:17 UTC (rev 174500)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2014-10-09 06:50:45 UTC (rev 174501)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate, UnableToApplyPatch
</del><ins>+from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate, UnableToApplyPatch, PatchIsNotValid
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class StyleQueueTaskDelegate(PatchAnalysisTaskDelegate):
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> "Unabled to apply watchlist")
</span><span class="cx">
</span><span class="cx"> def run(self):
</span><ins>+ if not self.validate():
+ raise PatchIsNotValid(self._patch)
</ins><span class="cx"> if not self._clean():
</span><span class="cx"> return False
</span><span class="cx"> if not self._update():
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (174500 => 174501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2014-10-09 06:48:17 UTC (rev 174500)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2014-10-09 06:50:45 UTC (rev 174501)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> return succeeded
</span><span class="cx"> except PatchIsNotValid:
</span><span class="cx"> self._did_error(patch, "%s did not process patch." % self.name)
</span><ins>+ return False
</ins><span class="cx"> except UnableToApplyPatch, e:
</span><span class="cx"> self._did_error(patch, "%s unable to apply patch." % self.name)
</span><span class="cx"> return False
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (174500 => 174501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2014-10-09 06:48:17 UTC (rev 174500)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2014-10-09 06:50:45 UTC (rev 174501)
</span><span class="lines">@@ -324,6 +324,7 @@
</span><span class="cx"> return False
</span><span class="cx"> except PatchIsNotValid:
</span><span class="cx"> self._did_error(patch, "%s did not process patch." % self.name)
</span><ins>+ return False
</ins><span class="cx"> except ScriptError, e:
</span><span class="cx"> validator = CommitterValidator(self._tool)
</span><span class="cx"> validator.reject_patch_from_commit_queue(patch.id(), self._error_message_for_bug(task, patch, e))
</span><span class="lines">@@ -452,9 +453,6 @@
</span><span class="cx">
</span><span class="cx"> def review_patch(self, patch):
</span><span class="cx"> task = StyleQueueTask(self, patch)
</span><del>- if not task.validate():
- self._did_error(patch, "%s did not process patch." % self.name)
- return False
</del><span class="cx"> try:
</span><span class="cx"> style_check_succeeded = task.run()
</span><span class="cx"> if not style_check_succeeded:
</span><span class="lines">@@ -464,6 +462,9 @@
</span><span class="cx"> except UnableToApplyPatch, e:
</span><span class="cx"> self._did_error(patch, "%s unable to apply patch." % self.name)
</span><span class="cx"> return False
</span><ins>+ except PatchIsNotValid:
+ self._did_error(patch, "%s did not process patch." % self.name)
+ return False
</ins><span class="cx"> except ScriptError, e:
</span><span class="cx"> output = re.sub(r'Failed to run .+ exit_code: 1', '', e.output)
</span><span class="cx"> message = "Attachment %s did not pass %s:\n\n%s\n\nIf any of these errors are false positives, please file a bug against check-webkit-style." % (patch.id(), self.name, output)
</span></span></pre>
</div>
</div>
</body>
</html>