Remove special case svn to git translations for FFmpeg.

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 collections
 import json
 import optparse
@@ skipping 54 matching lines @@
     else:
       refspec = 'refs/remotes/branch-heads/' + svn_branch_name
   else:
     if mirror:
       refspec = 'refs/heads/master'
     else:
       refspec = 'refs/remotes/origin/master'
 
   return git_tools.Search(git_repo_path, svn_rev, mirror, refspec, git_url)
 
-def ConvertDepsToGit(deps, options, deps_vars, svn_deps_vars):
+
+def ConvertDepsToGit(deps, options, deps_vars):
   """Convert a 'deps' section in a DEPS file from SVN to Git."""
   new_deps = {}
   bad_git_urls = set([])
 
   svn_to_git_objs = [svn_to_git_public]
   if options.extra_rules:

[szager1, 2014/03/07 23:04:53]

This is where extra svn_to_git_*.py modules are pulled in.

     rules_dir, rules_file = os.path.split(options.extra_rules)
     rules_file_base = os.path.splitext(rules_file)[0]
     sys.path.insert(0, rules_dir)
     svn_to_git_objs.insert(0, __import__(rules_file_base))
 
-  deps_overrides = {}
-  # Allow extra_rules file to override rules in public file.
-  for svn_to_git_obj in reversed(svn_to_git_objs):
-    deps_overrides.update(getattr(svn_to_git_obj, 'DEPS_OVERRIDES', {}))
-
   # Populate our deps list.
   deps_to_process = {}
   for dep, dep_url in deps.iteritems():
     if not dep_url:  # dep is 'None' and emitted to exclude the dep
       new_deps[dep] = None
       continue
 
     # Get the URL and the revision/hash for this dependency.
     dep_url, dep_rev = SplitScmUrl(deps[dep])
 
@@ skipping 45 matching lines @@
       except Queue.Empty:
         sec_since += 1
         line = ('Main> Heartbeat ping. We are still alive!! '
                 'Seconds since last output: %d sec' % sec_since)
       if line is None:
         num_threads -= 1
       else:
         print line
     pool.join()
 
-
   for dep, items in deps_to_process.iteritems():
     git_url, dep_url, path, git_host, dep_rev, svn_branch = items
     if options.verify:
       delay = 0.5
       success = False
       for try_index in range(1, 6):
         print >> sys.stderr, 'checking %s (try #%d) ...' % (git_url, try_index),
         if git_tools.Ping(git_url, verbose=True):
           print >> sys.stderr, ' success'
           success = True
           break
 
         print >> sys.stderr, ' failure'
         print >> sys.stderr, 'sleeping for %.01f seconds ...' % delay
         time.sleep(delay)
         delay *= 2
 
       if not success:
         bad_git_urls.update([git_url])
 
     # Get the Git hash based off the SVN rev.
     git_hash = ''
     if dep_rev != 'HEAD':
-      if dep in deps_overrides:
-        # Transfer any required variables over from SVN DEPS.
-        if not deps_overrides[dep] in svn_deps_vars:
-          raise Exception('Missing DEPS variable: %s' % deps_overrides[dep])
-        deps_vars[deps_overrides[dep]] = (
-            '@' + 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])
+      # Pass-through the hash for Git repositories. Resolve the hash for
+      # subversion repositories.
+      if dep_url.endswith('.git'):
+        git_hash = '@%s' % dep_rev
       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, options.cache_dir)
+        git_hash = '@%s' % SvnRevToGitHash(
+            dep_rev, git_url, options.repos, options.workspace, path,
+            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
@@ skipping 17 matching lines @@
                     help='top level of a gclient git cache diretory.')
   parser.add_option('-s', '--shallow', action='store_true',
                     help='Use shallow checkouts when populating cache dirs.')
   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
+  deps, deps_os, include_rules, skip_child_includes, hooks = (
+      deps_utils.GetDepsContent(options.deps))
 
   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.shallow and not options.cache_dir:
     parser.error('--shallow only supported with --cache_dir.')
 
   if options.cache_dir:
     options.cache_dir = os.path.abspath(options.cache_dir)
 
   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',
   }
 
   # Convert the DEPS file to Git.
-  deps, baddeps = ConvertDepsToGit(deps, options, deps_vars, svn_deps_vars)
+  deps, baddeps = ConvertDepsToGit(deps, options, deps_vars)

[szager1, 2014/03/07 22:43:53]

There might be other uses of svn_deps_vars besides ffmpeg, no?

[DaleCurtis, 2014/03/07 22:50:51]

None exist at this time AFAICT so it seems better to remove.  Is there any other
place these users could reside?

[szager1, 2014/03/07 23:04:53]

Yes, there are svn_to_git_*.py modules for internal code that may use
deps_overrides and svn_deps_vars.

[mmoss, 2014/03/07 23:27:18]

The only one I'm aware of doesn't have and DEPS_OVERRIDES.

[DaleCurtis, 2014/03/07 23:30:26]

Yeah, I checked that one and didn't see any.

   for os_dep in deps_os:
     deps_os[os_dep], os_bad_deps = ConvertDepsToGit(
-        deps_os[os_dep], options, deps_vars, svn_deps_vars)
+        deps_os[os_dep], options, deps_vars)
     baddeps = baddeps.union(os_bad_deps)
 
   if options.json:
     with open(options.json, 'w') as f:
       json.dump(list(baddeps), f, sort_keys=True, indent=2)
 
   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'
@@ skipping 10 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())