Skip MigrateConfigToGit if gclient config is non trivial.

gclient.py

 #!/usr/bin/env 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 1247 matching lines @@
                             '(trunk|branches/[^/]+)/src')
     old_git_re = re.compile('^(https?://git\.chromium\.org|'
                             'ssh://([a-zA-Z_][a-zA-Z0-9_-]*@)?'
                             'gerrit\.chromium\.org(:2941[89])?)/'
                             'chromium/src\.git')
     # Scan existing .gclient file for obsolete settings.  It would be simpler
     # to traverse self.dependencies, but working with the AST allows the code to
     # dump an updated .gclient file that preserves the ordering of the original.
     a = ast.parse(self.config_content, options.config_filename, 'exec')
     modified = False
+
+    # If non trivial gclient (e.g. includes an Import directive), skip this
+    # migration since it would crash either way.
+    if any(not hasattr(elem, 'targets') for elem in a.body):

[szager1, 2014/08/28 17:22:15]

Instead of this, I would prefer you modify the next line to be:

solutions = [elem for elem in a.body if elem.__class__ is ast.Assign and
'solutions' in [target.id for target in elem.targets]]

+      return self
+
     solutions = [elem for elem in a.body if 'solutions' in
                  [target.id for target in elem.targets]]
     if not solutions:
       return self
     solutions = solutions[-1]
     for solution in solutions.value.elts:
       # Check for obsolete URL's
       url_idx = ast_dict_index(solution, 'url')
       if url_idx == -1:
         continue
@@ skipping 916 matching lines @@
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
   finally:
     gclient_utils.PrintWarnings()
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: