Changeset 48027 in webkit

Timestamp:

Sep 3, 2009 12:07:21 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/28880> svn-apply --force doesn't actually work

Reviewed by Eric Seidel.

This fixes "svn-apply --force" and adds unit tests for the
scm.apply_patch() method which uses this script.

• Scripts/svn-apply: Created $globalExitCode variable that defaults to 0. Exit with a value of $globalExitCode when the script is finished. (applyPatch): Ignore a non-zero $exitCode if $force is true, but set $globalExitCode to $exitCode so that svn-apply exits with a non-zero status if any patches did not apply cleanly. Also print out the actual patch command if $force was not true.

• Scripts/modules/scm.py: (scripts_directory): Added. Extracted from script_path(). (script_path): Extracted scripts_directory().
• Scripts/modules/scm_unittest.py: Import urllib. (SVNTestRepository.setup): Save the original working directory in test_object since this represents the WebKit repository from where the unit tests are run. (SCMTest): Created new super class to hold utility methods. (SCMTest._create_patch): Creates a patch file on disk and a dictionary for use with scm.svn_apply(). (SCMTest._setup_webkittools_scripts_symlink): Sets up a symlink back to WebKitTools/Scripts in the test repository so that scm.apply_patch() is able to find the svn-apply script. (SVNTest): Inherit from SCMTest instead of unittest.TestCase. (SVNTest.tearDown): Make sure to change directories back to the original_path before the next test. (SVNTest.test_apply_svn_patch): New test case for applying an svn patch with scm.apply_patch(). (SVNTest.test_apply_svn_patch_force): New test case for applying an svn patch with scm.apply_patch() that conflicts. (GitTest): Inherit from SCMTest instead of unittest.TestCase. (GitTest.tearDown): Make sure to change directories back to the original_path before the next test. (GitTest.test_apply_git_patch): New test case for applying a git patch with scm.apply_patch(). (GitTest.test_apply_git_patch_force): New test case for applying a git patch with scm.apply_patch() that conflicts.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/scm.py (modified) (1 diff)
• Scripts/modules/scm_unittest.py (modified) (8 diffs)
• Scripts/svn-apply (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-02  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/28880> svn-apply --force doesn't actually work
+
+        Reviewed by Eric Seidel.
+
+        This fixes "svn-apply --force" and adds unit tests for the
+        scm.apply_patch() method which uses this script.
+
+        * Scripts/svn-apply: Created $globalExitCode variable that
+        defaults to 0.  Exit with a value of $globalExitCode when the
+        script is finished.
+        (applyPatch): Ignore a non-zero $exitCode if $force is true, but
+        set $globalExitCode to $exitCode so that svn-apply exits with a
+        non-zero status if any patches did not apply cleanly.  Also
+        print out the actual patch command if $force was not true.
+
+        * Scripts/modules/scm.py:
+        (scripts_directory): Added.  Extracted from script_path().
+        (script_path): Extracted scripts_directory().
+        * Scripts/modules/scm_unittest.py: Import urllib.
+        (SVNTestRepository.setup): Save the original working directory
+        in test_object since this represents the WebKit repository from
+        where the unit tests are run.
+        (SCMTest): Created new super class to hold utility methods.
+        (SCMTest._create_patch): Creates a patch file on disk and a
+        dictionary for use with scm.svn_apply().
+        (SCMTest._setup_webkittools_scripts_symlink): Sets up a symlink
+        back to WebKitTools/Scripts in the test repository so that
+        scm.apply_patch() is able to find the svn-apply script.
+        (SVNTest): Inherit from SCMTest instead of unittest.TestCase.
+        (SVNTest.tearDown): Make sure to change directories back to the
+        original_path before the next test.
+        (SVNTest.test_apply_svn_patch): New test case for applying an
+        svn patch with scm.apply_patch().
+        (SVNTest.test_apply_svn_patch_force): New test case for applying
+        an svn patch with scm.apply_patch() that conflicts.
+        (GitTest): Inherit from SCMTest instead of unittest.TestCase.
+        (GitTest.tearDown): Make sure to change directories back to the
+        original_path before the next test.
+        (GitTest.test_apply_git_patch): New test case for applying a git
+        patch with scm.apply_patch().
+        (GitTest.test_apply_git_patch_force): New test case for applying
+        a git patch with scm.apply_patch() that conflicts.
+
 2009-09-02  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebKitTools/Scripts/modules/scm.py

@@ -100 +100 @@
         return output
 
+    def scripts_directory(self):
+        return os.path.join(self.checkout_root, "WebKitTools", "Scripts")
+
     def script_path(self, script_name):
-        return os.path.join(self.checkout_root, "WebKitTools", "Scripts", script_name)
+        return os.path.join(self.scripts_directory(), script_name)
 
     def ensure_clean_working_directory(self, force):

trunk/WebKitTools/Scripts/modules/scm_unittest.py

@@ -1 +1 @@
 # Copyright (C) 2009 Google Inc. All rights reserved.
+# Copyright (C) 2009 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32 +33 @@
 import tempfile
 import unittest
+import urllib
 from modules.scm import detect_scm_system, SCM, ScriptError
 
@@ -83 +85 @@
     @classmethod
     def setup(cls, test_object):
+        test_object.original_path = os.path.abspath('.')
+
         # Create an test SVN repository
         test_object.svn_repo_path = tempfile.mkdtemp(suffix="svn_test_repo")
@@ -102 +106 @@
 
 
-class SVNTest(unittest.TestCase):
+class SCMTest(unittest.TestCase):
+    def _create_patch(self, patch_contents):
+        patch_path = os.path.join(self.svn_checkout_path, 'patch.diff')
+        write_into_file_at_path(patch_path, patch_contents)
+        patch = {}
+        patch['reviewer'] = 'Joe Cool'
+        patch['bug_id'] = '12345'
+        patch['url'] = 'file://%s' % urllib.pathname2url(patch_path)
+        return patch
+
+    def _setup_webkittools_scripts_symlink(self, local_scm):
+        webkit_scm = detect_scm_system(self.original_path)
+        webkit_scripts_directory = webkit_scm.scripts_directory()
+        local_scripts_directory = local_scm.scripts_directory()
+        os.mkdir(os.path.dirname(local_scripts_directory))
+        os.symlink(webkit_scripts_directory, local_scripts_directory)
+
+
+class SVNTest(SCMTest):
 
     def setUp(self):
@@ -110 +132 @@
     def tearDown(self):
         SVNTestRepository.tear_down(self)
+        os.chdir(self.original_path)
 
     def test_create_patch_is_full_patch(self):
@@ -138 +161 @@
         self.assertEqual(scm.supports_local_commits(), False)
 
-class GitTest(unittest.TestCase):
+    def test_apply_svn_patch(self):
+        scm = detect_scm_system(self.svn_checkout_path)
+        patch = self._create_patch(run(['svn', 'diff', '-r4:3']))
+        self._setup_webkittools_scripts_symlink(scm)
+        scm.apply_patch(patch)
+
+    def test_apply_svn_patch_force(self):
+        scm = detect_scm_system(self.svn_checkout_path)
+        patch = self._create_patch(run(['svn', 'diff', '-r2:4']))
+        self._setup_webkittools_scripts_symlink(scm)
+        self.assertRaises(ScriptError, scm.apply_patch, patch, force=True)
+
+class GitTest(SCMTest):
 
     def _setup_git_clone_of_svn_repository(self):
@@ -156 +191 @@
         SVNTestRepository.tear_down(self)
         self._tear_down_git_clone_of_svn_repository()
+        os.chdir(self.original_path)
 
     def test_detection(self):
@@ -205 +241 @@
         self.assertEqual(actual_commits, expected_commits)
 
+    def test_apply_git_patch(self):
+        scm = detect_scm_system(self.git_checkout_path)
+        patch = self._create_patch(run(['git', 'diff', 'HEAD..HEAD^']))
+        self._setup_webkittools_scripts_symlink(scm)
+        scm.apply_patch(patch)
+
+    def test_apply_git_patch_force(self):
+        scm = detect_scm_system(self.git_checkout_path)
+        patch = self._create_patch(run(['git', 'diff', 'HEAD~2..HEAD']))
+        self._setup_webkittools_scripts_symlink(scm)
+        self.assertRaises(ScriptError, scm.apply_patch, patch, force=True)
+
 
 if __name__ == '__main__':

trunk/WebKitTools/Scripts/svn-apply

@@ -122 +122 @@
 );
 
+my $globalExitCode = 0;
+
 my $pathScriptWasRunFrom = Cwd::getcwd();
 my $pathForRepositoryRoot = determineVCSRoot();
@@ -196 +198 @@
 removeDirectoriesIfNeeded();
 
-exit 0;
+exit $globalExitCode;
 
 sub addDirectoriesIfNeeded($)
@@ -240 +242 @@
 
     my $exitCode = $? >> 8;
-    if ($exitCode != 0) {
-        print "patch -p0 \"$fullPath\" returned $exitCode.  Pass --force to ignore patch failures.\n";
-        exit($exitCode);
+    if ($exitCode) {
+        if (!$force) {
+            print "$command \"$fullPath\" returned $exitCode.  Pass --force to ignore patch failures.\n";
+            exit $exitCode;
+        }
+        $globalExitCode = $exitCode;
     }
 }