bisect-builds.py: Add another search pattern to get SVN revision number from git hash.

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 49 matching lines @@
 
 GITHASH_TO_SVN_URL = {
     'chromium': CHROMIUM_GITHASH_TO_SVN_URL,
     'blink': BLINK_GITHASH_TO_SVN_URL,
 }
 
 # Search pattern to be matched in the JSON output from
 # CHROMIUM_GITHASH_TO_SVN_URL to get the chromium revision (svn revision).
 CHROMIUM_SEARCH_PATTERN = (
     r'.*git-svn-id: svn://svn.chromium.org/chrome/trunk/src@(\d+) ')
+CHROMIUM_SEARCH_PATTERN_NEW = (
+    r'Cr-Commit-Position: refs/heads/master@{#(\d+)}')
 
 # Search pattern to be matched in the json output from
 # BLINK_GITHASH_TO_SVN_URL to get the blink revision (svn revision).
 BLINK_SEARCH_PATTERN = (
     r'.*git-svn-id: svn://svn.chromium.org/blink/trunk@(\d+) ')
 
 SEARCH_PATTERN = {
     'chromium': CHROMIUM_SEARCH_PATTERN,
     'blink': BLINK_SEARCH_PATTERN,
 }
@@ skipping 247 matching lines @@
       try:
         data = json.loads(response.read()[4:])
       except ValueError:
         print 'ValueError for JSON URL: %s' % json_url
         raise ValueError
     else:
       raise ValueError
     if 'message' in data:
       message = data['message'].split('\n')
       message = [line for line in message if line.strip()]
       search_pattern = re.compile(SEARCH_PATTERN[depot])

[DaleCurtis, 2014/09/05 21:51:30]

Should you flip the order of these as we move into the git world?

[pshenoy, 2014/09/05 22:25:56]

Done.

       result = search_pattern.search(message[len(message)-1])
       if result:
         return result.group(1)
+      else:
+        if depot == 'chromium':
+          result = re.search(CHROMIUM_SEARCH_PATTERN_NEW,
+                             message[len(message)-1])
+          if result:
+            return result.group(1)
     print 'Failed to get svn revision number for %s' % git_sha1
     raise ValueError
 
   def _GetSVNRevisionFromGitHashFromGitCheckout(self, git_sha1, depot):
     def _RunGit(command, path):
       command = ['git'] + command
       if path:
         original_path = os.getcwd()
         os.chdir(path)
       shell = sys.platform.startswith('win')
@@ skipping 809 matching lines @@
 
     print 'CHANGELOG URL:'
     if opts.official_builds:
       print OFFICIAL_CHANGELOG_URL % (min_chromium_rev, max_chromium_rev)
     else:
       PrintChangeLog(min_chromium_rev, max_chromium_rev)
 
 
 if __name__ == '__main__':
   sys.exit(main())