<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[70020] trunk/WebKitTools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/70020">70020</a></dd>
<dt>Author</dt> <dd>abarth@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-18 19:44:21 -0700 (Mon, 18 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-18  Adam Barth  &lt;abarth@webkit.org&gt;

        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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutapipy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutapi_unittestpy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutscmpy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutscm_unittestpy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsqueriespy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/ChangeLog        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2010-10-18  Adam Barth  &lt;abarth@webkit.org&gt;
+
+        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.
+
</ins><span class="cx"> 2010-10-18  Kenneth Russell  &lt;kbr@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Eric Seidel.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutapipy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -83,14 +83,20 @@
</span><span class="cx">     def bug_id_for_revision(self, revision):
</span><span class="cx">         return self.commit_info_for_revision(revision).bug_id()
</span><span class="cx"> 
</span><del>-    def modified_changelogs(self, git_commit):
</del><ins>+    def _modified_files_matching_predicate(self, git_commit, predicate):
</ins><span class="cx">         # SCM returns paths relative to scm.checkout_root
</span><span class="cx">         # Callers (especially those using the ChangeLog class) may
</span><span class="cx">         # expect absolute paths, so this method returns absolute paths.
</span><span class="cx">         changed_files = self._scm.changed_files(git_commit)
</span><span class="cx">         absolute_paths = [os.path.join(self._scm.checkout_root, path) for path in changed_files]
</span><del>-        return [path for path in absolute_paths if self._is_path_to_changelog(path)]
</del><ins>+        return [path for path in absolute_paths if predicate(path)]
</ins><span class="cx"> 
</span><ins>+    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))
+
</ins><span class="cx">     def commit_message_for_this_commit(self, git_commit):
</span><span class="cx">         changelog_paths = self.modified_changelogs(git_commit)
</span><span class="cx">         if not len(changelog_paths):
</span><span class="lines">@@ -109,6 +115,14 @@
</span><span class="cx">         # FIXME: We should sort and label the ChangeLog messages like commit-log-editor does.
</span><span class="cx">         return CommitMessage(&quot;&quot;.join(changelog_messages).splitlines())
</span><span class="cx"> 
</span><ins>+    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))
+
</ins><span class="cx">     def bug_id_for_this_commit(self, git_commit):
</span><span class="cx">         try:
</span><span class="cx">             return parse_bug_id(self.commit_message_for_this_commit(git_commit).message())
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutapi_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -173,3 +173,24 @@
</span><span class="cx">         checkout = Checkout(scm)
</span><span class="cx">         expected_changlogs = [&quot;/foo/bar/ChangeLog&quot;, &quot;/foo/bar/relative/path/ChangeLog&quot;]
</span><span class="cx">         self.assertEqual(checkout.modified_changelogs(git_commit=None), expected_changlogs)
</span><ins>+
+    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(&quot;ChangeLog&quot;):
+                return [3]
+            return [4, 8]
+
+        scm = Mock()
+        scm.checkout_root = &quot;/foo/bar&quot;
+        scm.changed_files = lambda git_commit: [&quot;file1&quot;, &quot;file2&quot;, &quot;relative/path/ChangeLog&quot;]
+        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'])
</ins></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutscmpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> 
</span><span class="cx">     def revisions_changing_file(self, path, limit=5):
</span><span class="cx">         commit_ids = self.run([&quot;git&quot;, &quot;log&quot;, &quot;--pretty=format:%H&quot;, &quot;-%s&quot; % limit, path]).splitlines()
</span><del>-        return map(self.svn_revision_from_git_commit, commit_ids)
</del><ins>+        return filter(lambda revision: revision, map(self.svn_revision_from_git_commit, commit_ids))
</ins><span class="cx"> 
</span><span class="cx">     def conflicted_files(self):
</span><span class="cx">         # We do not need to pass decode_output for this diff command
</span><span class="lines">@@ -706,7 +706,10 @@
</span><span class="cx">         return git_commit
</span><span class="cx"> 
</span><span class="cx">     def svn_revision_from_git_commit(self, commit_id):
</span><del>-        return int(self.run(['git', 'svn', 'find-rev', commit_id]).rstrip())
</del><ins>+        try:
+            return int(self.run(['git', 'svn', 'find-rev', commit_id]).rstrip())
+        except ValueError, e:
+            return None
</ins><span class="cx"> 
</span><span class="cx">     def contents_at_revision(self, path, revision):
</span><span class="cx">         &quot;&quot;&quot;Returns a byte array (str()) containing the contents
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutscm_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -971,6 +971,10 @@
</span><span class="cx">         self.scm.commit_locally_with_message(&quot;another test commit&quot;)
</span><span class="cx">         self._two_local_commits()
</span><span class="cx"> 
</span><ins>+    def test_revisions_changing_files_with_local_commit(self):
+        self._one_local_commit()
+        self.assertEquals(self.scm.revisions_changing_file('test_file_commit1'), [])
+
</ins><span class="cx">     def test_commit_with_message(self):
</span><span class="cx">         self._one_local_commit_plus_working_copy_changes()
</span><span class="cx">         scm = detect_scm_system(self.git_checkout_path)
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsqueriespy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py (70019 => 70020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py        2010-10-19 02:37:49 UTC (rev 70019)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py        2010-10-19 02:44:21 UTC (rev 70020)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> 
</span><span class="cx"> from optparse import make_option
</span><span class="cx"> 
</span><ins>+import webkitpy.tool.steps as steps
+
</ins><span class="cx"> from webkitpy.common.checkout.commitinfo import CommitInfo
</span><span class="cx"> from webkitpy.common.config.committers import CommitterList
</span><span class="cx"> from webkitpy.common.net.buildbot import BuildBot
</span><span class="lines">@@ -41,6 +43,21 @@
</span><span class="cx"> from webkitpy.layout_tests import port
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+class SuggestReviewers(AbstractDeclarativeCommand):
+    name = &quot;suggest-reviewers&quot;
+    help_text = &quot;Suggest reviewers for a patch based on recent changes to the modified files.&quot;
+
+    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 &quot;\n&quot;.join([reviewer.full_name for reviewer in reviewers])
+
+
</ins><span class="cx"> class BugsToCommit(AbstractDeclarativeCommand):
</span><span class="cx">     name = &quot;bugs-to-commit&quot;
</span><span class="cx">     help_text = &quot;List bugs in the commit-queue&quot;
</span></span></pre>
</div>
</div>

</body>
</html>