Changeset 70014 in webkit

Timestamp:

Oct 18, 2010 6:38:00 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

scm.py should be able tell us what revisions made changes to a given file
​https://bugs.webkit.org/show_bug.cgi?id=47863

Look again, your SCM.py can now log files.

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

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (4 diffs)
• Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        scm.py should be able tell us what revisions made changes to a given file
+        https://bugs.webkit.org/show_bug.cgi?id=47863
+
+        Look again, your SCM.py can now log files.
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+
 2010-10-18  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -246 +246 @@
         self._subclass_must_implement()
 
-    def changed_files_for_revision(self):
+    def changed_files_for_revision(self, revision):
+        self._subclass_must_implement()
+
+    def revisions_changing_file(self, path, limit=5):
         self._subclass_must_implement()
 
@@ -428 +431 @@
         return self.run_status_and_extract_filenames(status_command, self._status_regexp("ACDMR"))
 
+    def revisions_changing_file(self, path, limit=5):
+        revisions = []
+        log_command = ['svn', 'log', '--quiet', '--limit=%s' % limit, path]
+        for line in self.run(log_command, cwd=self.checkout_root).splitlines():
+            match = re.search('^r(?P<revision>\d+) ', line)
+            if not match:
+                continue
+            revisions.append(int(match.group('revision')))
+        return revisions
+
     def conflicted_files(self):
         return self.run_status_and_extract_filenames(self.status_command(), self._status_regexp("C"))
@@ -654 +667 @@
         return self._changes_files_for_commit(commit_id)
 
+    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)
+
     def conflicted_files(self):
         # We do not need to pass decode_output for this diff command
@@ -688 +705 @@
             raise ScriptError(message='Failed to find git commit for revision %s, your checkout likely needs an update.' % revision)
         return git_commit
+
+    def svn_revision_from_git_commit(self, commit_id):
+        return int(self.run(['git', 'svn', 'find-rev', commit_id]).rstrip())
 
     def contents_at_revision(self, path, revision):

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

@@ -353 +353 @@
         self.assertRaises(ScriptError, self.scm.contents_at_revision, "does_not_exist", 2)
 
+    def _shared_test_revisions_changing_file(self):
+        self.assertEqual(self.scm.revisions_changing_file("test_file"), [5, 4, 3, 2])
+        self.assertRaises(ScriptError, self.scm.revisions_changing_file, "non_existent_file")
+
     def _shared_test_committer_email_for_revision(self):
         self.assertEqual(self.scm.committer_email_for_revision(3), getpass.getuser())  # Committer "email" will be the current user
@@ -697 +701 @@
         self._shared_test_contents_at_revision()
 
+    def test_revisions_changing_file(self):
+        self._shared_test_revisions_changing_file()
+
     def test_committer_email_for_revision(self):
         self._shared_test_committer_email_for_revision()
@@ -1200 +1207 @@
         self._shared_test_contents_at_revision()
 
+    def test_revisions_changing_file(self):
+        self._shared_test_revisions_changing_file()
+
     def test_added_files(self):
         self._shared_test_added_files()