Changeset 83152 in webkit

Timestamp:

Apr 7, 2011 1:40:16 AM (13 years ago)

Author:

mjs@apple.com

Message:

2011-04-07 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Adam Barth.

REGRESSION: "webkit-patch land" doesn't work correctly in SVN subdirectories
​https://bugs.webkit.org/show_bug.cgi?id=58017

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-07  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam Barth.
+
+        REGRESSION: "webkit-patch land" doesn't work correctly in SVN subdirectories
+        https://bugs.webkit.org/show_bug.cgi?id=58017
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+
 2011-04-06  Chang Shu  <cshu@webkit.org>
 

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

@@ -578 +578 @@
             return "Dry run, no commit.\nCommitted revision 0."
 
-        # FIXME: Should this use cwd=self.checkout_root?
-        return self.run(svn_commit_args, error_handler=commit_error_handler)
+        return self.run(svn_commit_args, cwd=self.checkout_root, error_handler=commit_error_handler)
 
     def svn_commit_log(self, svn_revision):

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

@@ -651 +651 @@
         self.assertEqual(self.scm.svn_revision_from_commit_text(commit_text), '0')
 
+    def test_commit_in_subdir(self, username=None):
+        write_into_file_at_path('test_dir/test_file3', 'more test content')
+        os.chdir("test_dir")
+        commit_text = self.scm.commit_with_message("another test commit", username)
+        os.chdir("..")
+        self.assertEqual(self.scm.svn_revision_from_commit_text(commit_text), '6')
+
     def test_commit_text_parsing(self):
         self._shared_test_commit_with_message()