Changeset 51259 in webkit

Timestamp:

Nov 20, 2009 2:51:56 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-20 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Move prepare_clean_working_directory into the LandingSequence
​https://bugs.webkit.org/show_bug.cgi?id=31743

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-20  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move prepare_clean_working_directory into the LandingSequence
+        https://bugs.webkit.org/show_bug.cgi?id=31743
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/landingsequence.py:
+
 2009-11-20  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -191 +191 @@
         ConditionalLandingSequence.__init__(self, patch, options, tool)
 
-    def update(self):
-        pass
-
-    def apply_patch(self):
-        pass
-
-    def close_patch(self, commit_log):
-        self._comment_test = bug_comment_from_commit_text(self._tool.scm(), commit_log)
-        # There is no patch to close.
-
-    def close_bug(self):
+    def run(self):
+        self.build()
+        self.test()
+        commit_log = self.commit()
+        self.close_bug(commit_log)
+
+    def close_bug(self, commit_log):
+        comment_test = bug_comment_from_commit_text(self._tool.scm(), commit_log)
         bug_id = self._patch["bug_id"]
         if bug_id:
             log("Updating bug %s" % bug_id)
             if self._options.close_bug:
-                self._tool.bugs.close_bug_as_fixed(bug_id, self._comment_test)
+                self._tool.bugs.close_bug_as_fixed(bug_id, comment_test)
             else:
                 # FIXME: We should a smart way to figure out if the patch is attached
                 # to the bug, and if so obsolete it.
-                self._tool.bugs.post_comment_to_bug(bug_id, self._comment_test)
+                self._tool.bugs.post_comment_to_bug(bug_id, comment_test)
         else:
-            log(self._comment_test)
+            log(comment_test)
             log("No bug id provided.")
 
@@ -305 +302 @@
 
     def run(self):
+        self.clean()
         self.update()
         self.apply_patch()
@@ -323 +321 @@
         # Check the tree status first so we can fail early.
         WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
-        WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)
 
     def _process_patch(self, patch, options, args, tool):
@@ -340 +337 @@
         # Check the tree status first so we can fail early.
         WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
-        WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)
 
     def _process_patch(self, patch, options, args, tool):
         sequence = ConditionalLandingSequence(patch, options, tool)
         sequence.run_and_handle_errors()
+
 
 class LandAttachment(AbstractPatchLandingCommand):

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -44 +44 @@
 
     def run(self):
+        self.clean()
         self.update()
         self.apply_patch()
@@ -66 +67 @@
                 self._tool.bugs.reject_patch_from_commit_queue(self._patch["id"], e.message_with_output())
             WorkQueue.exit_after_handled_error(e)
+
+    def clean(self):
+        WebKitLandingScripts.prepare_clean_working_directory(self._tool.scm(), self._options)
 
     def update(self):