Changeset 51015 in webkit

Timestamp:

Nov 16, 2009 12:38:57 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-16 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Document check-style's use of force_clean.

• Scripts/bugzilla-tool:
• Scripts/modules/scm.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/scm.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-16  Eric Seidel  <eric@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@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -153 +153 @@
             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):
@@ -281 +283 @@
         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

trunk/WebKitTools/Scripts/modules/scm.py

@@ -147 +147 @@
         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.")