Changeset 47540 in webkit

Timestamp:

Aug 19, 2009 6:58:19 PM (15 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

commit-queue/bugzilla-tool can get wedged if git is mid-rebase
​https://bugs.webkit.org/show_bug.cgi?id=28436

Make clean_working_directory cancel rebases too (even though that's a bit of a hack).
This code will only ever be run when --force-clean is passed.

I also added a new unit test to make sure this code actually works. :)

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-19  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue/bugzilla-tool can get wedged if git is mid-rebase
+        https://bugs.webkit.org/show_bug.cgi?id=28436
+
+        Make clean_working_directory cancel rebases too (even though that's a bit of a hack).
+        This code will only ever be run when --force-clean is passed.
+
+        I also added a new unit test to make sure this code actually works. :)
+
+        * Scripts/modules/scm.py:
+        * Scripts/modules/scm_unittest.py:
+
 2009-08-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/modules/scm.py

@@ -287 +287 @@
     def __init__(self, cwd, dryrun=False):
         SCM.__init__(self, cwd, dryrun)
-    
+
     @classmethod
     def in_working_directory(cls, path):
@@ -311 +311 @@
         return self.run_command(['git', 'log', '--pretty=oneline', 'HEAD...trunk']).splitlines()
 
+    def rebase_in_progress(self):
+        return os.path.exists(os.path.join(self.checkout_root, '.git/rebase-apply'))
+
     def working_directory_is_clean(self):
         return self.run_command(['git', 'diff-index', 'HEAD']) == ""
-    
+
     def clean_working_directory(self):
         # Could run git clean here too, but that wouldn't match working_directory_is_clean
         self.run_command(['git', 'reset', '--hard', 'HEAD'])
-    
+        # Aborting rebase even though this does not match working_directory_is_clean
+        if self.rebase_in_progress():
+            self.run_command(['git', 'rebase', '--abort'])
+
     def update_webkit(self):
-        # FIXME: Should probably call update-webkit, no?
+        # FIXME: Call update-webkit once https://bugs.webkit.org/show_bug.cgi?id=27162 is fixed.
         log("Updating working directory")
         self.run_command(['git', 'svn', 'rebase'])

trunk/WebKitTools/Scripts/modules/scm_unittest.py

@@ -37 +37 @@
 # Perhaps through some SCMTest base-class which both SVNTest and GitTest inherit from.
 
-def run(args):
-    SCM.run_command(args)
+def run(args, cwd=None):
+    SCM.run_command(args, cwd=cwd)
+
+def run_silent(args, cwd=None):
+    process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd)
+    process.communicate() # ignore output
+    exit_code = process.wait()
+    if exit_code:
+        raise ScriptError('Failed to run "%s"  exit_code: %d  cwd: %s' % (args, exit_code, cwd))
+
+def write_into_file_at_path(file_path, contents):
+    file = open(file_path, 'w')
+    file.write(contents)
+    file.close()
 
 # Exists to share svn repository creation code between the git and svn tests
@@ -102 +114 @@
     def _setup_git_clone_of_svn_repository(self):
         self.git_checkout_path = tempfile.mkdtemp(suffix="git_test_checkout")
-        # --quiet doesn't make git svn silent, so we redirect output
-        args = ['git', 'svn', '--quiet', 'clone', self.svn_repo_url, self.git_checkout_path]
-        git_svn_clone = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        git_svn_clone.communicate() # ignore output
-        git_svn_clone.wait()
+        # --quiet doesn't make git svn silent, so we use run_silent to redirect output
+        run_silent(['git', 'svn', '--quiet', 'clone', self.svn_repo_url, self.git_checkout_path])
 
     def _tear_down_git_clone_of_svn_repository(self):
@@ -125 +134 @@
         self.assertEqual(scm.supports_local_commits(), True)
 
+    def test_rebase_in_progress(self):
+        svn_test_file = os.path.join(self.svn_checkout_path, 'test_file')
+        write_into_file_at_path(svn_test_file, "svn_checkout")
+        run(['svn', 'commit', '--message', 'commit to conflict with git commit'], cwd=self.svn_checkout_path)
+
+        git_test_file = os.path.join(self.git_checkout_path, 'test_file')
+        write_into_file_at_path(git_test_file, "git_checkout")
+        run(['git', 'commit', '-a', '-m', 'commit to be thrown away by rebase abort'])
+
+        # --quiet doesn't make git svn silent, so use run_silent to redirect output
+        self.assertRaises(ScriptError, run_silent, ['git', 'svn', '--quiet', 'rebase']) # Will fail due to a conflict leaving us mid-rebase.
+
+        scm = detect_scm_system(self.git_checkout_path)
+        self.assertTrue(scm.rebase_in_progress())
+
+        # Make sure our cleanup works.
+        scm.clean_working_directory()
+        self.assertFalse(scm.rebase_in_progress())
+
+        # Make sure cleanup doesn't throw when no rebase is in progress.
+        scm.clean_working_directory()
+
     def test_commitish_parsing(self):
         scm = detect_scm_system(self.git_checkout_path)
-
+    
         # Multiple revisions are cherry-picked.
         self.assertEqual(len(scm.commit_ids_from_commitish_arguments(['HEAD~2'])), 1)
         self.assertEqual(len(scm.commit_ids_from_commitish_arguments(['HEAD', 'HEAD~2'])), 2)
-
+    
         # ... is an invalid range specifier
         self.assertRaises(ScriptError, scm.commit_ids_from_commitish_arguments, ['trunk...HEAD'])