<!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>[160353] 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/160353">160353</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 02:18:29 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge mark_for_landing and mark_for_commit_queue into one argument
https://bugs.webkit.org/show_bug.cgi?id=125448
Patch by Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> on 2013-12-10
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
(CommitQueueFlag):
(Bugzilla._commit_queue_flag):
(Bugzilla._fill_attachment_form):
(Bugzilla.add_patch_to_bug):
(Bugzilla.create_bug):
* Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:
(test_commit_queue_flag.assert_commit_queue_flag):
(test_commit_queue_flag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbugzillabugzillapy">trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbugzillabugzilla_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160352 => 160353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-10 10:07:31 UTC (rev 160352)
+++ trunk/Tools/ChangeLog 2013-12-10 10:18:29 UTC (rev 160353)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-10 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
+
+ Merge mark_for_landing and mark_for_commit_queue into one argument
+ https://bugs.webkit.org/show_bug.cgi?id=125448
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+ (CommitQueueFlag):
+ (Bugzilla._commit_queue_flag):
+ (Bugzilla._fill_attachment_form):
+ (Bugzilla.add_patch_to_bug):
+ (Bugzilla.create_bug):
+ * Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:
+ (test_commit_queue_flag.assert_commit_queue_flag):
+ (test_commit_queue_flag):
+
</ins><span class="cx"> 2013-12-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove dead extract_reference_link.py (and the reftests module)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbugzillabugzillapy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py (160352 => 160353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2013-12-10 10:07:31 UTC (rev 160352)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2013-12-10 10:18:29 UTC (rev 160353)
</span><span class="lines">@@ -293,6 +293,12 @@
</span><span class="cx"> return map(lambda pair: pair[0], pairs)
</span><span class="cx">
</span><span class="cx">
</span><ins>+class CommitQueueFlag(object):
+ mark_for_nothing = 0
+ mark_for_commit_queue = 1
+ mark_for_landing = 2
+
+
</ins><span class="cx"> class Bugzilla(object):
</span><span class="cx"> def __init__(self, committers=committers.CommitterList()):
</span><span class="cx"> self.authenticated = False
</span><span class="lines">@@ -550,31 +556,25 @@
</span><span class="cx"> self.authenticated = True
</span><span class="cx"> self.username = username
</span><span class="cx">
</span><del>- # FIXME: Use enum instead of two booleans
- def _commit_queue_flag(self, mark_for_landing, mark_for_commit_queue):
- if mark_for_landing:
</del><ins>+ def _commit_queue_flag(self, commit_flag):
+ if commit_flag == CommitQueueFlag.mark_for_landing:
</ins><span class="cx"> user = self.committers.contributor_by_email(self.username)
</span><del>- mark_for_commit_queue = True
</del><span class="cx"> if not user:
</span><span class="cx"> _log.warning("Your Bugzilla login is not listed in contributors.json. Uploading with cq? instead of cq+")
</span><del>- mark_for_landing = False
</del><span class="cx"> elif not user.can_commit:
</span><span class="cx"> _log.warning("You're not a committer yet or haven't updated contributors.json yet. Uploading with cq? instead of cq+")
</span><del>- mark_for_landing = False
</del><ins>+ else:
+ return '+'
</ins><span class="cx">
</span><del>- if mark_for_landing:
- return '+'
- if mark_for_commit_queue:
</del><ins>+ if commit_flag != CommitQueueFlag.mark_for_nothing:
</ins><span class="cx"> return '?'
</span><span class="cx"> return 'X'
</span><span class="cx">
</span><del>- # FIXME: mark_for_commit_queue and mark_for_landing should be joined into a single commit_flag argument.
</del><span class="cx"> def _fill_attachment_form(self,
</span><span class="cx"> description,
</span><span class="cx"> file_object,
</span><span class="cx"> mark_for_review=False,
</span><del>- mark_for_commit_queue=False,
- mark_for_landing=False,
</del><ins>+ commit_flag=CommitQueueFlag.mark_for_nothing,
</ins><span class="cx"> is_patch=False,
</span><span class="cx"> filename=None,
</span><span class="cx"> mimetype=None):
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> self.browser['ispatch'] = ("1",)
</span><span class="cx"> # FIXME: Should this use self._find_select_element_for_flag?
</span><span class="cx"> self.browser['flag_type-1'] = ('?',) if mark_for_review else ('X',)
</span><del>- self.browser['flag_type-3'] = (self._commit_queue_flag(mark_for_landing, mark_for_commit_queue),)
</del><ins>+ self.browser['flag_type-3'] = (self._commit_queue_flag(commit_flag),)
</ins><span class="cx">
</span><span class="cx"> filename = filename or "%s.patch" % timestamp()
</span><span class="cx"> if not mimetype:
</span><span class="lines">@@ -637,11 +637,16 @@
</span><span class="cx"> self.browser.select_form(name="entryform")
</span><span class="cx"> file_object = self._file_object_for_upload(file_or_string)
</span><span class="cx"> filename = self._filename_for_upload(file_object, bug_id, extension="patch")
</span><ins>+ commit_flag = CommitQueueFlag.mark_for_nothing
+ if mark_for_landing:
+ commit_flag = CommitQueueFlag.mark_for_landing
+ elif mark_for_commit_queue:
+ commit_flag = CommitQueueFlag.mark_for_commit_queue
+
</ins><span class="cx"> self._fill_attachment_form(description,
</span><span class="cx"> file_object,
</span><span class="cx"> mark_for_review=mark_for_review,
</span><del>- mark_for_commit_queue=mark_for_commit_queue,
- mark_for_landing=mark_for_landing,
</del><ins>+ commit_flag=commit_flag,
</ins><span class="cx"> is_patch=True,
</span><span class="cx"> filename=filename)
</span><span class="cx"> if comment_text:
</span><span class="lines">@@ -708,11 +713,15 @@
</span><span class="cx"> # Patch files are already binary, so no encoding needed.
</span><span class="cx"> assert(isinstance(diff, str))
</span><span class="cx"> patch_file_object = StringIO.StringIO(diff)
</span><ins>+ commit_flag = CommitQueueFlag.mark_for_nothing
+ if mark_for_commit_queue:
+ commit_flag = CommitQueueFlag.mark_for_commit_queue
+
</ins><span class="cx"> self._fill_attachment_form(
</span><span class="cx"> patch_description,
</span><span class="cx"> patch_file_object,
</span><span class="cx"> mark_for_review=mark_for_review,
</span><del>- mark_for_commit_queue=mark_for_commit_queue,
</del><ins>+ commit_flag=commit_flag,
</ins><span class="cx"> is_patch=True)
</span><span class="cx">
</span><span class="cx"> response = self.browser.submit()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbugzillabugzilla_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py (160352 => 160353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py 2013-12-10 10:07:31 UTC (rev 160352)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py 2013-12-10 10:18:29 UTC (rev 160353)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> import datetime
</span><span class="cx"> import StringIO
</span><span class="cx">
</span><del>-from .bugzilla import Bugzilla, BugzillaQueries, EditUsersParser
</del><ins>+from .bugzilla import Bugzilla, BugzillaQueries, CommitQueueFlag, EditUsersParser
</ins><span class="cx">
</span><span class="cx"> from webkitpy.common.config import urls
</span><span class="cx"> from webkitpy.common.config.committers import Reviewer, Committer, Contributor, CommitterList
</span><span class="lines">@@ -307,34 +307,30 @@
</span><span class="cx"> committers=[Committer("WebKit Committer", "committer@webkit.org")],
</span><span class="cx"> contributors=[Contributor("WebKit Contributor", "contributor@webkit.org")])
</span><span class="cx">
</span><del>- def assert_commit_queue_flag(mark_for_landing, mark_for_commit_queue, expected, username=None):
</del><ins>+ def assert_commit_queue_flag(commit_flag, expected, username=None):
</ins><span class="cx"> bugzilla.username = username
</span><span class="cx"> capture = OutputCapture()
</span><span class="cx"> capture.capture_output()
</span><span class="cx"> try:
</span><del>- self.assertEqual(bugzilla._commit_queue_flag(mark_for_landing=mark_for_landing, mark_for_commit_queue=mark_for_commit_queue), expected)
</del><ins>+ self.assertEqual(bugzilla._commit_queue_flag(commit_flag), expected)
</ins><span class="cx"> finally:
</span><span class="cx"> capture.restore_output()
</span><span class="cx">
</span><del>- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=False, expected='X', username='unknown@webkit.org')
- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=True, expected='?', username='unknown@webkit.org')
- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=True, expected='?', username='unknown@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=True, expected='?', username='unknown@webkit.org')
</del><ins>+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_nothing, expected='X', username='unknown@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_commit_queue, expected='?', username='unknown@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_landing, expected='?', username='unknown@webkit.org')
</ins><span class="cx">
</span><del>- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=False, expected='X', username='contributor@webkit.org')
- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=True, expected='?', username='contributor@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=False, expected='?', username='contributor@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=True, expected='?', username='contributor@webkit.org')
</del><ins>+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_nothing, expected='X', username='contributor@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_commit_queue, expected='?', username='contributor@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_landing, expected='?', username='contributor@webkit.org')
</ins><span class="cx">
</span><del>- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=False, expected='X', username='committer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=True, expected='?', username='committer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=False, expected='+', username='committer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=True, expected='+', username='committer@webkit.org')
</del><ins>+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_nothing, expected='X', username='committer@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_commit_queue, expected='?', username='committer@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_landing, expected='+', username='committer@webkit.org')
</ins><span class="cx">
</span><del>- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=False, expected='X', username='reviewer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=False, mark_for_commit_queue=True, expected='?', username='reviewer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=False, expected='+', username='reviewer@webkit.org')
- assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=True, expected='+', username='reviewer@webkit.org')
</del><ins>+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_nothing, expected='X', username='reviewer@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_commit_queue, expected='?', username='reviewer@webkit.org')
+ assert_commit_queue_flag(commit_flag=CommitQueueFlag.mark_for_landing, expected='+', username='reviewer@webkit.org')
</ins><span class="cx">
</span><span class="cx"> def test__check_create_bug_response(self):
</span><span class="cx"> bugzilla = Bugzilla()
</span></span></pre>
</div>
</div>
</body>
</html>