Title: [98753] trunk/Tools
- Revision
- 98753
- Author
- [email protected]
- Date
- 2011-10-28 12:58:04 -0700 (Fri, 28 Oct 2011)
Log Message
watchlist should not CC the bug reporter
https://bugs.webkit.org/show_bug.cgi?id=71079
Reviewed by Adam Barth.
Tested by test_apply_watch_list_local (webkitpy.tool.steps.applywatchlist_unittest.ApplyWatchListTest)
which remains upchanged and thus verifies that the reporter doesn't get added to the cc line.
* Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py: Add the new email in the output.
* Scripts/webkitpy/tool/mocktool.py: Change the reporter and make them one of the people to cc.
* Scripts/webkitpy/tool/steps/applywatchlist.py: Remove the reporter from the cc list.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98752 => 98753)
--- trunk/Tools/ChangeLog 2011-10-28 19:42:43 UTC (rev 98752)
+++ trunk/Tools/ChangeLog 2011-10-28 19:58:04 UTC (rev 98753)
@@ -1,3 +1,17 @@
+2011-10-28 David Levin <[email protected]>
+
+ watchlist should not CC the bug reporter
+ https://bugs.webkit.org/show_bug.cgi?id=71079
+
+ Reviewed by Adam Barth.
+
+ Tested by test_apply_watch_list_local (webkitpy.tool.steps.applywatchlist_unittest.ApplyWatchListTest)
+ which remains upchanged and thus verifies that the reporter doesn't get added to the cc line.
+
+ * Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py: Add the new email in the output.
+ * Scripts/webkitpy/tool/mocktool.py: Change the reporter and make them one of the people to cc.
+ * Scripts/webkitpy/tool/steps/applywatchlist.py: Remove the reporter from the cc list.
+
2011-10-28 Zoltan Horvath <[email protected]>
Add watchlist for QtWebKit2 API and for WK2's Qt specific files.
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py (98752 => 98753)
--- trunk/Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py 2011-10-28 19:42:43 UTC (rev 98752)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py 2011-10-28 19:58:04 UTC (rev 98753)
@@ -38,7 +38,7 @@
def test_args_parsing_with_bug(self):
expected_stderr = """MockWatchList: determine_cc_and_messages
-MOCK bug comment: bug_id=50002, cc=set(['[email protected]', '[email protected]'])
+MOCK bug comment: bug_id=50002, cc=set(['[email protected]', '[email protected]', '[email protected]'])
--- Begin comment ---
Message1.
Modified: trunk/Tools/Scripts/webkitpy/tool/mocktool.py (98752 => 98753)
--- trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2011-10-28 19:42:43 UTC (rev 98752)
+++ trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2011-10-28 19:58:04 UTC (rev 98753)
@@ -167,7 +167,7 @@
_bug2 = {
"id": 50001,
"title": "Bug with a patch needing review.",
- "reporter_email": "[email protected]",
+ "reporter_email": "[email protected]",
"assigned_to_email": "[email protected]",
"cc_emails": ["[email protected]", ],
"attachments": [_patch3],
@@ -823,7 +823,7 @@
class MockWatchList(object):
def determine_cc_and_messages(self, diff):
log("MockWatchList: determine_cc_and_messages")
- return {'cc_list': ['[email protected]', '[email protected]'], 'messages': ['Message1.', 'Message2.'], }
+ return {'cc_list': ['[email protected]', '[email protected]', '[email protected]'], 'messages': ['Message1.', 'Message2.'], }
class MockWorkspace(object):
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py (98752 => 98753)
--- trunk/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py 2011-10-28 19:42:43 UTC (rev 98752)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py 2011-10-28 19:58:04 UTC (rev 98753)
@@ -49,11 +49,12 @@
cc_emails = cc_and_messages['cc_list']
messages = cc_and_messages['messages']
if bug_id:
- # Remove emails and cc's which are already in the bug.
+ # Remove emails and cc's which are already in the bug or the reporter.
bug = self._tool.bugs.fetch_bug(bug_id)
messages = filter(lambda message: not bug.is_in_comments(message), messages)
cc_emails = set(cc_emails).difference(bug.cc_emails())
+ cc_emails.discard(bug.reporter_email())
comment_text = '\n\n'.join(messages)
if bug_id:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
