Add gclient style cache_dir support for deps2git.

deps2git.py

 #!/usr/bin/python
 # 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.
 
 """Convert SVN based DEPS into .DEPS.git for use with NewGit."""
 
 import json
 import optparse
 import os
 import sys
 import time
 
 import deps_utils
 import git_tools
 import svn_to_git_public
 
 
 def SplitScmUrl(url):
   """Given a repository, return a set containing the URL and the revision."""
   url_split = url.split('@')
   scm_url = url_split[0]
   scm_rev = 'HEAD'
   if len(url_split) == 2:
     scm_rev = url_split[1]
   return (scm_url, scm_rev)
 
 
+def _NormalizeGitURL(url):
+  '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
+  separator = '://'

[szager, 2014/02/07 14:09:29]

In general, use the urlparse package for url slicing and dicing.

+  idx = url.find(separator)
+  if idx != -1:
+    url = url[idx+len(separator):]
+  if not url.endswith('.git'):
+    url += '.git'
+  return url
+
+
 def SvnRevToGitHash(svn_rev, git_url, repos_path, workspace, dep_path,
-                    git_host, svn_branch_name=None):
+                    git_host, svn_branch_name=None, cache_dir=None):
   """Convert a SVN revision to a Git commit id."""
   git_repo = None
   if git_url.startswith(git_host):
     git_repo = git_url.replace(git_host, '')
   else:
     raise Exception('Unknown git server %s, host %s' % (git_url, git_host))
-  if repos_path is None and workspace is None:
+  if repos_path is None and workspace is None and cache_dir is None:
     # We're running without a repository directory (i.e. no -r option).
     # We cannot actually find the commit id, but this mode is useful
     # just for testing the URL mappings.  Produce an output file that
     # can't actually be used, but can be eyeballed for correct URLs.
     return 'xxx-r%s' % svn_rev
+  mirror = False
   if repos_path:
     git_repo_path = os.path.join(repos_path, git_repo)
     mirror = True
+  elif cache_dir:
+    git_repo_path = os.path.join(
+        cache_dir,
+        _NormalizeGitURL(git_url).replace('-', '--').replace('/', '-'))
+    mirror = 'bare'
   else:
     git_repo_path = os.path.join(workspace, dep_path)
-    mirror = False
   if not os.path.exists(git_repo_path):
     git_tools.Clone(git_url, git_repo_path, mirror)
 
   if svn_branch_name:
     # svn branches are mirrored with:
     # branches = branches/*:refs/remotes/branch-heads/*
     if mirror:
       refspec = 'refs/branch-heads/' + svn_branch_name
     else:
       refspec = 'refs/remotes/branch-heads/' + svn_branch_name
@@ skipping 80 matching lines @@
         git_hash = '%s_%s' % (deps_utils.VARIFY_MARKER_TAG_PREFIX,
                               deps_overrides[dep])
       else:
         # Pass-through the hash for Git repositories. Resolve the hash for
         # subversion repositories.
         if dep_url.endswith('.git'):
           git_hash = '@%s' % dep_rev
         else:
           git_hash = '@%s' % SvnRevToGitHash(
               dep_rev, git_url, options.repos, options.workspace, path,
-              git_host, svn_branch)
+              git_host, svn_branch, options.cache_dir)
 
     # If this is webkit, we need to add the var for the hash.
     if dep == 'src/third_party/WebKit' and dep_rev:
       deps_vars['webkit_rev'] = git_hash
       git_hash = 'VAR_WEBKIT_REV'
 
     # Add this Git dep to the new deps.
     new_deps[path] = '%s%s' % (git_url, git_hash)
 
   return new_deps, bad_git_urls
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('-d', '--deps', default='DEPS',
                     help='path to the DEPS file to convert')
   parser.add_option('-o', '--out',
                     help='path to the converted DEPS file (default: stdout)')
   parser.add_option('-t', '--type',
                     help='[DEPRECATED] type of DEPS file (public, etc)')
   parser.add_option('-x', '--extra-rules',
                     help='Path to file with additional conversion rules.')
   parser.add_option('-r', '--repos',
                     help='path to the directory holding all the Git repos')
   parser.add_option('-w', '--workspace', metavar='PATH',
                     help='top level of a git-based gclient checkout')
+  parser.add_option('-c', '--cache_dir',
+                     help='top level of a gclient git cache diretory.')
   parser.add_option('--verify', action='store_true',
                     help='ping each Git repo to make sure it exists')
   parser.add_option('--json',
                     help='path to a JSON file for machine-readable output')
   options = parser.parse_args()[0]
 
   # Get the content of the DEPS file.
   deps_content = deps_utils.GetDepsContent(options.deps)
   (deps, deps_os, include_rules, skip_child_includes, hooks,
    svn_deps_vars) = deps_content
 
   if options.extra_rules and options.type:
     parser.error('Can\'t specify type and extra-rules at the same time.')
   elif options.type:
     options.extra_rules = os.path.join(
         os.path.abspath(os.path.dirname(__file__)),
         'svn_to_git_%s.py' % options.type)
+  if options.cache_dir and options.repos:
+    parser.error('Can\'t specify both cache_dir and repos at the same time.')
 
   if options.extra_rules and not os.path.exists(options.extra_rules):
     raise Exception('Can\'t locate rules file "%s".' % options.extra_rules)
 
   # Create a var containing the Git and Webkit URL, this will make it easy for
   # people to use a mirror instead.
   git_url = 'https://chromium.googlesource.com'
   deps_vars = {
       'git_url': git_url,
       'webkit_url': git_url + '/chromium/blink.git',
@@ skipping 27 matching lines @@
       return 0
 
   # Write the DEPS file to disk.
   deps_utils.WriteDeps(options.out, deps_vars, deps, deps_os, include_rules,
                        skip_child_includes, hooks)
   return 0
 
 
 if '__main__' == __name__:
   sys.exit(main())