Changeset 70502 in webkit

Timestamp:

Oct 25, 2010 4:25:51 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-10-25 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

webkit-patch should clean up svn locks when passed --force-clean
​https://bugs.webkit.org/show_bug.cgi?id=48269

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-25  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch should clean up svn locks when passed --force-clean
+        https://bugs.webkit.org/show_bug.cgi?id=48269
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2010-10-25  Anders Carlsson  <andersca@apple.com>
 

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

@@ -380 +380 @@
 
     def clean_working_directory(self):
+        # Make sure there are no locks lying around from a previously aborted svn invocation.
+        # This is slightly dangerous, as it's possible the user is running another svn process
+        # on this checkout at the same time.  However, it's much more likely that we're running
+        # under windows and svn just sucks (or the user interrupted svn and it failed to clean up).
+        self.run(["svn", "cleanup"], cwd=self.checkout_root)
+
         # svn revert -R is not as awesome as git reset --hard.
         # It will leave added files around, causing later svn update
@@ -433 +439 @@
     def revisions_changing_file(self, path, limit=5):
         revisions = []
+        # svn log will exit(1) (and thus self.run will raise) if the path does not exist.
         log_command = ['svn', 'log', '--quiet', '--limit=%s' % limit, path]
         for line in self.run(log_command, cwd=self.checkout_root).splitlines():

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

@@ -761 +761 @@
         self.assertFalse(os.path.exists(self.bogus_dir))
 
+    def test_svn_lock(self):
+        svn_root_lock_path = ".svn/lock"
+        write_into_file_at_path(svn_root_lock_path, "", "utf-8")
+        # webkit-patch uses a Checkout object and runs update-webkit, just use svn update here.
+        self.assertRaises(ScriptError, run_command, ['svn', 'update'])
+        self.scm.clean_working_directory()
+        self.assertFalse(os.path.exists(svn_root_lock_path))
+        run_command(['svn', 'update'])  # Should succeed and not raise.
+
 
 class GitTest(SCMTest):