Add --workspace option, so deps2git.py may be run in a

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 optparse
 import os
 import sys
 
 import deps_utils
 import git_tools
 
 
 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 SvnRevToGitHash(svn_rev, git_url, repos_path, git_host):
+def SvnRevToGitHash(path, svn_rev, git_url, repos_path, workspace, git_host):

[nsylvain, 2012/10/10 17:33:28]

I'd like to rename "path" to something more meaningful, but I can't find what.
"dep_path_in_checkout" is probably too long.  Also,  why making it the first
argument instead of after workspace?

[szager, 2012/10/10 18:09:14]

No reason; I reordered the arguments as you suggested and renamed 'path' to
'dep_path'.

   """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')
-  if repos_path is None:
+  if repos_path is None and workspace 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
-  git_repo_path = os.path.join(repos_path, git_repo)
+  if repos_path:
+    git_repo_path = os.path.join(repos_path, git_repo)
+    mirror = True
+  else:
+    git_repo_path = os.path.join(workspace, path)
+    mirror = False
   if not os.path.exists(git_repo_path):
-    git_tools.Clone(git_url, git_repo_path)
+    git_tools.Clone(git_url, git_repo_path, mirror)
   else:
-    git_tools.Fetch(git_repo_path)
-  return git_tools.Search(git_repo_path, svn_rev)
+    git_tools.Fetch(git_repo_path, mirror)
+  return git_tools.Search(git_repo_path, svn_rev, mirror)
 
 
-def ConvertDepsToGit(deps, repos, deps_type, deps_vars, svn_deps_vars, verify):
+def ConvertDepsToGit(deps, repos, workspace, deps_type, deps_vars,
+                     svn_deps_vars, verify):
   """Convert a 'deps' section in a DEPS file from SVN to Git."""
   new_deps = {}
   bad_git_urls = set([])
 
   try:
     sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
     svn_to_git = __import__('svn_to_git_%s' % deps_type)
   except ImportError:
     raise Exception('invalid DEPS type')
 
@@ skipping 40 matching lines @@
             '@' + svn_deps_vars[deps_overrides[dep]].lstrip('@'))
         # Tag this variable as needing a transform by Varify() later.
         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, repos,
-                                             svn_to_git.GIT_HOST)
+          git_hash = '@%s' % SvnRevToGitHash(path, dep_rev, git_url, repos,
+                                             workspace, svn_to_git.GIT_HOST)
 
     # If this is webkit, we need to add the var for the hash.
     if dep == 'src/third_party/WebKit/Source':
       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', default='public',
                     help='type of DEPS file (public, etc)')
   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('--verify', action='store_true',
                     help='ping each Git repo to make sure it exists')
   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
 
   # Create a var containing the Git and Webkit URL, this will make it easy for
   # people to use a mirror instead.
   git_url = 'http://git.chromium.org'
   deps_vars = {
       'git_url': git_url,
       'webkit_url': git_url + '/external/WebKit_trimmed.git'
   }
 
   # Convert the DEPS file to Git.
-  deps, baddeps = ConvertDepsToGit(deps, options.repos, options.type, deps_vars,
-                                   svn_deps_vars, options.verify)
+  deps, baddeps = ConvertDepsToGit(deps, options.repos, options.workspace,
+                                   options.type, deps_vars, svn_deps_vars,
+                                   options.verify)
   for os_dep in deps_os:
     deps_os[os_dep], os_bad_deps = ConvertDepsToGit(deps_os[os_dep],
-                                       options.repos, options.type, deps_vars,
-                                       svn_deps_vars, options.verify)
+                                       options.repos, options.workspace,
+                                       options.type, deps_vars, svn_deps_vars,
+                                       options.verify)
     baddeps = baddeps.union(os_bad_deps)
 
   if baddeps:
     print >>sys.stderr, ('\nUnable to resolve the following repositories. '
         'Please make sure\nthat any svn URLs have a git mirror associated with '
         'them.\nTo see the exact error, run `git ls-remote [repository]` where'
         '\n[repository] is the URL ending in .git (strip off the @revision\n'
         'number.) For more information, visit http://code.google.com\n'
         '/p/chromium/wiki/UsingNewGit#Adding_new_repositories_to_DEPS.\n')
     for dep in baddeps:
       print >>sys.stderr, ' ' + dep
     return 2
   else:
     if options.verify:
       print >>sys.stderr, ('\nAll referenced repositories were successfully '
                            'resolved.')
       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())