Retain original DEPS 'vars' in converted .DEPS.git.

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
 from cStringIO import StringIO
 import json
@@ skipping 292 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, deps_os, include_rules, skip_child_includes, hooks = (
+  deps, deps_os, include_rules, skip_child_includes, hooks, deps_vars = (
       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 RuntimeError('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 = {
+  deps_vars.update({
       '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]
   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)
 
@@ skipping 76 matching lines @@
     return 0
 
   # Write the DEPS file to disk.
   deps_utils.WriteDeps(options.out, deps_vars, results.new_deps, deps_os,
                        include_rules, skip_child_includes, hooks)
   return 0
 
 
 if '__main__' == __name__:
   sys.exit(main())