[depot_tools] Disabling new git checkouts with safesync_urls until fixed.

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 901 matching lines @@
   def _EnforceRevisions(self):
     """Checks for revision overrides."""
     revision_overrides = {}
     if self._options.head:
       return revision_overrides
     # Do not check safesync_url if one or more --revision flag is specified.
     if not self._options.revisions:
       for s in self.dependencies:
         if not s.managed:
           self._options.revisions.append('%s@unmanaged' % s.name)
         elif s.safesync_url:

[M-A Ruel, 2011/12/21 18:31:02]

I'd rather move everything in this condition into the function.

[Dan Beam, 2011/12/21 20:20:11]

Done.

           handle = urllib.urlopen(s.safesync_url)
           rev = handle.read().strip()
           handle.close()
-          scm = gclient_scm.CreateSCM(s.url, s.root.root_dir, s.name)
-          safe_rev = scm.GetUsableRev(rev=rev, options=self._options)
-          if not safe_rev:
+          if not len(rev):
             raise gclient_utils.Error(
-                'Despite our best attempts, we couldn\'t find a useful\n'
-                'safesync_url revision for you.')
-          if self._options.verbose:
-            print('Using safesync_url revision: %s.\n' % safe_rev)
-          self._options.revisions.append('%s@%s' % (s.name, safe_rev))
+                'It appears your safesync_url (%s) is not working properly\n'
+                '(as it returned an empty response). Check your config.' %
+                s.safesync_url)
+          # If the content of the safesync_url appears to be an SVN rev and the
+          # URL of the source appears to be git, we can only attempt to find out
+          # if a revision is useful after we've cloned the original URL.
+          elif (rev.isdigit() and len(rev) < 7 and
+                not os.path.isdir(os.path.join(s.root.root_dir, s.name)) and

[M-A Ruel, 2011/12/21 18:31:02]

I'd rather have GetUsableRev() handles that, it'd be much cleaner.

[Dan Beam, 2011/12/21 20:20:11]

Done.

+                gclient_scm.GetScmName(s.url) == 'git'):
+            print('Checking out new git dependencies (%s) with an SVN\n'
+                  'safesync_url (%s) isn\'t currently supported. Ignoring the\n'
+                  'safesync_url during initial checkout.\n' %
+                  (s.url, s.safesync_url))
+          else:
+            self._ApplySafeSyncRev(dependency=s, rev=rev)
     if not self._options.revisions:
       return revision_overrides
     solutions_names = [s.name for s in self.dependencies]
     index = 0
     for revision in self._options.revisions:
       if not '@' in revision:
         # Support for --revision 123
         revision = '%s@%s' % (solutions_names[index], revision)
       sol, rev = revision.split('@', 1)
       if not sol in solutions_names:
         #raise gclient_utils.Error('%s is not a valid solution.' % sol)
         print >> sys.stderr, ('Please fix your script, having invalid '
                               '--revision flags will soon considered an error.')
       else:
         revision_overrides[sol] = rev
       index += 1
     return revision_overrides
 
+  def _ApplySafeSyncRev(self, dependency, rev):
+    """Find a valid revision from the content of the safesync_url and apply it

[M-A Ruel, 2011/12/21 18:31:02]

Finds

[Dan Beam, 2011/12/21 20:20:11]

Done.

+    by appending revisions to the revision list. Throws if revision appears to
+    be invalid for the given |dependency|."""
+    scm = gclient_scm.CreateSCM(dependency.url, dependency.root.root_dir,
+                                dependency.name)
+    safe_rev = scm.GetUsableRev(rev=rev, options=self._options)
+    if not safe_rev:
+      raise gclient_utils.Error(

[M-A Ruel, 2011/12/21 18:31:02]

You know that you are also raising inside GetUsableRev()? I think here is the
better place.

[Dan Beam, 2011/12/21 20:20:11]

Done.

+          'Despite our best attempts, we couldn\'t find a useful\n'
+          'safesync_url revision for you. Please check your config.')
+    if self._options.verbose:
+      print('Using safesync_url revision: %s.\n' % safe_rev)
+    self._options.revisions.append('%s@%s' % (dependency.name, safe_rev))
+
   def RunOnDeps(self, command, args):
     """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')
     revision_overrides = self._EnforceRevisions()
@@ skipping 561 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: