Changeset 51036 in webkit


Ignore:
Timestamp:
Nov 16, 2009 5:47:43 AM (14 years ago)
Author:
eric@webkit.org
Message:

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

Reviewed by Adam Barth.

Rename the --commit-queue flag on land-* now that the commit-queue needs no special treatment
https://bugs.webkit.org/show_bug.cgi?id=31549

Renamed --commit-queue to --non-interactive in most places
and remove the code in land-patches which is no longer needed.

  • Scripts/bugzilla-tool:
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r51034 r51036  
     12009-11-16  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename the --commit-queue flag on land-* now that the commit-queue needs no special treatment
     6        https://bugs.webkit.org/show_bug.cgi?id=31549
     7
     8        Renamed --commit-queue to --non-interactive in most places
     9        and remove the code in land-patches which is no longer needed.
     10
     11        * Scripts/bugzilla-tool:
     12
    1132009-11-16  Eric Seidel  <eric@webkit.org>
    214
  • trunk/WebKitTools/Scripts/bugzilla-tool

    r51034 r51036  
    234234            make_option("--no-test", action="store_false", dest="test", default=True, help="Commit without running run-webkit-tests."),
    235235            make_option("--quiet", action="store_true", dest="quiet", default=False, help="Produce less console output."),
    236             make_option("--commit-queue", action="store_true", dest="commit_queue", default=False, help="Run in commit queue mode (no user interaction)."),
     236            make_option("--non-interactive", action="store_true", dest="non_interactive", default=False, help="Never prompt the user, fail as fast as possible."),
    237237        ]
    238238
     
    311311            if options.test:
    312312                # When running the commit-queue we don't want to launch Safari and we want to exit after the first failure.
    313                 cls.run_webkit_tests(launch_safari=not options.commit_queue, fail_fast=options.commit_queue, quiet=options.quiet)
     313                cls.run_webkit_tests(launch_safari=not options.non_interactive, fail_fast=options.non_interactive, quiet=options.quiet)
    314314        commit_message = commit_message_for_this_commit(scm)
    315315        commit_log = scm.commit_with_message(commit_message.message())
     
    332332        tool.scm().update_webkit() # Update before every patch in case the tree has changed
    333333        log("Applying %s from bug %s." % (patch['id'], patch['bug_id']))
    334         tool.scm().apply_patch(patch, force=options.commit_queue)
     334        tool.scm().apply_patch(patch, force=options.non_interactive)
    335335
    336336        # Make sure the tree is still green after updating, before building this patch.
     
    462462        all_patches = []
    463463        for bug_id in args:
    464             # FIXME: This is strange that --commit-queue gets special behavior here.
    465             if options.commit_queue:
    466                 patches = tool.bugs.fetch_commit_queue_patches_from_bug(bug_id, reject_invalid_patches=True)
    467             else:
    468                 patches = tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
    469 
     464            patches = tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
    470465            log("%s found on bug %s." % (pluralize("reviewed patch", len(patches)), bug_id))
    471466            all_patches += patches
    472 
    473467        return all_patches
    474468
     
    809803
    810804    def process_work_item(self, patch):
    811         self.run_bugzilla_tool(['land-attachment', '--force-clean', '--commit-queue', '--quiet', patch['id']])
     805        self.run_bugzilla_tool(['land-attachment', '--force-clean', '--non-interactive', '--quiet', patch['id']])
    812806
    813807    def handle_unexpected_error(self, patch, message):
Note: See TracChangeset for help on using the changeset viewer.