Add non-git-svn checkout to fetch.py.

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 48 matching lines @@
 
 class GclientCheckout(Checkout):
 
   def run_gclient(self, *cmd, **kwargs):
     print 'Running: gclient %s' % ' '.join(pipes.quote(x) for x in cmd)
     if not self.dryrun:
       return subprocess.check_call(
           (sys.executable, os.path.join(SCRIPT_PATH, 'gclient.py')) + cmd,
           **kwargs)
 
+  def exists(self):

[Dirk Pranke, 2013/04/06 01:45:25]

I know this name was already chosen, but it's not very good :) Can we rename
this to CheckoutAlreadyExists() or something? We should also consider checking
if a '.gclient' file exists in the cwd.

+    return os.path.exists(os.path.join(os.getcwd(), self.root))

[iannucci, 2013/04/06 01:38:18]

Let's make self.root abspath from the initial set.

+
 
 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 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 GclientGitCheckout(GclientCheckout, GitCheckout):
+
+  def __init__(self, dryrun, spec, root):
+    super(GclientGitCheckout, 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)

[iannucci, 2013/04/06 01:38:18]

This should be a function (spec'ifying a dict).

+    self.spec['gclient_spec'] = gclient_spec
+
+  def init(self):

[iannucci, 2013/04/06 01:38:18]

This should call super.

+    # TODO(dpranke): Work around issues w/ delta compression on big repos.
+    self.run_git('config', '--global', 'core.deltaBaseCacheLimit', '1G')

[iannucci, 2013/04/06 01:38:18]

*grumble*

+
+    # 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
+    self.run_git(

[iannucci, 2013/04/06 01:38:18]

run_git should print cwd on dryrun... don't need to do it specially here

+        'submodule', 'foreach',
+        'git config -f $toplevel/.git/config submodule.$name.ignore all',
+        cwd=wd)
+    self.run_git('config', 'diff.ignoreSubmodules', 'all', cwd=wd)
+
+
 class GclientGitSvnCheckout(GclientCheckout, GitCheckout, SvnCheckout):

[Dirk Pranke, 2013/04/06 01:45:25]

Should this inherit from GclientGitCheckout instead of GclientCheckout and
GitCheckout?

 
   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
-
     # TODO(dpranke): Work around issues w/ delta compression on big repos.
     self.run_git('config', '--global', 'core.deltaBaseCacheLimit', '1G')
 
     # 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
     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)

[iannucci, 2013/04/06 01:38:18]

This should be a call to super

 
     # Configure git-svn.
+    git_svn_dirs = json.loads(self.spec.get('submodule_git_svn_spec', '{}'))
+    git_svn_dirs.update({self.root: self.spec})
     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)
 
 
-
 CHECKOUT_TYPE_MAP = {
     'gclient':         GclientCheckout,
+    'gclient_git':     GclientGitCheckout,
     'gclient_git_svn': GclientGitSvnCheckout,
     'git':             GitCheckout,
 }
 
 
 def CheckoutFactory(type_name, dryrun, spec, root):
   """Factory to build Checkout class instances."""
   class_ = CHECKOUT_TYPE_MAP.get(type_name)
   if not class_:
     raise KeyError('unrecognized checkout type: %s' % type_name)
   return class_(dryrun, spec, root)
 
 
 #################################################
 # Utility function and file entry point.
 #################################################
 def usage(msg=None):
   """Print help and exit."""
   if msg:
     print 'Error:', msg
 
   print (
 """
 usage: %s [-n|--dry-run] <recipe> [--property=value [--property2=value2 ...]]
 """ % os.path.basename(sys.argv[0]))

[Dirk Pranke, 2013/04/06 01:45:25]

Since we're hacking here, we should add in a comment about --anonymous=true here
for now, and fix this down the road w/ proper arg parsing (which would not
require the '=true' part). Please make sure the usage mentions something about 
non-committer or non-commit so that it's clearer that anonymous is also for
people who are contributors who might have accounts but aren't yet committers.

   sys.exit(bool(msg))
 
 
 def handle_args(argv):
   """Gets the recipe name from the command line arguments."""
   if len(argv) <= 1:
     usage('Must specify a recipe.')
   if argv[1] in ('-h', '--help', 'help'):
     usage()
 
@@ skipping 60 matching lines @@
 
 
 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())