Fix "No SCM found for url None" error that can occur after update...

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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
@@ skipping 717 matching lines @@
     # hooks.
     if not self._options.nohooks:
       self.RunHooksRecursively(self._options)
 
     if command == 'update':
       # Notify the user if there is an orphaned entry in their working copy.
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
       entries = [i.name for i in self.tree(False)]
       for entry, prev_url in self._ReadEntries().iteritems():
+        if prev_url is None:

[M-A Ruel, 2010/10/14 01:51:30]

I'll change it for "if not prev_url:"

+            # entry must have been overridden via .gclient custom_deps
+            continue
         # Fix path separator on Windows.
         entry_fixed = entry.replace('/', os.path.sep)
         e_dir = os.path.join(self.root_dir(), entry_fixed)
         # Use entry and not entry_fixed there.
         if entry not in entries and os.path.exists(e_dir):
           file_list = []
           scm = gclient_scm.CreateSCM(prev_url, self.root_dir(), entry_fixed)
           scm.status(self._options, [], file_list)
           modified_files = file_list != []
           if not self._options.delete_unversioned_trees or modified_files:
@@ skipping 489 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: