gclient: in managed mode, warn if .gclient has a mismatched URL

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 1202 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')
+
+    for dep in self.dependencies:
+      if dep.managed:
+        scm = gclient_scm.CreateSCM(dep.url, self.root_dir, dep.name)
+        if not scm.DoesRemoteURLMatch():
+          actual_url = scm.GetActualRemoteURL()
+          raise gclient_utils.Error('''
+Your .gclient file seems to be broken. The requested URL is different from what
+is actually checked out in %s:
+
+Expected: %s
+Actual:   %s

[iannucci, 2014/03/13 18:27:27]

I would also list the SCM which we would have selected in either case.

[borenet, 2014/03/13 18:57:25]

Done.

+
+If you're managing your own git checkout in %s but the URL in .gclient is for
+an svn repository, you probably want to set 'managed': False in .gclient.

[iannucci, 2014/03/13 18:27:27]

do we also want to advise that they correct the url to be git?

[borenet, 2014/03/13 18:57:25]

Sure, but the URL doesn't matter in unmanaged mode.

+Otherwise, you should ensure that the URL listed in .gclient is correct and
+either change it or fix the checkout.
+'''  % (os.path.join(self.root_dir, dep.name), dep.url, actual_url, dep.name))
+
     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 454 matching lines @@
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
 
   if options.revisions and options.head:
     # TODO(maruel): Make it a parser.error if it doesn't break any builder.
     print('Warning: you cannot use both --head and --revision')
 
   if options.verbose:
     # Print out the .gclient file.  This is longer than if we just printed the
     # client dict, but more legible, and it might contain helpful comments.
     print(client.config_content)
+
   ret = client.RunOnDeps('update', args)
   if options.output_json:
     slns = {}
     for d in client.subtree(True):
       normed = d.name.replace('\\', '/').rstrip('/') + '/'
       slns[normed] = {
           'revision': d.got_revision,
           'scm': d.used_scm.name if d.used_scm else None,
       }
     with open(options.output_json, 'wb') as f:
@@ skipping 214 matching lines @@
     raise
   except (gclient_utils.Error, subprocess2.CalledProcessError), 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: