Changeset 228303 in webkit

Timestamp:

Feb 8, 2018, 5:24:36 PM (9 years ago)

Author:

Jonathan Bedard

Message:

webkit-patch suggest-reviewers dies with AttributeError: 'NoneType' object has no attribute 'revision'
​https://bugs.webkit.org/show_bug.cgi?id=182584

Reviewed by Daniel Bates.

It is possible that a specific revision has an empty ChangeLog. In this case, Checkout.commit_info_for_revision
will return 'None'. Checkout.recent_commit_infos_for_files should never return a set with 'None' in it.

• Scripts/webkitpy/common/checkout/checkout.py:

(Checkout.recent_commit_infos_for_files): Remove any empty commit information from the set.

• Scripts/webkitpy/common/checkout/checkout_unittest.py: Add a file which references an empty ChangeLog.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-02-08  Jonathan Bedard  <jbedard@apple.com>
+
+        webkit-patch suggest-reviewers dies with AttributeError: 'NoneType' object has no attribute 'revision'
+        https://bugs.webkit.org/show_bug.cgi?id=182584
+
+        Reviewed by Daniel Bates.
+
+        It is possible that a specific revision has an empty ChangeLog. In this case, Checkout.commit_info_for_revision
+        will return 'None'. Checkout.recent_commit_infos_for_files should never return a set with 'None' in it.
+
+        * Scripts/webkitpy/common/checkout/checkout.py:
+        (Checkout.recent_commit_infos_for_files): Remove any empty commit information from the set.
+        * Scripts/webkitpy/common/checkout/checkout_unittest.py: Add a file which references an empty ChangeLog.
+
 2018-02-08  Matt Lewis  <jlewis3@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py

@@ -138 +138 @@
     def recent_commit_infos_for_files(self, paths):
         revisions = set(sum(map(self._scm.revisions_changing_file, paths), []))
-        return set(map(self.commit_info_for_revision, revisions))
+        # Remove a None entry from the set. This can happen if a revision does have an associated ChangeLog entry (e.g. r185745).
+        return set(map(self.commit_info_for_revision, revisions)) - set([None])
 
     def suggested_reviewers(self, git_commit, changed_files=None):

trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

@@ -419 +419 @@
     def test_suggested_reviewers(self):
         def mock_changelog_entries_for_revision(revision, changed_files=None):
+            if revision == 27:
+                return []
             if revision % 2 == 0:
                 return [ChangeLogEntry(_changelog1entry1)]
@@ -424 +426 @@
 
         def mock_revisions_changing_file(path, limit=5):
-            if path.endswith("ChangeLog"):
+            if path.endswith('ChangeLog'):
                 return [3]
+            if path.endswith('file_with_empty_changelog'):
+                return [27]
             return [4, 8]
 
         checkout = self._make_checkout()
-        checkout._scm.checkout_root = "/foo/bar"
-        checkout._scm.changed_files = lambda git_commit: ["file1", "file2", "relative/path/ChangeLog"]
+        checkout._scm.checkout_root = '/foo/bar'
+        checkout._scm.changed_files = lambda git_commit: ['file1', 'file2', 'relative/path/ChangeLog', 'file_with_empty_changelog']
         checkout._scm.revisions_changing_file = mock_revisions_changing_file
         checkout.changelog_entries_for_revision = mock_changelog_entries_for_revision