Changeset 51176 in webkit

Timestamp:

Nov 18, 2009 10:18:59 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Eric Seidel.

Normalize ' and " in bugzilla-tool
​https://bugs.webkit.org/show_bug.cgi?id=31655

We decided " is better than ' and we should be consistent.

• Scripts/bugzilla-tool:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (48 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Normalize ' and " in bugzilla-tool
+        https://bugs.webkit.org/show_bug.cgi?id=31655
+
+        We decided " is better than ' and we should be consistent.
+
+        * Scripts/bugzilla-tool:
+
 2009-11-18  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -54 +54 @@
 def plural(noun):
     # This is a dumb plural() implementation which was just enough for our uses.
-    if re.search('h$', noun):
-        return noun + 'es'
+    if re.search("h$", noun):
+        return noun + "es"
     else:
-        return noun + 's'
+        return noun + "s"
 
 def pluralize(noun, count):
@@ -80 +80 @@
 
     # FIXME: We should sort and label the ChangeLog messages like commit-log-editor does.
-    return CommitMessage(''.join(changelog_messages).splitlines())
+    return CommitMessage("".join(changelog_messages).splitlines())
 
 
@@ -108 +108 @@
 class BugsInCommitQueue(Command):
     def __init__(self):
-        Command.__init__(self, 'Bugs in the commit queue')
+        Command.__init__(self, "Bugs in the commit queue")
 
     def execute(self, options, args, tool):
@@ -118 +118 @@
 class PatchesInCommitQueue(Command):
     def __init__(self):
-        Command.__init__(self, 'Patches in the commit queue')
+        Command.__init__(self, "Patches in the commit queue")
 
     def execute(self, options, args, tool):
@@ -124 +124 @@
         log("Patches in commit queue:")
         for patch in patches:
-            print "%s" % patch['url']
+            print "%s" % patch["url"]
 
 
 class ReviewedPatchesOnBug(Command):
     def __init__(self):
-        Command.__init__(self, 'r+\'d patches on a bug', 'BUGID')
+        Command.__init__(self, "r+\'d patches on a bug", "BUGID")
 
     def execute(self, options, args, tool):
@@ -135 +135 @@
         patches_to_land = tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
         for patch in patches_to_land:
-            print "%s" % patch['url']
+            print "%s" % patch["url"]
 
 
@@ -141 +141 @@
     def __init__(self):
         options = WebKitLandingScripts.cleaning_options()
-        Command.__init__(self, 'Runs check-webkit-style on the specified attachment', 'ATTACHMENT_ID', options=options)
+        Command.__init__(self, "Runs check-webkit-style on the specified attachment", "ATTACHMENT_ID", options=options)
 
     @classmethod
     def check_style(cls, patch, options, tool):
         tool.scm().update_webkit()
-        log("Checking style for patch %s from bug %s." % (patch['id'], patch['bug_id']))
+        log("Checking style for patch %s from bug %s." % (patch["id"], patch["bug_id"]))
         try:
             # FIXME: check-webkit-style shouldn't really have to apply the patch to check the style.
@@ -152 +152 @@
             WebKitLandingScripts.run_webkit_script("check-webkit-style")
         except ScriptError, e:
-            log("Patch %s from bug %s failed to apply and check style." % (patch['id'], patch['bug_id']))
+            log("Patch %s from bug %s failed to apply and check style." % (patch["id"], patch["bug_id"]))
             log(e.output)
 
@@ -170 +170 @@
     def __init__(self):
         options = WebKitApplyingScripts.apply_options() + WebKitLandingScripts.cleaning_options()
-        Command.__init__(self, 'Applies an attachment to the local working directory.', 'ATTACHMENT_ID', options=options)
+        Command.__init__(self, "Applies an attachment to the local working directory.", "ATTACHMENT_ID", options=options)
 
     def execute(self, options, args, tool):
@@ -182 +182 @@
     def __init__(self):
         options = WebKitApplyingScripts.apply_options() + WebKitLandingScripts.cleaning_options()
-        Command.__init__(self, 'Applies all patches on a bug to the local working directory.', 'BUGID', options=options)
+        Command.__init__(self, "Applies all patches on a bug to the local working directory.", "BUGID", options=options)
 
     def execute(self, options, args, tool):
@@ -211 +211 @@
 
         for patch in patches:
-            log("Applying attachment %s from bug %s" % (patch['id'], patch['bug_id']))
+            log("Applying attachment %s from bug %s" % (patch["id"], patch["bug_id"]))
             scm.apply_patch(patch)
             if options.local_commit:
                 commit_message = commit_message_for_this_commit(scm)
-                scm.commit_locally_with_message(commit_message.message() or patch['name'])
+                scm.commit_locally_with_message(commit_message.message() or patch["name"])
 
 
@@ -245 +245 @@
         while True:
             output_line = child_process.stdout.readline()
-            if output_line == '' and child_process.poll() != None:
+            if output_line == "" and child_process.poll() != None:
                 return child_process.poll()
             teed_output.write(output_line)
@@ -322 +322 @@
         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))
