Changeset 56891 in webkit

Timestamp:

Mar 31, 2010 8:49:43 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

webkit-patch land fails if not run from the root directory
​https://bugs.webkit.org/show_bug.cgi?id=35822

The root of the problem was that ChangeLog.init expects a path
relative to the current working directory, and SCM expects to
return paths relative to the SCM root. Fix it by converting from
SCM-relative to absolute paths in Checkout.modified_changelogs

• Scripts/webkitpy/common/checkout/api.py:
• Scripts/webkitpy/common/checkout/api_unittest.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)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-31  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch land fails if not run from the root directory
+        https://bugs.webkit.org/show_bug.cgi?id=35822
+
+        The root of the problem was that ChangeLog.__init__ expects a path
+        relative to the current working directory, and SCM expects to
+        return paths relative to the SCM root.  Fix it by converting from
+        SCM-relative to absolute paths in Checkout.modified_changelogs
+
+        * Scripts/webkitpy/common/checkout/api.py:
+        * Scripts/webkitpy/common/checkout/api_unittest.py:
+
 2010-03-31  Adam Barth  <abarth@webkit.org>
 

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

@@ -80 +80 @@
 
     def modified_changelogs(self):
-        return [path for path in self._scm.changed_files() if self._is_path_to_changelog(path)]
+        # SCM returns paths relative to scm.checkout_root
+        # Callers (especially those using the ChangeLog class) may
+        # expect absolute paths, so this method returns absolute paths.
+        changed_files = self._scm.changed_files()
+        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)]
 
     def commit_message_for_this_commit(self):

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

@@ -157 +157 @@
         checkout.commit_message_for_this_commit = lambda: CommitMessage(ChangeLogEntry(_changelog1entry1).contents().splitlines())
         self.assertEqual(checkout.bug_id_for_this_commit(), 36629)
+
+    def test_modified_changelogs(self):
+        scm = Mock()
+        scm.checkout_root = "/foo/bar"
+        scm.changed_files = lambda:["file1", "ChangeLog", "relative/path/ChangeLog"]
+        checkout = Checkout(scm)
+        expected_changlogs = ["/foo/bar/ChangeLog", "/foo/bar/relative/path/ChangeLog"]
+        self.assertEqual(checkout.modified_changelogs(), expected_changlogs)