Stop reading svn buildspec

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,
 unzipping, and opening Chromium for you. After testing the specific revision,
 it will ask you whether it is good or bad before continuing the search.
 """
 
 # The base URL for stored build archives.
 CHROMIUM_BASE_URL = ('http://commondatastorage.googleapis.com'
                      '/chromium-browser-snapshots')
 WEBKIT_BASE_URL = ('http://commondatastorage.googleapis.com'
                    '/chromium-webkit-snapshots')
 ASAN_BASE_URL = ('http://commondatastorage.googleapis.com'
                  '/chromium-browser-asan')
 
 # URL template for viewing changelogs between revisions.
 CHANGELOG_URL = ('https://chromium.googlesource.com/chromium/src/+log/%s..%s')
 
 # URL to convert SVN revision to git hash.
 CRREV_URL = ('https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/')
 
 # DEPS file URL.
-DEPS_FILE_OLD = ('http://src.chromium.org/viewvc/chrome/trunk/src/'
-                 'DEPS?revision=%d')
-DEPS_FILE_NEW = ('https://chromium.googlesource.com/chromium/src/+/%s/DEPS')
+DEPS_FILE = ('https://chromium.googlesource.com/chromium/src/+/%s/DEPS')
 
 # Blink changelogs URL.
 BLINK_CHANGELOG_URL = ('http://build.chromium.org'
                       '/f/chromium/perf/dashboard/ui/changelog_blink.html'
                       '?url=/trunk&range=%d%%3A%d')
 
 DONE_MESSAGE_GOOD_MIN = ('You are probably looking for a change made after %s ('
                          'known good), but no later than %s (first known bad).')
 DONE_MESSAGE_GOOD_MAX = ('You are probably looking for a change made after %s ('
                          'known bad), but no later than %s (first known good).')
@@ skipping 846 matching lines @@
 
 
 def GetBlinkDEPSRevisionForChromiumRevision(self, rev):
   """Returns the blink revision that was in REVISIONS file at
   chromium revision |rev|."""
 
   def _GetBlinkRev(url, blink_re):
     m = blink_re.search(url.read())
     url.close()
     if m:
-      return m.group(1)
+      return m.group(1)]
 
-  url = urllib.urlopen(DEPS_FILE_OLD % rev)
+  url = urllib.urlopen(DEPS_FILE % GetGitHashFromSVNRevision(rev))
   if url.getcode() == 200:
-    # . doesn't match newlines without re.DOTALL, so this is safe.
-    blink_re = re.compile(r'webkit_revision\D*(\d+)')
-    return int(_GetBlinkRev(url, blink_re))
-  else:
-    url = urllib.urlopen(DEPS_FILE_NEW % GetGitHashFromSVNRevision(rev))
-    if url.getcode() == 200:
-      blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)')
-      blink_git_sha = _GetBlinkRev(url, blink_re)
-      return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink')
+    blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)')
+    blink_git_sha = _GetBlinkRev(url, blink_re)
+    return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink')
   raise Exception('Could not get Blink revision for Chromium rev %d' % rev)
 
 
 def GetBlinkRevisionForChromiumRevision(context, rev):
   """Returns the blink revision that was in REVISIONS file at
   chromium revision |rev|."""
   def _IsRevisionNumber(revision):
     if isinstance(revision, int):
       return True
     else:
@@ skipping 249 matching lines @@
     if min_blink_rev != max_blink_rev:
       print ('NOTE: There is a Blink roll in the range, '
              'you might also want to do a Blink bisect.')
 
     print 'CHANGELOG URL:'
     PrintChangeLog(min_chromium_rev, max_chromium_rev)
 
 
 if __name__ == '__main__':
   sys.exit(main())