Fix error syncing to LKGR due to misparsing of Cygwin git-svn output.

scm.py

 # 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 373 matching lines @@
   def GetGitSvnHeadRev(cwd):
     """Gets the most recently pulled git-svn revision."""
     try:
       output = GIT.Capture(['svn', 'info'], cwd=cwd)
       match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
       return int(match.group(1)) if match else None
     except (subprocess2.CalledProcessError, ValueError):
       return None
 
   @staticmethod
+  def ParseGitSvnSha1(output):
+    """Parses git-svn output for the first sha1."""
+    match = re.search(r'[0-9a-fA-F]{40}', output)
+    return match.group(0) if match else None
+
+  @staticmethod
   def GetSha1ForSvnRev(cwd, rev):
     """Returns a corresponding git sha1 for a SVN revision."""
     if not GIT.IsGitSvn(cwd=cwd):
       return None
     try:
-      lines = GIT.Capture(
-          ['svn', 'find-rev', 'r' + str(rev)], cwd=cwd).splitlines()
-      return lines[-1].strip() if lines else None
+      output = GIT.Capture(['svn', 'find-rev', 'r' + str(rev)], cwd=cwd)
+      return GIT.ParseGitSvnSha1(output)
     except subprocess2.CalledProcessError:
       return None
 
   @staticmethod
   def IsValidRevision(cwd, rev):
     """Verifies the revision is a proper git revision."""
     # 'git rev-parse foo' where foo is *any* 40 character hex string will return
     # the string and return code 0. So strip one character to force 'git
     # rev-parse' to do a hash table look-up and returns 128 if the hash is not
     # present.
@@ skipping 651 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise