Changeset 47005 in webkit

Timestamp:

Aug 10, 2009 2:53:10 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/28163> bugzilla-tool: scm module should not import bugzilla module

Reviewed by David Levin.

• Scripts/bugzilla-tool: (parse_bug_id): Added. Moved from CommitMessage.parse_bug_id() in scm module.
• Scripts/modules/scm.py: Removed import of bugzilla module. (CommitMessage.parse_bug_id): Deleted.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/scm.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-10  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/28163> bugzilla-tool: scm module should not import bugzilla module
+
+        Reviewed by David Levin.
+
+        * Scripts/bugzilla-tool:
+        (parse_bug_id): Added.  Moved from CommitMessage.parse_bug_id()
+        in scm module.
+        * Scripts/modules/scm.py: Removed import of bugzilla module.
+        (CommitMessage.parse_bug_id): Deleted.
+
 2009-08-10  Peter Kasting  <pkasting@google.com>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -97 +97 @@
     return changelog_paths
 
+def parse_bug_id(commit_message):
+    message = commit_message.message()
+    match = re.search("http\://webkit\.org/b/(?P<bug_id>\d+)", message)
+    if match:
+        return match.group('bug_id')
+    match = re.search(Bugzilla.bug_server_regex + "show_bug\.cgi\?id=(?P<bug_id>\d+)", message)
+    if match:
+        return match.group('bug_id')
+    return None
+
 def commit_message_for_this_commit(scm):
     changelog_paths = modified_changelogs(scm)
@@ -449 +459 @@
             commit_message = tool.scm().commit_message_for_local_commit(commit_id)
 
-            bug_id = options.bug_id or commit_message.parse_bug_id()
+            bug_id = options.bug_id or parse_bug_id(commit_message)
             if not bug_id:
                 log("Skipping %s: No bug id found in commit log or specified with --bug-id." % commit_id)

trunk/WebKitTools/Scripts/modules/scm.py

@@ -36 +36 @@
 # Import WebKit-specific modules.
 from modules.logging import error, log
-from modules.bugzilla import Bugzilla # FIXME: This should not be imported by scm.py
 
 def detect_scm_system(path):
@@ -77 +76 @@
     def message(self):
         return "\n".join(self.message_lines) + "\n"
-
-    def parse_bug_id(self):
-        for line in self.message_lines:
-            match = re.search("http\://webkit\.org/b/(?P<bug_id>\d+)", line)
-            if match:
-                return match.group('bug_id')
-            match = re.search(Bugzilla.bug_server_regex + "show_bug\.cgi\?id=(?P<bug_id>\d+)", line)
-            if match:
-                return match.group('bug_id')
-        return None