+            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.")
@@ -331 +331 @@
     def _land_patch(cls, patch, options, tool):
         tool.scm().update_webkit() # Update before every patch in case the tree has changed
-        log("Applying patch %s from bug %s." % (patch['id'], patch['bug_id']))
+        log("Applying patch %s from bug %s." % (patch["id"], patch["bug_id"]))
         tool.scm().apply_patch(patch, force=options.non_interactive)
 
@@ -338 +338 @@
         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)
+        tool.bugs.clear_attachment_flags(patch["id"], comment_text)
 
     @classmethod
@@ -345 +345 @@
             cls._land_patch(patch, options, tool)
             if options.close_bug:
-                cls._close_bug_if_no_active_patches(tool.bugs, patch['bug_id'])
+                cls._close_bug_if_no_active_patches(tool.bugs, patch["bug_id"])
         except CheckoutNeedsUpdate, e:
             log("Commit failed because the checkout is out of date.  Please update and try again.")
@@ -352 +352 @@
         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())
+            tool.bugs.reject_patch_from_commit_queue(patch["id"], e.message_with_output())
             WorkQueue.exit_after_handled_error(e)
 
@@ -362 +362 @@
         ]
         options += WebKitLandingScripts.land_options()
-        Command.__init__(self, 'Lands the current working directory diff and updates the bug if provided.', '[BUGID]', options=options)
+        Command.__init__(self, "Lands the current working directory diff and updates the bug if provided.", "[BUGID]", options=options)
 
     def guess_reviewer_from_bug(self, bugs, bug_id):
@@ -370 +370 @@
             return None
         patch = patches[0]
-        reviewer = patch['reviewer']
-        log('Guessing "%s" as reviewer from attachment %s on bug %s.' % (reviewer, patch['id'], bug_id))
+        reviewer = patch["reviewer"]
+        log("Guessing \"%s\" as reviewer from attachment %s on bug %s." % (reviewer, patch["id"], bug_id))
         return reviewer
 
@@ -423 +423 @@
         bugs_to_patches = {}
         for patch in patches:
-            bug_id = patch['bug_id']
+            bug_id = patch["bug_id"]
             bugs_to_patches[bug_id] = bugs_to_patches.get(bug_id, []).append(patch)
         return bugs_to_patches
@@ -447 +447 @@
 class LandAttachment(AbstractPatchLandingCommand):
     def __init__(self):
-        AbstractPatchLandingCommand.__init__(self, 'Lands a patches from bugzilla, optionally building and testing them first', 'ATTACHMENT_ID [ATTACHMENT_IDS]')
+        AbstractPatchLandingCommand.__init__(self, "Lands a patches from bugzilla, optionally building and testing them first", "ATTACHMENT_ID [ATTACHMENT_IDS]")
 
     @staticmethod
@@ -456 +456 @@
 class LandPatchesFromBugs(AbstractPatchLandingCommand):
     def __init__(self):
-        AbstractPatchLandingCommand.__init__(self, 'Lands all patches on the given bugs, optionally building and testing them first', 'BUGID [BUGIDS]')
+        AbstractPatchLandingCommand.__init__(self, "Lands all patches on the given bugs, optionally building and testing them first", "BUGID [BUGIDS]")
 
     @staticmethod
@@ -470 +470 @@
 class CommitMessageForCurrentDiff(Command):
     def __init__(self):
-        Command.__init__(self, 'Prints a commit message suitable for the uncommitted changes.')
+        Command.__init__(self, "Prints a commit message suitable for the uncommitted changes.")
 
     def execute(self, options, args, tool):
@@ -479 +479 @@
 class ObsoleteAttachmentsOnBug(Command):
     def __init__(self):
-        Command.__init__(self, 'Marks all attachments on a bug as obsolete.', 'BUGID')
+        Command.__init__(self, "Marks all attachments on a bug as obsolete.", "BUGID")
 
     def execute(self, options, args, tool):
@@ -485 +485 @@
         attachments = tool.bugs.fetch_attachments_from_bug(bug_id)
         for attachment in attachments:
