Introduce --cancel-first-run and reduce the strength of --no-first-run.

tools/bisect-builds.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Snapshot Build Bisect Tool
 
 This script bisects a snapshot archive using binary search. It starts at
 a bad revision (it will try to guess HEAD) and asks for a last known-good
 revision. It will then binary search across this revision range by downloading,
@@ skipping 169 matching lines @@
       # trailing slash to just have a number.
       revisions = []
       for prefix in all_prefixes:
         revnum = prefix.text[prefix_len:-1]
         try:
           revnum = int(revnum)
           revisions.append(revnum)
         except ValueError:
           pass
       return (revisions, next_marker)
-      
+
     # Fetch the first list of revisions.
     (revisions, next_marker) = _FetchAndParse(self.GetListingURL())
 
     # If the result list was truncated, refetch with the next marker. Do this
     # until an entire directory listing is done.
     while next_marker:
       next_url = self.GetListingURL(next_marker)
       (new_revisions, next_marker) = _FetchAndParse(next_url)
       revisions.extend(new_revisions)
     return revisions
@@ skipping 407 matching lines @@
            'the bad one.\n'
            '\n'
            'Revision numbers should use\n'
            '  Official versions (e.g. 1.0.1000.0) for official builds. (-o)\n'
            '  SVN revisions (e.g. 123456) for chromium builds, from trunk.\n'
            '    Use base_trunk_revision from http://omahaproxy.appspot.com/\n'
            '    for earlier revs.\n'
            '    Chrome\'s about: build number and omahaproxy branch_revision\n'
            '    are incorrect, they are from branches.\n'
            '\n'
-           'Tip: add "-- --no-first-run" to bypass the first run prompts.')
+           'Tip: add "-- --skip-first-run" to bypass the first run prompts.')
   parser = optparse.OptionParser(usage=usage)
   # Strangely, the default help output doesn't include the choice list.
   choices = ['mac', 'win', 'linux', 'linux64', 'linux-arm']
             # linux-chromiumos lacks a continuous archive http://crbug.com/78158
   parser.add_option('-a', '--archive',
                     choices = choices,
                     help = 'The buildbot archive to bisect [%s].' %
                            '|'.join(choices))
   parser.add_option('-o', action="store_true", dest='official_builds',
                     help = 'Bisect across official ' +
@@ skipping 80 matching lines @@
     print 'BLINK CHANGELOG URL:'
     print '  ' + BLINK_CHANGELOG_URL % (max_blink_rev, min_blink_rev)
   print 'CHANGELOG URL:'
   if opts.official_builds:
     print OFFICIAL_CHANGELOG_URL % (min_chromium_rev, max_chromium_rev)
   else:
     print '  ' + CHANGELOG_URL % (min_chromium_rev, max_chromium_rev)
 
 if __name__ == '__main__':
   sys.exit(main())