Bug 116395 - commit-queue should check for OOPS in changelog entries
Summary: commit-queue should check for OOPS in changelog entries
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Ryosuke Niwa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-18 12:21 PDT by Ryosuke Niwa
Modified: 2013-05-20 20:57 PDT (History)
4 users (show)

See Also:

Attachments
Fixes the bug (16.83 KB, patch)
2013-05-18 12:22 PDT, Ryosuke Niwa 		no flags Details | Formatted Diff | Diff
Tweaked a little (17.04 KB, patch)
2013-05-18 12:33 PDT, Ryosuke Niwa 		no flags Details | Formatted Diff | Diff
Fixed the change log (17.17 KB, patch)
2013-05-18 12:34 PDT, Ryosuke Niwa 		mrobinson: review+
Details | Formatted Diff | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ryosuke Niwa 2013-05-18 12:21:56 PDT 
commit-queue spits out error messages like the one below when git svn dcommit fails due to the commit message containing "OOPS":

Rejecting attachment 201959 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 201959, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
58e6761292ef49 M    Source
:040000 040000 6f4e1a68354793d2659c373537dad4589a60d84b 3088ee97e5eb90c0c7c17bc803c656352b4ab411 M    Tools
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.
Comment 1 Ryosuke Niwa 2013-05-18 12:22:53 PDT 
Created attachment 202211 [details]
Fixes the bug
Comment 2 WebKit Commit Bot 2013-05-18 12:24:26 PDT 
Attachment 202211 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py', u'Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py', u'Tools/Scripts/webkitpy/tool/commands/queues_unittest.py', u'Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py', u'Tools/Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py']" exit_code: 1
Tools/ChangeLog:1:  ChangeLog entry has no bug number  [changelog/bugnumber] [5]
Total errors found: 1 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Ryosuke Niwa 2013-05-18 12:33:26 PDT 
Created attachment 202213 [details]
Tweaked a little
Comment 4 Ryosuke Niwa 2013-05-18 12:34:52 PDT 
Created attachment 202214 [details]
Fixed the change log
Comment 5 Ryosuke Niwa 2013-05-20 20:57:29 PDT 
Committed r150404: <http://trac.webkit.org/changeset/150404>