1 files changed, 19 insertions, 5 deletions
diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
index 17a8515..8daf92e 100644
--- a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
+++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
@@ -53,22 +53,34 @@ from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup, SoupStrainer
 def parse_bug_id(message):
     if not message:
         return None
-    match = re.search("http\://webkit\.org/b/(?P<bug_id>\d+)", message)
+    match = re.search(Bugzilla.bug_url_short, message)
     if match:
         return int(match.group('bug_id'))
-    match = re.search(
-        Bugzilla.bug_server_regex + "show_bug\.cgi\?id=(?P<bug_id>\d+)",
-        message)
+    match = re.search(Bugzilla.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
+def parse_bug_id_from_changelog(message):
+    if not message:
+        return None
+    match = re.search("^\s*" + Bugzilla.bug_url_short + "$", message, re.MULTILINE)
+    if match:
+        return int(match.group('bug_id'))
+    match = re.search("^\s*" + Bugzilla.bug_url_long + "$", message, re.MULTILINE)
+    if match:
+        return int(match.group('bug_id'))
+    return None
+
 def timestamp():
     return datetime.now().strftime("%Y%m%d%H%M%S")
 
 
-# A container for all of the logic for making and parsing buzilla queries.
+# A container for all of the logic for making and parsing bugzilla queries.
 class BugzillaQueries(object):
 
     def __init__(self, bugzilla):
@@ -210,6 +222,8 @@ class Bugzilla(object):
     bug_server_host = "bugs.webkit.org"
     bug_server_regex = "https?://%s/" % re.sub('\.', '\\.', bug_server_host)
     bug_server_url = "https://%s/" % bug_server_host
+    bug_url_long = bug_server_regex + r"show_bug\.cgi\?id=(?P<bug_id>\d+)(&ctype=xml)?"
+    bug_url_short = r"http\://webkit\.org/b/(?P<bug_id>\d+)"
 
     def quips(self):
         # We only fetch and parse the list of quips once per instantiation