Changeset 57572 in webkit

Timestamp:

Apr 14, 2010 2:00:58 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-14 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Teach webkit-patch how to handle revisions missing ChangeLogs
​https://bugs.webkit.org/show_bug.cgi?id=37519

Make commit_info_for_revision return None when revision
is missing a ChangeLog. Previously we would throw an array index
exception.
Teach callers how to handle None.

• Scripts/webkitpy/common/checkout/api.py:
• Scripts/webkitpy/common/checkout/api_unittest.py:
• Scripts/webkitpy/tool/commands/download.py:
• Scripts/webkitpy/tool/commands/queries.py:
• Scripts/webkitpy/tool/commands/sheriffbot.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/api.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/api_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queries.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/sheriffbot.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-14  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Teach webkit-patch how to handle revisions missing ChangeLogs
+        https://bugs.webkit.org/show_bug.cgi?id=37519
+
+        Make commit_info_for_revision return None when revision
+        is missing a ChangeLog.  Previously we would throw an array index
+        exception.
+        Teach callers how to handle None.
+
+        * Scripts/webkitpy/common/checkout/api.py:
+        * Scripts/webkitpy/common/checkout/api_unittest.py:
+        * Scripts/webkitpy/tool/commands/download.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/commands/sheriffbot.py:
+
 2010-04-13  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py

@@ -62 +62 @@
         # Assume for now that the first entry has everything we need:
         # FIXME: This will throw an exception if there were no ChangeLogs.
+        if not len(changelog_entries):
+            return None
         changelog_entry = changelog_entries[0]
         changelog_data = {

trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py

@@ -145 +145 @@
         self.assertEqual(commitinfo.committer(), None)
 
+        checkout.changelog_entries_for_revision = lambda revision: []
+        self.assertEqual(checkout.commit_info_for_revision(1), None)
+
     def test_bug_id_for_revision(self):
         scm = Mock()

trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py

@@ -255 +255 @@
     def _commit_info(self, revision):
         commit_info = self.tool.checkout().commit_info_for_revision(revision)
-        if commit_info.bug_id():
+        if commit_info and commit_info.bug_id():
             # Note: Don't print a bug URL here because it will confuse the
             #       SheriffBot because the SheriffBot just greps the output

trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py

@@ -143 +143 @@
         for revision in suspect_revisions:
             commit_info = self.tool.checkout().commit_info_for_revision(revision)
-            print commit_info.blame_string(self.tool.bugs)
+            if commit_info:
+                print commit_info.blame_string(self.tool.bugs)
+            else:
+                print "FAILED to fetch CommitInfo for r%s, likely missing ChangeLog" % revision
 
     def execute(self, options, args, tool):
@@ -202 +205 @@
         for revision in suspect_revisions:
             commit_info = self.tool.checkout().commit_info_for_revision(revision)
-            print commit_info.blame_string(self.tool.bugs)
+            if commit_info:
+                print commit_info.blame_string(self.tool.bugs)
+            else:
+                print "FAILED to fetch CommitInfo for r%s, likely missing ChangeLog" % revision
 
     def _explain_failures_for_builder(self, builder, start_revision, search_limit=1000):

trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py

@@ -81 +81 @@
             try:
                 commit_info = self.tool.checkout().commit_info_for_revision(svn_revision)
+                if not commit_info:
+                    print "FAILED to fetch CommitInfo for r%s, likely missing ChangeLog" % revision
+                    continue
                 self._sheriff.post_irc_warning(commit_info, builders)
                 self._sheriff.post_blame_comment_on_bug(commit_info,