Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 2 insertions, 16 deletions

diff --git a/Tools/Scripts/webkitpy/common/checkout/changelog.py b/Tools/Scripts/webkitpy/common/checkout/changelog.py
index 55b05982b..3cfe25f80 100644
--- a/Tools/Scripts/webkitpy/common/checkout/changelog.py
+++ b/Tools/Scripts/webkitpy/common/checkout/changelog.py
@@ -39,20 +39,6 @@ import webkitpy.common.config.urls as config_urls
 from webkitpy.common.system.deprecated_logging import log
 
 
-# FIXME: parse_bug_id should not be a free function.
-# FIXME: Where should this function live in the dependency graph?
-def parse_bug_id(message):
-    if not message:
-        return None
-    match = re.search(config_urls.bug_url_short, message)
-    if match:
-        return int(match.group('bug_id'))
-    match = re.search(config_urls.bug_url_long, message)
-    if match:
-        return int(match.group('bug_id'))
-    return None
-
-
 # FIXME: parse_bug_id_from_changelog should not be a free function.
 # Parse the bug ID out of a Changelog message based on the format that is
 # used by prepare-ChangeLog
@@ -67,7 +53,7 @@ def parse_bug_id_from_changelog(message):
         return int(match.group('bug_id'))
     # We weren't able to find a bug URL in the format used by prepare-ChangeLog. Fall back to the
     # first bug URL found anywhere in the message.
-    return parse_bug_id(message)
+    return config_urls.parse_bug_id(message)
 
 
 class ChangeLogEntry(object):
@@ -147,7 +133,7 @@ class ChangeLogEntry(object):
 
     @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: