Changeset 70020 in webkit

Timestamp:

Oct 18, 2010 7:44:21 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-10-18 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Implement webkit-patch suggest-reviewers
​https://bugs.webkit.org/show_bug.cgi?id=47866

• Scripts/webkitpy/common/checkout/api.py:
  • The main logic. We look at the last five changes to each modified (non-ChangeLog) file and collect up the reviewers of those changes as well as the authors of those changes who are reviewers.
• Scripts/webkitpy/common/checkout/api_unittest.py:
  • Test the logic with some fun mocks.
• Scripts/webkitpy/common/checkout/scm.py:
  • Fix a bug when you have local git commits.
• Scripts/webkitpy/common/checkout/scm_unittest.py:
  • Test that the bug is fixed.
• Scripts/webkitpy/tool/commands/queries.py:
  • Add the query.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Implement webkit-patch suggest-reviewers
+        https://bugs.webkit.org/show_bug.cgi?id=47866
+
+        * Scripts/webkitpy/common/checkout/api.py:
+            - The main logic.  We look at the last five changes to each
+              modified (non-ChangeLog) file and collect up the reviewers of
+              those changes as well as the authors of those changes who are
+              reviewers.
+        * Scripts/webkitpy/common/checkout/api_unittest.py:
+            - Test the logic with some fun mocks.
+        * Scripts/webkitpy/common/checkout/scm.py:
+            - Fix a bug when you have local git commits.
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+            - Test that the bug is fixed.
+        * Scripts/webkitpy/tool/commands/queries.py:
+            - Add the query.
+
 2010-10-18  Kenneth Russell  <kbr@google.com>
 

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

@@ -84 +84 @@
         return self.commit_info_for_revision(revision).bug_id()
 
-    def modified_changelogs(self, git_commit):
+    def _modified_files_matching_predicate(self, git_commit, predicate):
         # SCM returns paths relative to scm.checkout_root
         # Callers (especially those using the ChangeLog class) may
@@ -90 +90 @@
         changed_files = self._scm.changed_files(git_commit)
         absolute_paths = [os.path.join(self._scm.checkout_root, path) for path in changed_files]
-        return [path for path in absolute_paths if self._is_path_to_changelog(path)]
+        return [path for path in absolute_paths if predicate(path)]
+
+    def modified_changelogs(self, git_commit):
+        return self._modified_files_matching_predicate(git_commit, self._is_path_to_changelog)
+
+    def modified_non_changelogs(self, git_commit):
+        return self._modified_files_matching_predicate(git_commit, lambda path: not self._is_path_to_changelog(path))
 
     def commit_message_for_this_commit(self, git_commit):
@@ -109 +115 @@
         # FIXME: We should sort and label the ChangeLog messages like commit-log-editor does.
         return CommitMessage("".join(changelog_messages).splitlines())
+
+    def suggested_reviewers(self, git_commit):
+        changed_files = self.modified_non_changelogs(git_commit)
+        revisions = set(sum(map(self._scm.revisions_changing_file, changed_files), []))
+        commit_infos = set(map(self.commit_info_for_revision, revisions))
+        reviewers = [commit_info.reviewer() for commit_info in commit_infos if commit_info.reviewer()]
+        reviewers.extend([commit_info.author() for commit_info in commit_infos if commit_info.author() and commit_info.author().can_review])
+        return sorted(set(reviewers))
 
     def bug_id_for_this_commit(self, git_commit):

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

@@ -174 +174 @@
         expected_changlogs = ["/foo/bar/ChangeLog", "/foo/bar/relative/path/ChangeLog"]
         self.assertEqual(checkout.modified_changelogs(git_commit=None), expected_changlogs)
+
+    def test_suggested_reviewers(self):
+        def mock_changelog_entries_for_revision(revision):
+            if revision % 2 == 0:
+                return [ChangeLogEntry(_changelog1entry1)]
+            return [ChangeLogEntry(_changelog1entry2)]
+
+        def mock_revisions_changing_file(path, limit=5):
+            if path.endswith("ChangeLog"):
+                return [3]
+            return [4, 8]
+
+        scm = Mock()
+        scm.checkout_root = "/foo/bar"
+        scm.changed_files = lambda git_commit: ["file1", "file2", "relative/path/ChangeLog"]
+        scm.revisions_changing_file = mock_revisions_changing_file
+        checkout = Checkout(scm)
+        checkout.changelog_entries_for_revision = mock_changelog_entries_for_revision
+        reviewers = checkout.suggested_reviewers(git_commit=None)
+        reviewer_names = [reviewer.full_name for reviewer in reviewers]
+        self.assertEqual(reviewer_names, [u'Tor Arne Vestb\xf8'])

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

@@ -669 +669 @@
     def revisions_changing_file(self, path, limit=5):
         commit_ids = self.run(["git", "log", "--pretty=format:%H", "-%s" % limit, path]).splitlines()
-        return map(self.svn_revision_from_git_commit, commit_ids)
+        return filter(lambda revision: revision, map(self.svn_revision_from_git_commit, commit_ids))
 
     def conflicted_files(self):
@@ -707 +707 @@
 
     def svn_revision_from_git_commit(self, commit_id):
-        return int(self.run(['git', 'svn', 'find-rev', commit_id]).rstrip())
+        try:
+            return int(self.run(['git', 'svn', 'find-rev', commit_id]).rstrip())
+        except ValueError, e:
+            return None
 
     def contents_at_revision(self, path, revision):

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

@@ -972 +972 @@
         self._two_local_commits()
 
+    def test_revisions_changing_files_with_local_commit(self):
+        self._one_local_commit()
+        self.assertEquals(self.scm.revisions_changing_file('test_file_commit1'), [])
+
     def test_commit_with_message(self):
         self._one_local_commit_plus_working_copy_changes()

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

@@ -31 +31 @@
 from optparse import make_option
 
+import webkitpy.tool.steps as steps
+
 from webkitpy.common.checkout.commitinfo import CommitInfo
 from webkitpy.common.config.committers import CommitterList
@@ -40 +42 @@
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.layout_tests import port
+
+
+class SuggestReviewers(AbstractDeclarativeCommand):
+    name = "suggest-reviewers"
+    help_text = "Suggest reviewers for a patch based on recent changes to the modified files."
+
+    def __init__(self):
+        options = [
+            steps.Options.git_commit,
+        ]
+        AbstractDeclarativeCommand.__init__(self, options=options)
+
+    def execute(self, options, args, tool):
+        reviewers = tool.checkout().suggested_reviewers(options.git_commit)
+        print "\n".join([reviewer.full_name for reviewer in reviewers])