-            if not attachment['is_obsolete']:
-                tool.bugs.obsolete_attachment(attachment['id'])
+            if not attachment["is_obsolete"]:
+                tool.bugs.obsolete_attachment(attachment["id"])
 
 
@@ -492 +492 @@
     def __init__(self):
         options = [
-            make_option("-m", "--description", action="store", type="string", dest="description", help="Description string for the attachment (default: 'patch')"),
+            make_option("-m", "--description", action="store", type="string", dest="description", help="Description string for the attachment (default: \"patch\")"),
         ]
         options += self.posting_options()
-        Command.__init__(self, 'Attaches the current working directory diff to a bug as a patch file.', '[BUGID]', options=options)
+        Command.__init__(self, "Attaches the current working directory diff to a bug as a patch file.", "[BUGID]", options=options)
 
     @staticmethod
@@ -509 +509 @@
         patches = bugs.fetch_patches_from_bug(bug_id)
         if len(patches):
-            log("Obsoleting %s on bug %s" % (pluralize('old patch', len(patches)), bug_id))
+            log("Obsoleting %s on bug %s" % (pluralize("old patch", len(patches)), bug_id))
             for patch in patches:
-                bugs.obsolete_attachment(patch['id'])
+                bugs.obsolete_attachment(patch["id"])
 
     def execute(self, options, args, tool):
@@ -537 +537 @@
         ]
         options += PostDiffAsPatchToBug.posting_options()
-        Command.__init__(self, 'Attaches a range of local commits to bugs as patch files.', 'COMMITISH', options=options, requires_local_commits=True)
+        Command.__init__(self, "Attaches a range of local commits to bugs as patch files.", "COMMITISH", options=options, requires_local_commits=True)
 
     def _comment_text_for_commit(self, options, commit_message, tool, commit_id):
@@ -557 +557 @@
         commit_ids = tool.scm().commit_ids_from_commitish_arguments(args)
         if len(commit_ids) > 10: # We could lower this limit, 10 is too many for one bug as-is.
-            error("bugzilla-tool does not support attaching %s at once.  Are you sure you passed the right commit range?" % (pluralize('patch', len(commit_ids))))
+            error("bugzilla-tool does not support attaching %s at once.  Are you sure you passed the right commit range?" % (pluralize("patch", len(commit_ids))))
 
         have_obsoleted_patches = set()
@@ -584 +584 @@
         options += WebKitLandingScripts.cleaning_options()
         options.append(make_option("--complete-rollout", action="store_true", dest="complete_rollout", help="Experimental support for complete unsupervised rollouts, including re-opening the bug.  Not recommended."))
-        Command.__init__(self, 'Reverts the given revision and commits the revert and re-opens the original bug.', 'REVISION [BUGID]', options=options)
+        Command.__init__(self, "Reverts the given revision and commits the revert and re-opens the original bug.", "REVISION [BUGID]", options=options)
 
     @staticmethod
@@ -630 +630 @@
         # Once we trust rollout we will remove this option.
         if not options.complete_rollout:
-            log("\nNOTE: Rollout support is experimental.\nPlease verify the rollout diff and use 'bugzilla-tool land-diff %s' to commit the rollout." % bug_id)
+            log("\nNOTE: Rollout support is experimental.\nPlease verify the rollout diff and use \"bugzilla-tool land-diff %s\" to commit the rollout." % bug_id)
         else:
             comment_text = WebKitLandingScripts.build_and_commit(tool.scm(), options)
@@ -645 +645 @@
             make_option("--request-commit", action="store_true", dest="request_commit", default=False, help="Mark the patch as needing auto-commit after review."),
         ]
-        Command.__init__(self, 'Create a bug from local changes or local commits.', '[COMMITISH]', options=options)
+        Command.__init__(self, "Create a bug from local changes or local commits.", "[COMMITISH]", options=options)
 
     def create_bug_from_commit(self, options, args, tool):
@@ -701 +701 @@
             # place.
             pass
-        comment_text = ''.join(lines)
+        comment_text = "".join(lines)
         return (bug_title, comment_text)
 
@@ -715 +715 @@
 class CheckTreeStatus(Command):
     def __init__(self):
-        Command.__init__(self, 'Print out the status of the webkit builders.')
+        Command.__init__(self, "Print out the status of the webkit builders.")
 
     def execute(self, options, args, tool):
         for builder in tool.buildbot.builder_statuses():
-            status_string = "ok" if builder['is_green'] else 'FAIL'
-            print "%s : %s" % (status_string.ljust(4), builder['name'])
+            status_string = "ok" if builder["is_green"] else "FAIL"
+            print "%s : %s" % (status_string.ljust(4), builder["name"])
 
 
@@ -730 +730 @@
             make_option("--status-host", action="store", type="string", dest="status_host", default=StatusBot.default_host, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
         ]
