Added an option to run bisect-builds.py from git checkout so that 'Downloading list of know…

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 61 matching lines @@
 import urllib
 from distutils.version import LooseVersion
 from xml.etree import ElementTree
 import zipfile
 
 
 class PathContext(object):
   """A PathContext is used to carry the information used to construct URLs and
   paths when dealing with the storage server and archives."""
   def __init__(self, base_url, platform, good_revision, bad_revision,
-               is_official, is_aura, flash_path = None):
+               is_official, is_aura, use_local_repo, flash_path = None):
     super(PathContext, self).__init__()
     # Store off the input parameters.
     self.base_url = base_url
     self.platform = platform  # What's passed in to the '-a/--archive' option.
     self.good_revision = good_revision
     self.bad_revision = bad_revision
     self.is_official = is_official
     self.is_aura = is_aura
     self.flash_path = flash_path
     # Dictionary which stores svn revision number as key and it's
     # corresponding git hash as value. This data is populated in
     # _FetchAndParse and used later in GetDownloadURL while downloading
     # the build.
     self.githash_svn_dict = {}
 
     # The name of the ZIP file in a revision directory on the server.
     self.archive_name = None
+    self.use_local_repo = use_local_repo

[Robert Sesek, 2014/07/08 18:52:58]

nit: blank line before and a comment about what this does.

[pshenoy, 2014/07/08 19:58:19]

Done.

 
     # Set some internal members:
     #   _listing_platform_dir = Directory that holds revisions. Ends with a '/'.
     #   _archive_extract_dir = Uncompressed directory in the archive_name file.
     #   _binary_name = The name of the executable to run.
     if self.platform in ('linux', 'linux64', 'linux-arm'):
       self._binary_name = 'chrome'
     elif self.platform == 'mac':
       self.archive_name = 'chrome-mac.zip'
       self._archive_extract_dir = 'chrome-mac'
@@ skipping 136 matching lines @@
         _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, new_dict) = _FetchAndParse(next_url)
       revisions.extend(new_revisions)
       self.githash_svn_dict.update(new_dict)
     return revisions
 
-  def GetSVNRevisionFromGitHash(self, git_sha1, depot='chromium'):
+  def _GetSVNRevisionFromGitHashWithoutGitCheckout(self, git_sha1, depot):
     json_url = GITHASH_TO_SVN_URL[depot] % git_sha1
     try:
       response = urllib.urlopen(json_url)
     except urllib.HTTPError as error:
       msg = 'HTTP Error %d for %s' % (error.getcode(), git_sha1)
       return None
     data = json.loads(response.read()[4:])
     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])
       result = search_pattern.search(message[len(message)-1])
       if result:
         return result.group(1)
     print 'Failed to get svn revision number for %s' % git_sha1
     return None
 
+  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')
+      proc = subprocess.Popen(command, shell=shell, stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE)
+      (output, _) = proc.communicate()
+
+      if path:
+        os.chdir(original_path)
+      return (output, proc.returncode)
+
+    path = None
+    if depot == 'blink':
+      path = os.path.join(os.getcwd(), 'third_party', 'WebKit')
+    if os.path.basename(os.getcwd()) == 'src':
+      command = []
+      command.append('svn')

[Robert Sesek, 2014/07/08 18:52:58]

Why .append() these things? command = ['svn', 'find-rev', git_sha1]

[pshenoy, 2014/07/08 19:58:19]

Done.

+      command.append('find-rev')
+      command.append(git_sha1)
+      (git_output, return_code) = _RunGit(command, path)
+      if not return_code:
+        return git_output.strip('\n')
+      return None
+    else:
+      print ('Script should be run from src folder. ' +
+             'Eg: python tools/bisect-builds.py -g 280588 -b 280590' +
+             '--archive linux64 --git')

[Robert Sesek, 2014/07/08 18:52:58]

--use-local-repo

[pshenoy, 2014/07/08 19:58:19]

Done.

+      sys.exit(0)

[Robert Sesek, 2014/07/08 18:52:58]

Code 1 for errors

[pshenoy, 2014/07/08 19:58:19]

Done.

+
+  def GetSVNRevisionFromGitHash(self, git_sha1, depot='chromium'):
+    if not self.use_local_repo:
+      return self._GetSVNRevisionFromGitHashWithoutGitCheckout(git_sha1, depot)
+    else:
+      return self._GetSVNRevisionFromGitHashFromGitCheckout(git_sha1, depot)
+
   def GetRevList(self):
     """Gets the list of revision numbers between self.good_revision and
     self.bad_revision."""
     # Download the revlist and filter for just the range between good and bad.
     minrev = min(self.good_revision, self.bad_revision)
     maxrev = max(self.good_revision, self.bad_revision)
     revlist_all = map(int, self.ParseDirectoryIndex())
 
     revlist = [x for x in revlist_all if x >= int(minrev) and x <= int(maxrev)]
     revlist.sort()
@@ skipping 222 matching lines @@
     must have been started previously."""
     print "Downloading revision %s..." % str(self.rev)
     self.progress_event.set()  # Display progress of download.
     self.thread.join()
 
 
 def Bisect(base_url,
            platform,
            official_builds,
            is_aura,
+           use_local_repo,
            good_rev=0,
            bad_rev=0,
            num_runs=1,
            command="%p %a",
            try_args=(),
            profile=None,
            flash_path=None,
            interactive=True,
            evaluate=AskIsGoodBuild):
   """Given known good and known bad revisions, run a binary search on all
@@ skipping 23 matching lines @@
       is run on rev 75.
 
     - If rev 50 is bad, the download of rev 75 is cancelled, and the next test
       is run on rev 25.
   """
 
   if not profile:
     profile = 'profile'
 
   context = PathContext(base_url, platform, good_rev, bad_rev,
-                        official_builds, is_aura, flash_path)
+                        official_builds, is_aura, use_local_repo, flash_path)
   cwd = os.getcwd()
 
   print "Downloading list of known revisions..."
   _GetDownloadPath = lambda rev: os.path.join(cwd,
       '%s-%s' % (str(rev), context.archive_name))
   if official_builds:
     revlist = context.GetOfficialBuildsList()
   else:
     revlist = context.GetRevList()
 
@@ skipping 268 matching lines @@
   parser.add_option('-l', '--blink', action='store_true',
                     help = 'Use Blink bisect instead of Chromium. ')
   parser.add_option('', '--not-interactive', action='store_true',
                     help = 'Use command exit code to tell good/bad revision.',
                     default=False)
   parser.add_option('--aura',
                     dest='aura',
                     action='store_true',
                     default=False,
                     help='Allow the script to bisect aura builds')
+  parser.add_option('--use-local-repo',
+                    dest='use_local_repo',
+                    action='store_true',
+                    default=False,
+                    help='Allow the script to convert git SHA1 to SVN ' +
+                    'revision using "git svn find-rev <SHA1>" ' +
+                    'command.')

[Robert Sesek, 2014/07/08 18:52:58]

"from a Chromium checkout."

[pshenoy, 2014/07/08 19:58:19]

Done.

 
   (opts, args) = parser.parse_args()
 
   if opts.archive is None:
     print 'Error: missing required parameter: --archive'
     print
     parser.print_help()
     return 1
 
   if opts.aura:
     if opts.archive != 'win' or not opts.official_builds:
       print 'Error: Aura is supported only on Windows platform '\
             'and official builds.'
       return 1
 
   if opts.blink:
     base_url = WEBKIT_BASE_URL
   else:
     base_url = CHROMIUM_BASE_URL
 
   # Create the context. Initialize 0 for the revisions as they are set below.
   context = PathContext(base_url, opts.archive, 0, 0,
-                        opts.official_builds, opts.aura, None)
+                        opts.official_builds, opts.aura, opts.use_local_repo,
+                        None)
   # Pick a starting point, try to get HEAD for this.
   if opts.bad:
     bad_rev = opts.bad
   else:
     bad_rev = '999.0.0.0'
     if not opts.official_builds:
       bad_rev = GetChromiumRevision(context, context.GetLastChangeURL())
 
   # Find out when we were good.
   if opts.good:
@@ skipping 13 matching lines @@
     good_rev = int(good_rev)
     bad_rev = int(bad_rev)
 
   if opts.times < 1:
     print('Number of times to run (%d) must be greater than or equal to 1.' %
           opts.times)
     parser.print_help()
     return 1
 
   (min_chromium_rev, max_chromium_rev) = Bisect(
-      base_url, opts.archive, opts.official_builds, opts.aura, good_rev,
-      bad_rev, opts.times, opts.command, args, opts.profile, opts.flash_path,
-      not opts.not_interactive)
+      base_url, opts.archive, opts.official_builds, opts.aura,
+      opts.use_local_repo, good_rev, bad_rev, opts.times, opts.command,
+      args, opts.profile, opts.flash_path, not opts.not_interactive)
 
   # Get corresponding blink revisions.
   try:
     min_blink_rev = GetBlinkRevisionForChromiumRevision(context,
                                                         min_chromium_rev)
     max_blink_rev = GetBlinkRevisionForChromiumRevision(context,
                                                         max_chromium_rev)
   except Exception, e:
     # Silently ignore the failure.
     min_blink_rev, max_blink_rev = 0, 0
@@ skipping 21 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())