depot_tools: Add git svn find-rev for safesync_url parsing (commonly LKGR link).

scm.py

 # Copyright (c) 2011 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 361 matching lines @@
     short_sha = GIT.Capture(['rev-parse', '--short=4', 'HEAD'], cwd=cwd).strip()
     return "%s#%s" % (GIT.GetBranch(cwd), short_sha)
 
   @staticmethod
   def GetCheckoutRoot(cwd):
     """Returns the top level directory of a git checkout as an absolute path.
     """
     root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
     return os.path.abspath(os.path.join(cwd, root))
 
+  @staticmethod
+  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)
+      if match:
+        print('Match found! ' + match.group(1))

[M-A Ruel, 2011/11/09 14:16:08]

That was for debugging?

[Dan Beam, 2011/11/09 19:21:59]

Ah, yeah, sorry.  Will remove.

[Dan Beam, 2011/11/10 10:29:15]

Done.

+      else:
+        print('Match not found, :(')
+      return int(match.group(1)) if match else None
+    except (subprocess2.CalledProcessError, ValueError):
+      return 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 len(lines) else None

[M-A Ruel, 2011/11/09 14:16:08]

if lines

len() is unnecessary here.

[Dan Beam, 2011/11/10 10:29:15]

Done.

+    except subprocess2.CalledProcessError:
+      return None
+
+  @staticmethod
+  def IsValidRevision(cwd, url, rev):

[M-A Ruel, 2011/11/09 14:16:08]

Why url here?

[Dan Beam, 2011/11/09 19:21:59]

To let scm.{GIT,SVN}.IsValidRevision() take the same args.  Maybe it doesn't
matter?

[M-A Ruel, 2011/11/09 19:25:51]

I prefer not. It's fine to have different interface.

[Dan Beam, 2011/11/09 19:37:22]

OK, great, will change!

[Dan Beam, 2011/11/10 10:29:15]

Done.

+    """Verifies the revision is a proper git revision."""
+    try:
+      GIT.Capture(['rev-parse', rev], cwd=cwd)
+      return True
+    except subprocess2.CalledProcessError:
+      return False
+
   @classmethod
   def AssertVersion(cls, min_version):
     """Asserts git's version is at least min_version."""
     if cls.current_version is None:
       cls.current_version = cls.Capture(['--version']).split()[-1]
     current_version_list = map(only_int, cls.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, cls.current_version)
@@ skipping 530 matching lines @@
         info = SVN.CaptureInfo(parent)
         if (info['Repository Root'] != cur_dir_repo_root or
             info['URL'] != os.path.dirname(url)):
           break
         url = info['URL']
       except subprocess2.CalledProcessError:
         break
       directory = parent
     return GetCasedPath(directory)
 
+  @staticmethod
+  def IsValidRevision(cwd, url, rev):

[M-A Ruel, 2011/11/09 14:16:08]

Remove url from here, have the caller reformat what it needs.

You don't use cwd?

[Dan Beam, 2011/11/09 19:21:59]

Same reason as above, make both methods take same params.  Let me know if this
is unnecessary.

[Dan Beam, 2011/11/10 10:29:15]

Done.

+    """Verifies the revision looks like an SVN revision."""
+    try:
+      SVN.Capture(['info', '%s@%s' % (url, rev)])
+      return True
+    except subprocess2.CalledProcessError:
+      return False
+
   @classmethod
   def AssertVersion(cls, min_version):
     """Asserts svn's version is at least min_version."""
     if cls.current_version is None:
       cls.current_version = cls.Capture(['--version']).split()[2]
     current_version_list = map(only_int, cls.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, cls.current_version)
@@ skipping 45 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(repo_root):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise