Make changes to support bisect for android-chrome.

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 bisect_utils
 
 
 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 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)
+    return_code = bisect_utils.RunGClientAndSync(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.
 
@@ skipping 65 matching lines @@
 
   Args:
     git_revision: The git SHA1 to use.
     cwd: Working directory to run the command from.
 
   Returns:
     Git commit position as integer or None.
   """
   # Some of the respositories are pure git based, unlike other repositories
   # they doesn't have commit position. e.g., skia, angle.
-  no_commit_position_repos = ['angle', 'skia']
-  if cwd and any(repo in cwd for repo in no_commit_position_repos):
-    return None
-
   cmd = ['footers', '--position-num', git_revision]
-  output = bisect_utils.CheckRunGit(cmd, cwd)
-  commit_position = output.strip()
-
-  if bisect_utils.IsStringInt(commit_position):
-    return int(commit_position)
-
+  output, return_code  = bisect_utils.RunGit(cmd, cwd)
+  if not return_code:
+    commit_position = output.strip()
+    if bisect_utils.IsStringInt(commit_position):
+      return int(commit_position)
   return None
 
 
 def QueryRevisionInfo(revision, cwd=None):
   """Gathers information on a particular revision, such as author's name,
   email, subject, and date.
 
   Args:
     revision: Revision you want to gather information on; a git commit hash.
 
@@ skipping 59 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]
 
+def GetCommitTime(git_revision, cwd=None):
+  """Returns commit time for the given revision."""

[qyearsley, 2014/12/11 23:51:06]

This could go up next to GetCommitPosition, with two blank spaces before and
after it.

Also, the docstring could say that what returns is a UNIX timestamp.

+  cmd = ['log', '--format=%ct', '-1', git_revision]
+  output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
+  return int(output)
+