Convert githash to chromium revision instead of blink revision while doing a blink bisect (with -l …

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 181 matching lines @@
 
   def ParseDirectoryIndex(self):
     """Parses the Google Storage directory listing into a list of revision
     numbers."""
 
     def _FetchAndParse(url):
       """Fetches a URL and returns a 2-Tuple of ([revisions], next-marker). If
       next-marker is not None, then the listing is a partial listing and another
       fetch should be performed with next-marker being the marker= GET
       parameter."""
-      def _GetDepotName():
-        if self.base_url == CHROMIUM_BASE_URL:
-          return 'chromium'
-        elif self.base_url == WEBKIT_BASE_URL:
-          return 'blink'
-        else:
-          return 'chromium'
-
       handle = urllib.urlopen(url)
       document = ElementTree.parse(handle)
 
       # All nodes in the tree are namespaced. Get the root's tag name to extract
       # the namespace. Etree does namespaces as |{namespace}tag|.
       root_tag = document.getroot().tag
       end_ns_pos = root_tag.find('}')
       if end_ns_pos == -1:
         raise Exception("Could not locate end namespace for directory index")
       namespace = root_tag[:end_ns_pos + 1]
@@ skipping 11 matching lines @@
       # The <Prefix> nodes have content of the form of
       # |_listing_platform_dir/revision/|. Strip off the platform dir and the
       # trailing slash to just have a number.
       revisions = []
       githash_svn_dict = {}
       for prefix in all_prefixes:
         revnum = prefix.text[prefix_len:-1]
         try:
           if not revnum.isdigit():
             git_hash = revnum
-            revnum = self.GetSVNRevisionFromGitHash(git_hash, _GetDepotName())
+            revnum = self.GetSVNRevisionFromGitHash(git_hash)
             githash_svn_dict[revnum] = git_hash
           if revnum is not None:
             revnum = int(revnum)
             revisions.append(revnum)
         except ValueError:
           pass
       return (revisions, next_marker, githash_svn_dict)
 
     # Fetch the first list of revisions.
     (revisions, next_marker, self.githash_svn_dict) =\
@@ skipping 737 matching lines @@
              "you might also want to do a Blink bisect.")
 
     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())