Changeset 47598 in webkit

Timestamp:

Aug 20, 2009 3:02:25 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-20 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

bugzilla-tool post-diff can post partial diffs from SVN checkouts.
​https://bugs.webkit.org/show_bug.cgi?id=28445

Pass the checkout root as the cwd. Also wrote a test to ensure this.

• Scripts/modules/scm.py:
• Scripts/modules/scm_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/scm.py (modified) (1 diff)
• Scripts/modules/scm_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-20  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        bugzilla-tool post-diff can post partial diffs from SVN checkouts.
+        https://bugs.webkit.org/show_bug.cgi?id=28445
+
+        Pass the checkout root as the cwd.  Also wrote a test to ensure this.
+
+        * Scripts/modules/scm.py:
+        * Scripts/modules/scm_unittest.py:
+
 2009-08-20  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/Scripts/modules/scm.py

@@ -275 +275 @@
 
     def create_patch(self):
-        return self.run_command(self.script_path("svn-create-patch"))
+        return self.run_command(self.script_path("svn-create-patch"), cwd=self.checkout_root)
 
     def commit_with_message(self, message):

trunk/WebKitTools/Scripts/modules/scm_unittest.py

@@ -28 +28 @@
 
 import os
+import stat
 import subprocess
 import tempfile
@@ -105 +106 @@
         SVNTestRepository.tear_down(self)
 
+    def test_create_patch_is_full_patch(self):
+        test_dir_path = os.path.join(self.svn_checkout_path, 'test_dir')
+        os.mkdir(test_dir_path)
+        test_file_path = os.path.join(test_dir_path, 'test_file2')
+        write_into_file_at_path(test_file_path, 'test content')
+        run(['svn', 'add', 'test_dir'])
+
+        # create_patch depends on 'svn-create-patch', so make a dummy version.
+        scripts_path = os.path.join(self.svn_checkout_path, 'WebKitTools', 'Scripts')
+        os.makedirs(scripts_path)
+        create_patch_path = os.path.join(scripts_path, 'svn-create-patch')
+        write_into_file_at_path(create_patch_path, '#!/bin/sh\necho $PWD')
+        os.chmod(create_patch_path, stat.S_IXUSR | stat.S_IRUSR)
+
+        # Change into our test directory and run the create_patch command.
+        os.chdir(test_dir_path)
+        scm = detect_scm_system(test_dir_path)
+        self.assertEqual(scm.checkout_root, self.svn_checkout_path) # Sanity check that detection worked right.
+        patch_contents = scm.create_patch()
+        # Our fake 'svn-create-patch' returns $PWD instead of a patch, check that it was executed from the root of the repo.
+        self.assertEqual(os.path.realpath(scm.checkout_root), patch_contents)
+
     def test_detection(self):
         scm = detect_scm_system(self.svn_checkout_path)