-        Command.__init__(self, 'Run the %s.' % self._name, options=options)
+        Command.__init__(self, "Run the %s." % self._name, options=options)
 
     def queue_log_path(self):
-        return '%s.log' % self._name
+        return "%s.log" % self._name
 
     def work_logs_directory(self):
-        return '%s-logs' % self._name
+        return "%s-logs" % self._name
 
     def status_host(self):
@@ -744 +744 @@
         log("CAUTION: %s will discard all local changes in %s" % (self._name, self.tool.scm().checkout_root))
         if self.options.confirm:
-            response = raw_input("Are you sure?  Type 'yes' to continue: ")
-            if (response != 'yes'):
+            response = raw_input("Are you sure?  Type \"yes\" to continue: ")
+            if (response != "yes"):
                 error("User declined.")
         log("Running WebKit %s. %s" % (self._name, datetime.now().strftime(WorkQueue.log_date_format)))
@@ -771 +771 @@
 
     def log_progress(self, patch_ids):
-        log("%s in %s [%s]" % (pluralize('patch', len(patch_ids)), self._name, ", ".join(patch_ids)))
+        log("%s in %s [%s]" % (pluralize("patch", len(patch_ids)), self._name, ", ".join(patch_ids)))
 
     def execute(self, options, args, tool):
@@ -795 +795 @@
         red_builders_names = self.tool.buildbot.red_core_builders_names()
         if red_builders_names:
-            red_builders_names = map(lambda name: '"%s"' % name, red_builders_names) # Add quotes around the names.
+            red_builders_names = map(lambda name: "\"%s\"" % name, red_builders_names) # Add quotes around the names.
             return (False, "Builders [%s] are red. See http://build.webkit.org." % ", ".join(red_builders_names), None)
-        return (True, "Landing patch %s from bug %s." % (patch['id'], patch['bug_id']), patch['bug_id'])
+        return (True, "Landing patch %s from bug %s." % (patch["id"], patch["bug_id"]), patch["bug_id"])
 
     def process_work_item(self, patch):
-        self.run_bugzilla_tool(['land-attachment', '--force-clean', '--non-interactive', '--quiet', patch['id']])
+        self.run_bugzilla_tool(["land-attachment", "--force-clean", "--non-interactive", "--quiet", patch["id"]])
 
     def handle_unexpected_error(self, patch, message):
-        self.tool.bugs.reject_patch_from_commit_queue(patch['id'], message)
+        self.tool.bugs.reject_patch_from_commit_queue(patch["id"], message)
 
 
@@ -823 +823 @@
 
     def should_proceed_with_work_item(self, patch):
-        return (True, "Checking style for patch %s on bug %s." % (patch['id'], patch['bug_id']), patch['bug_id'])
+        return (True, "Checking style for patch %s on bug %s." % (patch["id"], patch["bug_id"]), patch["bug_id"])
 
     def process_work_item(self, patch):
-        self.run_bugzilla_tool(['check-style', '--force-clean', patch['id']])
+        self.run_bugzilla_tool(["check-style", "--force-clean", patch["id"]])
 
     def handle_unexpected_error(self, patch, message):
@@ -847 +847 @@
         self.print_usage(sys.stderr)
         error_message = "%s: error: %s\n" % (self.get_prog_name(), msg)
-        error_message += "\nType '" + self.get_prog_name() + " --help' to see usage.\n"
+        error_message += "\nType \"" + self.get_prog_name() + " --help\" to see usage.\n"
         self.exit(2, error_message)
 
