Remove special case svn to git translations for FFmpeg.

deps_utils.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.
 
 """Utilities for formatting and writing DEPS files."""
 
 import errno
 import os
-import re
 import shutil
 import subprocess
 import sys
 import time
 
-# Used by Varify() to automatically convert variable names tagged with this
-# prefix into Var('<variable name>').
-VARIFY_MARKER_TAG_PREFIX = 'VARIFY_MARKER_TAG_'
-
 
 class VarImpl(object):
   """Implement the Var function used within the DEPS file."""
 
   def __init__(self, local_scope):
     self._local_scope = local_scope
 
   def Lookup(self, var_name):
     """Implements the Var syntax."""
     if var_name in self._local_scope.get('vars', {}):
@@ skipping 14 matching lines @@
       'include_rules': [],
       'skip_child_includes': [],
       'hooks': [],
   }
   exec(content, global_scope, local_scope)
   local_scope.setdefault('deps', {})
   local_scope.setdefault('deps_os', {})
   local_scope.setdefault('include_rules', [])
   local_scope.setdefault('skip_child_includes', [])
   local_scope.setdefault('hooks', [])
-  local_scope.setdefault('vars', {})
 
   return (local_scope['deps'], local_scope['deps_os'],
           local_scope['include_rules'], local_scope['skip_child_includes'],
-          local_scope['hooks'], local_scope['vars'])
+          local_scope['hooks'])
 
 
 def PrettyDeps(deps, indent=0):
   """Stringify a deps dictionary in a pretty way."""
   pretty = ' ' * indent
   pretty += '{\n'
 
   indent += 4
 
   for item in sorted(deps):
@@ skipping 29 matching lines @@
 def Varify(deps):
   """Replace all instances of our git server with a git_url var."""
   deps = deps.replace(
       '\'https://chromium.googlesource.com/chromium/blink.git',
       'Var(\'webkit_url\')')
   deps = deps.replace(
       '\'https://chromium.googlesource.com', 'Var(\'git_url\') + \'')
   deps = deps.replace(
       '\'https://git.chromium.org', 'Var(\'git_url\') + \'')
   deps = deps.replace('VAR_WEBKIT_REV\'', ' + Var(\'webkit_rev\')')
-
-  # Try to replace all instances of form "marker_prefix_<name>'" with
-  # "' + Var('<name>')".  If there are no matches, nothing is done.
-  deps = re.sub(VARIFY_MARKER_TAG_PREFIX + '_(\w+)\'',
-                lambda match: '\' + Var(\'%s\')' % match.group(1), deps)
   return deps
 
 
 def WriteDeps(deps_file_name, deps_vars, deps, deps_os, include_rules,
               skip_child_includes, hooks):
   """Given all the sections in a DEPS file, write it to disk."""
   new_deps = ('# DO NOT EDIT EXCEPT FOR LOCAL TESTING.\n'
               '# THIS IS A GENERATED FILE.\n',
               '# ALL MANUAL CHANGES WILL BE OVERWRITTEN.\n',
               '# SEE http://code.google.com/p/chromium/wiki/UsingGit\n',
@@ skipping 91 matching lines @@
     # For POSIX:  making the directory writable guarantees removability.
     # Windows will ignore the non-read-only bits in the chmod value.
     os.chmod(root, 0770)
     for name in files:
       remove_with_retry(os.remove, os.path.join(root, name))
     for name in dirs:
       remove_with_retry(lambda p: shutil.rmtree(p, onerror=RmTreeOnError),
                         os.path.join(root, name))
 
   remove_with_retry(os.rmdir, file_path)