[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f5e9073443864dd0526544c68691d298deb9747
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 08:38:57 2009 +0000

    2009-11-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Document check-style's use of force_clean.
    
            * Scripts/bugzilla-tool:
            * Scripts/modules/scm.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8cf707f..a8cec7a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Document check-style's use of force_clean.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/scm.py:
+
 2009-11-16  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 192ca3e..26ab762 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -152,7 +152,9 @@ class CheckStyleOnBug(Command):
             log("Patch failed to apply and check style")
             log(e.output)
 
-        tool.scm().ensure_clean_working_directory(True)
+        # This is safe because in order to get here the working directory had to be
+        # clean at the beginning.  Clean it out again before we exit.
+        tool.scm().ensure_clean_working_directory(force_clean=True)
 
     def execute(self, options, args, tool):
         bug_id = args[0]
@@ -280,7 +282,7 @@ class WebKitLandingScripts:
         os.chdir(scm.checkout_root)
         scm.ensure_no_local_commits(options.force_clean)
         if options.clean:
-            scm.ensure_clean_working_directory(options.force_clean)
+            scm.ensure_clean_working_directory(force_clean=options.force_clean)
 
     @classmethod
     def build_and_commit(cls, scm, options):
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index 629e010..40ace42 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -146,8 +146,8 @@ class SCM:
     def script_path(self, script_name):
         return os.path.join(self.scripts_directory(), script_name)
 
-    def ensure_clean_working_directory(self, force):
-        if not force and not self.working_directory_is_clean():
+    def ensure_clean_working_directory(self, force_clean):
+        if not force_clean and not self.working_directory_is_clean():
             print self.run_command(self.status_command(), error_handler=ignore_error)
             raise ScriptError(message="Working directory has modifications, pass --force-clean or --no-clean to continue.")
         

-- 
WebKit Debian packaging