@@ -857 +857 @@
         self.buildbot = BuildBot()
         self.commands = [
-            { 'name' : 'bugs-to-commit', 'object' : BugsInCommitQueue() },
-            { 'name' : 'patches-to-commit', 'object' : PatchesInCommitQueue() },
-            { 'name' : 'reviewed-patches', 'object' : ReviewedPatchesOnBug() },
-            { 'name' : 'create-bug', 'object' : CreateBug() },
-            { 'name' : 'apply-attachment', 'object' : ApplyAttachment() },
-            { 'name' : 'apply-patches', 'object' : ApplyPatchesFromBug() },
-            { 'name' : 'land-diff', 'object' : LandAndUpdateBug() },
-            { 'name' : 'land-attachment', 'object' : LandAttachment() },
-            { 'name' : 'land-patches', 'object' : LandPatchesFromBugs() },
-            { 'name' : 'check-style', 'object' : CheckStyle() },
-            { 'name' : 'commit-message', 'object' : CommitMessageForCurrentDiff() },
-            { 'name' : 'obsolete-attachments', 'object' : ObsoleteAttachmentsOnBug() },
-            { 'name' : 'post-diff', 'object' : PostDiffAsPatchToBug() },
-            { 'name' : 'post-commits', 'object' : PostCommitsAsPatchesToBug() },
-            { 'name' : 'tree-status', 'object' : CheckTreeStatus() },
-            { 'name' : 'commit-queue', 'object' : CommitQueue() },
-            { 'name' : 'style-queue', 'object' : StyleQueue() },
-            { 'name' : 'rollout', 'object' : RolloutCommit() },
+            { "name" : "bugs-to-commit", "object" : BugsInCommitQueue() },
+            { "name" : "patches-to-commit", "object" : PatchesInCommitQueue() },
+            { "name" : "reviewed-patches", "object" : ReviewedPatchesOnBug() },
+            { "name" : "create-bug", "object" : CreateBug() },
+            { "name" : "apply-attachment", "object" : ApplyAttachment() },
+            { "name" : "apply-patches", "object" : ApplyPatchesFromBug() },
+            { "name" : "land-diff", "object" : LandAndUpdateBug() },
+            { "name" : "land-attachment", "object" : LandAttachment() },
+            { "name" : "land-patches", "object" : LandPatchesFromBugs() },
+            { "name" : "check-style", "object" : CheckStyle() },
+            { "name" : "commit-message", "object" : CommitMessageForCurrentDiff() },
+            { "name" : "obsolete-attachments", "object" : ObsoleteAttachmentsOnBug() },
+            { "name" : "post-diff", "object" : PostDiffAsPatchToBug() },
+            { "name" : "post-commits", "object" : PostCommitsAsPatchesToBug() },
+            { "name" : "tree-status", "object" : CheckTreeStatus() },
+            { "name" : "commit-queue", "object" : CommitQueue() },
+            { "name" : "style-queue", "object" : StyleQueue() },
+            { "name" : "rollout", "object" : RolloutCommit() },
         ]
 
@@ -882 +882 @@
     def scm(self):
         # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
-        original_cwd = os.path.abspath('.')
+        original_cwd = os.path.abspath(".")
         if not self.cached_scm:
             self.cached_scm = detect_scm_system(original_cwd)
@@ -907 +907 @@
         scm_supports_local_commits = self.scm().supports_local_commits()
         for command in self.commands:
-            command_object = command['object']
+            command_object = command["object"]
             if command_object.requires_local_commits and not scm_supports_local_commits:
                 continue
-            command_name_and_args = command_object.name_with_arguments(command['name'])
-            command_rows.append({ 'name-and-args': command_name_and_args, 'object': command_object })
+            command_name_and_args = command_object.name_with_arguments(command["name"])
+            command_rows.append({ "name-and-args": command_name_and_args, "object": command_object })
             longest_name_length = max([longest_name_length, len(command_name_and_args)])
         
@@ -920 +920 @@
         
         for row in command_rows:
-            command_object = row['object']
-            commands_text += "  " + row['name-and-args'].ljust(longest_name_length + 3) + command_object.help_text + "\n"
+            command_object = row["object"]
+            commands_text += "  " + row["name-and-args"].ljust(longest_name_length + 3) + command_object.help_text + "\n"
             commands_text += command_object.option_parser.format_option_help(formatter)
         return commands_text
@@ -928 +928 @@
         (options, args) = self.global_option_parser.parse_args(args)
         if len(args):
-            # We'll never hit this because split_args splits at the first arg without a leading '-'
+            # We'll never hit this because split_args splits at the first arg without a leading "-"
             self.global_option_parser.error("Extra arguments before command: " + args)
         
@@ -937 +937 @@
     @staticmethod
     def split_args(args):
-        # Assume the first argument which doesn't start with '-' is the command name.
+        # Assume the first argument which doesn't start with "-" is the command name.
         command_index = 0
         for arg in args:
-            if arg[0] != '-':
+            if arg[0] != "-":
                 break
             command_index += 1
@@ -953 +953 @@
     def command_by_name(self, command_name):
         for command in self.commands:
-            if command_name == command['name']:
+            if command_name == command["name"]:
                 return command
         return None
@@ -970 +970 @@
             self.global_option_parser.error(command_name + " is not a recognized command")
 
-        command_object = command['object']
+        command_object = command["object"]
 
         if command_object.requires_local_commits and not self.scm().supports_local_commits():