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 93 matching lines @@
   if (git_url.startswith('https://chromium.googlesource.com/external/pefile')
       and int(svn_rev) == 63):
     return '1ceaa279daa62b71e3431e58f68be6a96dd1519a'
 
   try:
     return git_tools.Search(git_repo_path, svn_rev, mirror, refspec, git_url)
   except Exception:
     print >> sys.stderr, '%s <-> ERROR' % git_repo_path
     raise
 
-def ConvertDepsToGit(deps, options, deps_vars, svn_deps_vars, svn_to_git_objs,
-                     deps_overrides):
+def ConvertDepsToGit(deps, options, deps_vars, svn_to_git_objs):
   """Convert a 'deps' section in a DEPS file from SVN to Git."""
   new_deps = {}
   bad_git_urls = set([])
   bad_dep_urls = []
   bad_override = []
   bad_git_hash = []
 
   # Populate our deps list.
   deps_to_process = {}
   for dep, dep_url in deps.iteritems():
@@ skipping 55 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 and deps_overrides[dep]:
-        # Transfer any required variables over from SVN DEPS.
-        if not deps_overrides[dep] in svn_deps_vars:
+      # Pass-through the hash for Git repositories. Resolve the hash for
+      # subversion repositories.
+      if dep_url.endswith('.git'):
+        git_hash = '@%s' % dep_rev
+      else:
+        try:
+          git_hash = '@%s' % SvnRevToGitHash(
+              dep_rev, git_url, options.repos, options.workspace, path,
+              git_host, svn_branch, options.cache_dir)
+        except Exception as e:
           if options.no_fail_fast:
-            bad_override.append(deps_overrides[dep])
+            bad_git_hash.append(e)
             continue
-          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])
-      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:
-          try:
-            git_hash = '@%s' % SvnRevToGitHash(
-                dep_rev, git_url, options.repos, options.workspace, path,
-                git_host, svn_branch, options.cache_dir)
-          except Exception as e:
-            if options.no_fail_fast:
-              bad_git_hash.append(e)
-              continue
-            raise
+          raise
 
     # 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'
 
     # Hack to preserve the angle_revision variable in .DEPS.git.
     # This will go away as soon as deps2git does.
     if dep == 'src/third_party/angle' and git_hash:
       # Cut the leading '@' so this variable has the same semantics in
@@ skipping 28 matching lines @@
   parser.add_option('--no_fail_fast', action='store_true',
                     help='Try to process the whole DEPS, rather than failing '
                     'on the first bad entry.')
   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',
   }
 
   # Find and load svn_to_git_* modules that handle the URL mapping.
   svn_to_git_objs = [svn_to_git_public]
-  deps_overrides = getattr(svn_to_git_public, 'DEPS_OVERRIDES', {}).copy()
   if options.extra_rules:
     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_mod = __import__(rules_file_base)
     svn_to_git_objs.insert(0, svn_to_git_mod)
-    # Allow extra_rules file to override rules in svn_to_git_public.
-    deps_overrides.update(getattr(svn_to_git_mod, 'DEPS_OVERRIDES', {}))
 
   # If a workspace parameter is given, and a .gclient file is present, limit
   # DEPS conversion to only the repositories that are actually used in this
   # checkout.  Also, if a cache dir is specified in .gclient, honor it.
   if options.workspace and os.path.exists(
       os.path.join(options.workspace, '.gclient')):
     gclient_file = os.path.join(options.workspace, '.gclient')
     gclient_dict = {}
     try:
       execfile(gclient_file, {}, gclient_dict)
     except IOError:
       print >> sys.stderr, 'Could not open %s' % gclient_file
       raise
     except SyntaxError:
       print >> sys.stderr, 'Could not parse %s' % gclient_file
       raise
     target_os = gclient_dict.get('target_os', [])
     if not target_os or not gclient_dict.get('target_os_only'):
       target_os.append(DEPS_OS_CHOICES.get(sys.platform, 'unix'))
     if 'all' not in target_os:
       deps_os = dict([(k, v) for k, v in deps_os.iteritems() if k in target_os])
     if not options.cache_dir and 'cache_dir' in gclient_dict:
       options.cache_dir = os.path.abspath(gclient_dict['cache_dir'])
 
   # Do general pre-processing of the DEPS data.
   for svn_git_converter in svn_to_git_objs:
     if hasattr(svn_git_converter, 'CleanDeps'):
       svn_git_converter.CleanDeps(deps, deps_os, include_rules,
-                                  skip_child_includes, hooks, svn_deps_vars)
+                                  skip_child_includes, hooks)
 
   # Convert the DEPS file to Git.
   deps, baddeps, badmaps, badvars, badhashes = ConvertDepsToGit(
-      deps, options, deps_vars, svn_deps_vars, svn_to_git_objs, deps_overrides)
+      deps, options, deps_vars, svn_to_git_objs)
   for os_dep in deps_os:
     result = ConvertDepsToGit(deps_os[os_dep], options, deps_vars,
-                              svn_deps_vars, svn_to_git_objs, deps_overrides)
+                              svn_to_git_objs)
     deps_os[os_dep] = result[0]
     baddeps = baddeps.union(result[1])
     badmaps.extend(result[2])
     badvars.extend(result[3])
     badhashes.extend(result[4])
 
   if options.json:
     with open(options.json, 'w') as f:
       json.dump(list(baddeps), f, sort_keys=True, indent=2)
 
@@ skipping 28 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())