Replace "git svn" with "git footers" commands to get commit position or svn revision.

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 the SourceControl class and related functions."""
 
 import os
-import re
 
 from . import bisect_utils
 
 CROS_VERSION_PATTERN = 'new version number from %s'
 
 
 def DetermineAndCreateSourceControl(opts):
   """Attempts to determine the underlying source control workflow and returns
   a SourceControl object.
 
@@ skipping 180 matching lines @@
 
     Returns:
       True if the current branch on src is 'master'
     """
     cmd = ['rev-parse', '--abbrev-ref', 'HEAD']
     log_output = bisect_utils.CheckRunGit(cmd)
     log_output = log_output.strip()
 
     return log_output == "master"
 
   def SVNFindRev(self, git_revision, cwd=None):

[qyearsley, 2014/09/10 01:04:14]

This should be renamed now -- maybe "GetCommitPosition"?

[prasadv, 2014/09/10 17:16:32]

Right now git footers command get commit position if available else gets svn
revision. But eventually SVN will vanish, so changing it accordingly.

-    """Finds a SVN revision OR git number for the given git hash.
+    """Finds a SVN revision OR Commit-Postion number for the given git hash.

[qyearsley, 2014/09/10 01:04:14]

We could just say git commit position, instead of SVN revision OR commit
position, since before the migration, commit position was equal to SVN revision.

[prasadv, 2014/09/10 17:16:33]

Done.

 
-    If "git svn find_rev <hash>" fails, then it runs
-    "git log --format=%b -1 origin/master <hash> and greps for
-    Cr-Commit-Position.
+    This function executes "git footer --position-num <git hash>" command to get
+    Commit-Position number(if available) or SVN revision of the given revision.
 
     Args:
       git_revision: The git SHA1 to use.

[qyearsley, 2014/09/10 01:04:14]

Should add a line for "cwd" here -- its purpose is to allow us to get commit
positions for other repositories, right?

[prasadv, 2014/09/10 17:16:33]

Done.

 
     Returns:
       Git number (aka git commit position) OR an SVN revision as integer,

[qyearsley, 2014/09/10 01:04:14]

You could just say "A git commit position number or None".

[prasadv, 2014/09/10 17:16:33]

Done.

       otherwise None.
     """
-
-    cmd = ['svn', 'find-rev', git_revision]
-
+    cmd = ['footers', '--position-num', git_revision]
     output = bisect_utils.CheckRunGit(cmd, cwd)
     svn_revision = output.strip()

[qyearsley, 2014/09/10 01:04:13]

Call this commit_position instead of svn_revision.

[prasadv, 2014/09/10 17:16:33]

Done.

 
     if bisect_utils.IsStringInt(svn_revision):
       return int(svn_revision)
 
-    # Retrieve commit position number from git log body for the given revision.
-    # TODO(prasadv): Use an appropriate command to find commit position instead
-    # of parsing the log. Resolve this once 407316 is fixed.
-    commit_position_pattern = 'Cr-Commit-Position: .*@\{#(?P<commit>[0-9]+)\}'
-    cmd = ['log', '--format=%b', '-1', git_revision]
-    output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
-    if output:
-      version_re = re.compile(commit_position_pattern)
-      commit_reg = version_re.search(output)
-      if commit_reg and bisect_utils.IsStringInt(commit_reg.group('commit')):
-        return int(commit_reg.group('commit'))
-
     return None
 
   def QueryRevisionInfo(self, 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.
 
     Returns:
@@ skipping 47 matching lines @@
         revision_end: End of revision range.
 
     Returns:
         Returns a list of commits that touched this file.
     """
     cmd = ['log', '--format=%H', '%s~1..%s' % (revision_start, revision_end),
            '--', filename]
     output = bisect_utils.CheckRunGit(cmd)
 
     return [o for o in output.split('\n') if o]