[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
abarth at webkit.org
abarth at webkit.org
Thu Dec 3 13:41:40 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit f526ebf7af218c38101080da8308df58031fef04
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 20 22:51:56 2009 +0000
2009-11-20 Adam Barth <abarth at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51259 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bd569da..ef2c0b4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-20 Adam Barth <abarth at 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 at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 030f65b..a27b07c 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -190,28 +190,25 @@ class LandDiffSequence(ConditionalLandingSequence):
def __init__(self, patch, options, tool):
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 run(self):
+ self.build()
+ self.test()
+ commit_log = self.commit()
+ self.close_bug(commit_log)
- def close_bug(self):
+ 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.")
@@ -304,6 +301,7 @@ class BuildAttachmentSequence(LandingSequence):
LandingSequence.__init__(self, patch, options, tool)
def run(self):
+ self.clean()
self.update()
self.apply_patch()
self.build()
@@ -322,7 +320,6 @@ class BuildAttachment(AbstractPatchProcessingCommand):
def _prepare_to_process(self, options, args, tool):
# 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 = BuildAttachmentSequence(patch, options, tool)
@@ -339,12 +336,12 @@ class AbstractPatchLandingCommand(AbstractPatchProcessingCommand):
def _prepare_to_process(self, options, args, tool):
# 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):
name = "land-attachment"
def __init__(self):
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index 55f6d96..4dabcbc 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -43,6 +43,7 @@ class LandingSequence:
self._port = WebKitPort.port(self._options)
def run(self):
+ self.clean()
self.update()
self.apply_patch()
self.build()
@@ -66,6 +67,9 @@ class LandingSequence:
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):
self._tool.scm().update_webkit()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list