gclient: Change the .gclient URL mismatch warning into an error.

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 1034 matching lines @@
     self.config_content = None
 
   def _CheckConfig(self):
     """Verify that the config matches the state of the existing checked-out
     solutions."""
     for dep in self.dependencies:
       if dep.managed and dep.url:
         scm = gclient_scm.CreateSCM(dep.url, self.root_dir, dep.name)
         actual_url = scm.GetActualRemoteURL()
         if actual_url and not scm.DoesRemoteURLMatch():
-          gclient_utils.AddWarning('''
-################################################################################
-################################### WARNING! ###################################
-################################################################################
-
+          raise gclient_utils.Error('''
 Your .gclient file seems to be broken. The requested URL is different from what
-is actually checked out in %(checkout_path)s. In the future this will be an
-error.
+is actually checked out in %(checkout_path)s.
 
 Expected: %(expected_url)s (%(expected_scm)s)
 Actual:   %(actual_url)s (%(actual_scm)s)
 
 You should ensure that the URL listed in .gclient is correct and either change
 it or fix the checkout. If you're managing your own git checkout in
 %(checkout_path)s but the URL in .gclient is for an svn repository, you probably
 want to set 'managed': False in .gclient.
-
-################################################################################
-################################################################################
-################################################################################
 '''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
         'expected_url': dep.url,
         'expected_scm': gclient_scm.GetScmName(dep.url),
         'actual_url': actual_url,
         'actual_scm': gclient_scm.GetScmName(actual_url)})
 
   def SetConfig(self, content):
     assert not self.dependencies
     config_dict = {}
     self.config_content = content
@@ skipping 162 matching lines @@
 
   def RunOnDeps(self, command, args, ignore_requirements=False, progress=True):
     """Runs a command on each dependency in a client and its dependencies.
 
     Args:
       command: The command to use (e.g., 'status' or 'diff')
       args: list of str - extra arguments to add to the command line.
     """
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
+
+    self._CheckConfig()
+
     revision_overrides = {}
     # It's unnecessary to check for revision overrides for 'recurse'.
     # Save a few seconds by not calling _EnforceRevisions() in that case.
     if command not in ('diff', 'recurse', 'runhooks', 'status'):
       revision_overrides = self._EnforceRevisions()
     pm = None
     # Disable progress for non-tty stdout.
     if (sys.stdout.isatty() and not self._options.verbose and progress):
       if command in ('update', 'revert'):
         pm = Progress('Syncing projects', 1)
@@ skipping 54 matching lines @@
             print(('\nWARNING: \'%s\' is no longer part of this client.  '
                    'It is recommended that you manually remove it.\n') %
                       entry_fixed)
           else:
             # Delete the entry
             print('\n________ deleting \'%s\' in \'%s\'' % (
                 entry_fixed, self.root_dir))
             gclient_utils.rmtree(e_dir)
       # record the current list of entries for next time
       self._SaveEntries()
-    self._CheckConfig()
     return 0
 
   def PrintRevInfo(self):
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
     # Load all the settings.
     work_queue = gclient_utils.ExecutionQueue(self._options.jobs, None, False)
     for s in self.dependencies:
       work_queue.enqueue(s)
     work_queue.flush({}, None, [], options=self._options)
@@ skipping 616 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: