Refactoring auto-bisect bot

tools/auto_bisect/source_control.py

 # Copyright 2014 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.
 
 """This module contains functions for performing source control operations."""
 
-import os
-
 import bisect_utils
 
-CROS_VERSION_PATTERN = 'new version number from %s'
-
 
 def IsInGitRepository():
   output, _ = bisect_utils.RunGit(['rev-parse', '--is-inside-work-tree'])
   return output.strip() == 'true'
 
 
 def SyncToRevisionWithGClient(revision):
   """Uses gclient to sync to the specified revision.
 
   This is like running gclient sync --revision <revision>.
 
   Args:
     revision: A git SHA1 hash or SVN revision number (depending on workflow).
 
   Returns:
     The return code of the call.
   """
   return bisect_utils.RunGClient(
       ['sync', '--verbose', '--reset', '--force',
       '--delete_unversioned_trees', '--nohooks', '--revision', revision])
 
 
-def SyncToRevisionWithRepo(timestamp):
-  return bisect_utils.RunRepoSyncAtTimestamp(timestamp)
-
-
 def GetRevisionList(end_revision_hash, start_revision_hash, cwd=None):
   """Retrieves a list of git commit hashes in a range.
 
   Args:
     end_revision_hash: The SHA1 for the end of the range, inclusive.
     start_revision_hash: The SHA1 for the beginning of the range, inclusive.
 
   Returns:
     A list of the git commit hashes in the range, in reverse time order --
     that is, starting with |end_revision_hash|.
   """
   revision_range = '%s..%s' % (start_revision_hash, end_revision_hash)
   cmd = ['log', '--format=%H', '-10000', '--first-parent', revision_range]
   log_output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
 
   revision_hash_list = log_output.split()
   revision_hash_list.append(start_revision_hash)
 
   return revision_hash_list
 
 
 def SyncToRevision(revision, sync_client=None):
   if not sync_client:
     _, return_code = bisect_utils.RunGit(['checkout', revision])
   elif sync_client == 'gclient':
     return_code = SyncToRevisionWithGClient(revision)
-  elif sync_client == 'repo':
-    return_code = SyncToRevisionWithRepo(revision)
   else:
     raise NotImplementedError('Unsupported sync_client: "%s"' % sync_client)
 
   return not return_code
 
 
 def ResolveToRevision(revision_to_check, depot, depot_deps_dict,
                       search, cwd=None):
   """Tries to resolve an SVN revision or commit position to a git SHA1.
 
   Args:
     revision_to_check: The user supplied revision string that may need to be
         resolved to a git commit hash. This may be an SVN revision, git commit
         position, or a git commit hash.
     depot: The depot (dependency repository) that |revision_to_check| is from.
     depot_deps_dict: A dictionary with information about different depots.
     search: How many revisions forward or backward to search. If the value is
         negative, the function will search backwards chronologically, otherwise
         it will search forward.
 
   Returns:
     A string containing a git SHA1 hash, otherwise None.
   """
   # Android-chrome is git only, so no need to resolve this to anything else.
   if depot == 'android-chrome':
     return revision_to_check
 
-  if depot == 'cros':
-    return ResolveToRevisionCrOS(revision_to_check, cwd)
-
   # If the given revision can't be parsed as an integer, then it may already
   # be a git commit hash.
   if not bisect_utils.IsStringInt(revision_to_check):
     return revision_to_check
 
   depot_svn = 'svn://svn.chromium.org/chrome/trunk/src'
 
   if depot != 'chromium':
     depot_svn = depot_deps_dict[depot]['svn']
   svn_revision = int(revision_to_check)
@@ skipping 15 matching lines @@
     log_output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
     log_output = log_output.strip()
 
     if log_output:
       git_revision = log_output
       break
 
   return git_revision
 
 
-def ResolveToRevisionCrOS(revision_to_check, cwd=None):
-  """Return a git commit hash corresponding to the give version or revision.
-
-  TODO(qyearsley): Either verify that this works or delete it.
-  """
-  if bisect_utils.IsStringInt(revision_to_check):
-    return int(revision_to_check)
-
-  cwd = os.getcwd()
-  os.chdir(os.path.join(os.getcwd(), 'src', 'third_party',
-                        'chromiumos-overlay'))
-  pattern = CROS_VERSION_PATTERN % revision_to_check
-  cmd = ['log', '--format=%ct', '-1', '--grep', pattern]
-
-  git_revision = None
-
-  log_output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
-  if log_output:
-    git_revision = log_output
-    git_revision = int(log_output.strip())
-  os.chdir(cwd)
-
-  return git_revision
-
-
 def IsInProperBranch():
   """Checks whether the current branch is "master"."""
   cmd = ['rev-parse', '--abbrev-ref', 'HEAD']
   log_output = bisect_utils.CheckRunGit(cmd)
   log_output = log_output.strip()
   return log_output == 'master'
 
 
 def GetCommitPosition(git_revision, cwd=None):
   """Finds git commit postion for the given git hash.
@@ skipping 87 matching lines @@
       'log',
       '--format=%H',
       '%s~1..%s' % (revision_start, revision_end),
       '--',
       filename,
   ]
   output = bisect_utils.CheckRunGit(cmd)
   lines = output.split('\n')
   return [o for o in lines if o]