Title: [110922] trunk/Tools
Revision
110922
Author
tk...@chromium.org
Date
2012-03-15 17:52:00 -0700 (Thu, 15 Mar 2012)

Log Message

REGRESSION(r110595): webkit-patch suggest-reviewers doesn't work
https://bugs.webkit.org/show_bug.cgi?id=81293

Reviewed by Adam Barth.

r110595 introduced new format of the author field of ChangeLog entry:
"Adam Barth  <aba...@webkit.org> && Benjamin Poulain  <bpoul...@apple.com>"
Updte chanelog.py to support it.

* Scripts/webkitpy/common/checkout/changelog.py:
(ChangeLogEntry._split_contributor_names):
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
(test_parse_authors):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (110921 => 110922)


--- trunk/Tools/ChangeLog	2012-03-16 00:45:26 UTC (rev 110921)
+++ trunk/Tools/ChangeLog	2012-03-16 00:52:00 UTC (rev 110922)
@@ -1,3 +1,19 @@
+2012-03-15  Kent Tamura  <tk...@chromium.org>
+
+        REGRESSION(r110595): webkit-patch suggest-reviewers doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=81293
+
+        Reviewed by Adam Barth.
+
+        r110595 introduced new format of the author field of ChangeLog entry:
+        "Adam Barth  <aba...@webkit.org> && Benjamin Poulain  <bpoul...@apple.com>"
+        Updte chanelog.py to support it.
+
+        * Scripts/webkitpy/common/checkout/changelog.py:
+        (ChangeLogEntry._split_contributor_names):
+        * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+        (test_parse_authors):
+
 2012-03-15  Lynn Neir  <lynn.n...@skype.net>
 
         Implement LayoutTestController::setValueForUser on Windows https://bugs.webkit.org/show_bug.cgi?id=55834

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (110921 => 110922)


--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py	2012-03-16 00:45:26 UTC (rev 110921)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py	2012-03-16 00:52:00 UTC (rev 110922)
@@ -147,7 +147,7 @@
 
     @staticmethod
     def _split_contributor_names(text):
-        return re.split(r'\s*(?:,(?:\s+and\s+|&)?|(?:^|\s+)and\s+|[/+&])\s*', text)
+        return re.split(r'\s*(?:,(?:\s+and\s+|&)?|(?:^|\s+)and\s+|&&|[/+&])\s*', text)
 
     def _fuzz_match_reviewers(self, reviewers_text_list):
         if not reviewers_text_list:

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (110921 => 110922)


--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py	2012-03-16 00:45:26 UTC (rev 110921)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py	2012-03-16 00:52:00 UTC (rev 110922)
@@ -425,6 +425,8 @@
             [('Zan Dobersek', 'zandober...@gmail.com'), ('Philippe Normand', 'pnorm...@igalia.com')])
         self._assert_parse_authors('New Contributor  <n...@webkit.org> and Noob  <n...@webkit.org>',
             [('New Contributor', 'n...@webkit.org'), ('Noob', 'n...@webkit.org')])
+        self._assert_parse_authors('Adam Barth  <aba...@webkit.org> && Benjamin Poulain  <bpoul...@apple.com>',
+            [('Adam Barth', 'aba...@webkit.org'), ('Benjamin Poulain', 'bpoul...@apple.com')])
 
     def _assert_has_valid_reviewer(self, reviewer_line, expected):
         self.assertEqual(self._entry_with_reviewer(reviewer_line).has_valid_reviewer(), expected)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to