[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:43:19 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b802f4e928fd63b50f7874bc3062384b83f627de
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 16 12:11:54 2009 +0000
2009-11-16 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Move more patch-landing code into WebKitLandingScripts in preparation for land-attachment
https://bugs.webkit.org/show_bug.cgi?id=31543
Just moving code and updating the one caller to use WebKitLandingScripts instead of 'self'.
* Scripts/bugzilla-tool:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51029 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 63242df..c95442e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
Reviewed by Adam Barth.
+ Move more patch-landing code into WebKitLandingScripts in preparation for land-attachment
+ https://bugs.webkit.org/show_bug.cgi?id=31543
+
+ Just moving code and updating the one caller to use WebKitLandingScripts instead of 'self'.
+
+ * Scripts/bugzilla-tool:
+
+2009-11-16 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
Disable the style queue from posting to the commit queue status page.
* Scripts/bugzilla-tool:
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 767dec6..00c73b0 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -314,6 +314,46 @@ class WebKitLandingScripts:
commit_log = scm.commit_with_message(commit_message.message())
return bug_comment_from_commit_text(scm, commit_log)
+ @classmethod
+ def _close_bug_if_no_active_patches(cls, bugs, bug_id):
+ # Check to make sure there are no r? or r+ patches on the bug before closing.
+ # Assume that r- patches are just previous patches someone forgot to obsolete.
+ patches = bugs.fetch_patches_from_bug(bug_id)
+ for patch in patches:
+ review_flag = patch.get('review')
+ if review_flag == '?' or review_flag == '+':
+ log("Not closing bug %s as attachment %s has review=%s. Assuming there are more patches to land from this bug." % (patch['bug_id'], patch['id'], review_flag))
+ return
+ bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed. Closing bug.")
+
+ @classmethod
+ def _land_patch(cls, patch, options, tool):
+ tool.scm().update_webkit() # Update before every patch in case the tree has changed
+ log("Applying %s from bug %s." % (patch['id'], patch['bug_id']))
+ tool.scm().apply_patch(patch, force=options.commit_queue)
+
+ # Make sure the tree is still green after updating, before building this patch.
+ # The first patch ends up checking tree status twice, but that's OK.
+ WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
+ comment_text = WebKitLandingScripts.build_and_commit(tool.scm(), options)
+ tool.bugs.clear_attachment_flags(patch['id'], comment_text)
+
+ @classmethod
+ def land_patches(cls, patches, options, tool):
+ try:
+ for patch in patches:
+ cls._land_patch(patch, options, tool)
+ if options.close_bug and patches:
+ cls._close_bug_if_no_active_patches(tool.bugs, patches[0]['bug_id'])
+ except CheckoutNeedsUpdate, e:
+ log("Commit failed because the checkout is out of date. Please update and try again.")
+ log("You can pass --no-build to skip building/testing after update if you believe the new commits did not affect the results.")
+ WorkQueue.exit_after_handled_error(e)
+ except ScriptError, e:
+ # Mark the patch as commit-queue- and comment in the bug.
+ tool.bugs.reject_patch_from_commit_queue(patch['id'], e.message_with_output())
+ WorkQueue.exit_after_handled_error(e)
+
class LandAndUpdateBug(Command):
def __init__(self):
@@ -375,46 +415,6 @@ class LandPatchesFromBugs(Command):
options += WebKitLandingScripts.land_options()
Command.__init__(self, 'Lands all patches on a bug optionally testing them first', 'BUGID', options=options)
- @classmethod
- def _close_bug_if_no_active_patches(cls, bugs, bug_id):
- # Check to make sure there are no r? or r+ patches on the bug before closing.
- # Assume that r- patches are just previous patches someone forgot to obsolete.
- patches = bugs.fetch_patches_from_bug(bug_id)
- for patch in patches:
- review_flag = patch.get('review')
- if review_flag == '?' or review_flag == '+':
- log("Not closing bug %s as attachment %s has review=%s. Assuming there are more patches to land from this bug." % (patch['bug_id'], patch['id'], review_flag))
- return
- bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed. Closing bug.")
-
- @classmethod
- def _land_patch(cls, patch, options, tool):
- tool.scm().update_webkit() # Update before every patch in case the tree has changed
- log("Applying %s from bug %s." % (patch['id'], patch['bug_id']))
- tool.scm().apply_patch(patch, force=options.commit_queue)
-
- # Make sure the tree is still green after updating, before building this patch.
- # The first patch ends up checking tree status twice, but that's OK.
- WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
- comment_text = WebKitLandingScripts.build_and_commit(tool.scm(), options)
- tool.bugs.clear_attachment_flags(patch['id'], comment_text)
-
- @classmethod
- def land_patches(cls, patches, options, tool):
- try:
- for patch in patches:
- cls._land_patch(patch, options, tool)
- if options.close_bug and patches:
- cls._close_bug_if_no_active_patches(tool.bugs, patches[0]['bug_id'])
- except CheckoutNeedsUpdate, e:
- log("Commit failed because the checkout is out of date. Please update and try again.")
- log("You can pass --no-build to skip building/testing after update if you believe the new commits did not affect the results.")
- WorkQueue.exit_after_handled_error(e)
- except ScriptError, e:
- # Mark the patch as commit-queue- and comment in the bug.
- tool.bugs.reject_patch_from_commit_queue(patch['id'], e.message_with_output())
- WorkQueue.exit_after_handled_error(e)
-
@staticmethod
def _fetch_list_of_patches_to_land(options, args, tool):
bugs_to_patches = {}
@@ -446,7 +446,7 @@ class LandPatchesFromBugs(Command):
WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)
for bug_id in bugs_to_patches.keys():
- self.land_patches(bugs_to_patches[bug_id], options, tool)
+ WebKitLandingScripts.land_patches(bugs_to_patches[bug_id], options, tool)
class CommitMessageForCurrentDiff(Command):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list