Make fetch run svn ls for svn repos behind git-svn configs.

fetch.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """
 Tool to perform checkouts in one easy command line!
 
 Usage:
   fetch <recipe> [--property=value [--property2=value2 ...]]
@@ skipping 57 matching lines @@
 
 
 class GitCheckout(Checkout):
 
   def run_git(self, *cmd, **kwargs):
     print 'Running: git %s' % ' '.join(pipes.quote(x) for x in cmd)
     if not self.dryrun:
       return subprocess.check_call(('git',) + cmd, **kwargs)
 
 
-class GclientGitSvnCheckout(GclientCheckout, GitCheckout):
+class SvnCheckout(Checkout):
+
+  def run_svn(self, *cmd, **kwargs):
+    print 'Running: svn %s' % ' '.join(pipes.quote(x) for x in cmd)
+    if not self.dryrun:
+      return subprocess.check_call(('svn',) + cmd, **kwargs)
+
+
+class GclientGitSvnCheckout(GclientCheckout, GitCheckout, SvnCheckout):
 
   def __init__(self, dryrun, spec, root):
     super(GclientGitSvnCheckout, self).__init__(dryrun, spec, root)
     assert 'solutions' in self.spec
     keys = ['solutions', 'target_os', 'target_os_only']
     gclient_spec = '\n'.join('%s = %s' % (key, self.spec[key])
                              for key in self.spec if key in keys)
     self.spec['gclient_spec'] = gclient_spec
     assert 'svn_url' in self.spec
     assert 'svn_branch' in self.spec
     assert 'svn_ref' in self.spec
 
   def exists(self):
     return os.path.exists(os.path.join(os.getcwd(), self.root))
 
   def init(self):
+    # Ensure we are authenticated with subversion for all submodules.
+    git_svn_dirs = json.loads(self.spec.get('submodule_git_svn_spec', '{}'))
+    git_svn_dirs.update({self.root: self.spec})
+    for _, svn_spec in git_svn_dirs.iteritems():
+      try:
+        self.run_svn('ls', '--non-interactive', svn_spec['svn_url'])
+      except subprocess.CalledProcessError:
+        print 'Please run `svn ls %s`' % svn_spec['svn_url']
+        return 1
+
     # Configure and do the gclient checkout.
     self.run_gclient('config', '--spec', self.spec['gclient_spec'])
     self.run_gclient('sync')
 
     # Configure git.
     wd = os.path.join(self.base, self.root)
     if self.dryrun:
-      print "cd %s" % wd
+      print 'cd %s' % wd
     self.run_git(
         'submodule', 'foreach',
         'git config -f $toplevel/.git/config submodule.$name.ignore all',
         cwd=wd)
     self.run_git('config', 'diff.ignoreSubmodules', 'all', cwd=wd)
 
     # Configure git-svn.
-    self.run_git('svn', 'init', '--prefix=origin/', '-T',
-                 self.spec['svn_branch'], self.spec['svn_url'], cwd=wd)
-    self.run_git('config', 'svn-remote.svn.fetch', self.spec['svn_branch'] +
-                 ':refs/remotes/origin/' + self.spec['svn_ref'], cwd=wd)
-    self.run_git('svn', 'fetch', cwd=wd)
+    for path, svn_spec in git_svn_dirs.iteritems():
+      real_path = os.path.join(*path.split('/'))
+      if real_path != self.root:
+        real_path = os.path.join(self.root, real_path)
+      wd = os.path.join(self.base, real_path)
+      if self.dryrun:
+        print 'cd %s' % wd
+      self.run_git('svn', 'init', '--prefix=origin/', '-T',
+                   svn_spec['svn_branch'], svn_spec['svn_url'], cwd=wd)
+      self.run_git('config', '--replace', 'svn-remote.svn.fetch',
+                   svn_spec['svn_branch'] + ':refs/remotes/origin/' +
+                   svn_spec['svn_ref'], cwd=wd)
+      self.run_git('svn', 'fetch', cwd=wd)
 
-    # Configure git-svn submodules, if any.
-    submodules = json.loads(self.spec.get('submodule_git_svn_spec', '{}'))
-    for path, subspec in submodules.iteritems():
-      subspec = submodules[path]
-      ospath = os.path.join(*path.split('/'))
-      wd = os.path.join(self.base, self.root, ospath)
-      if self.dryrun:
-        print "cd %s" % wd
-      self.run_git('svn', 'init', '--prefix=origin/', '-T',
-                   subspec['svn_branch'], subspec['svn_url'], cwd=wd)
-      self.run_git('config', '--replace', 'svn-remote.svn.fetch',
-                   subspec['svn_branch'] + ':refs/remotes/origin/' +
-                   subspec['svn_ref'], cwd=wd)
-      self.run_git('svn', 'fetch', cwd=wd)
 
 
 CHECKOUT_TYPE_MAP = {
     'gclient':         GclientCheckout,
     'gclient_git_svn': GclientGitSvnCheckout,
     'git':             GitCheckout,
 }
 
 
 def CheckoutFactory(type_name, dryrun, spec, root):
@@ skipping 78 matching lines @@
   checkout_type = spec['type']
   checkout_spec = spec['%s_spec' % checkout_type]
   try:
     checkout = CheckoutFactory(checkout_type, dryrun, checkout_spec, root)
   except KeyError:
     return 1
   if checkout.exists():
     print 'You appear to already have this checkout.'
     print 'Aborting to avoid clobbering your work.'
     return 1
-  checkout.init()
-  return 0
+  return checkout.init()
 
 
 def main():
   dryrun, recipe, props = handle_args(sys.argv)
   spec, root = run_recipe_fetch(recipe, props)
   return run(dryrun, spec, root)
 
 
 if __name__ == '__main__':
   sys.exit(main())