Improve testing with File() keyword, found a few bugs along the way

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 97 matching lines @@
         # sub deps base URL.
         if not isinstance(sub_deps_base_url, basestring):
           sub_deps_base_url = sub_deps_base_url.GetPath()
         scm = gclient_scm.CreateSCM(sub_deps_base_url, root_dir,
                                     None)
         url = scm.FullUrlForRelativeUrl(url)
       return url
 
   class FileImpl(object):
     """Used to implement the File('') syntax which lets you sync a single file
-    from an SVN repo."""
+    from a SVN repo."""
 
     def __init__(self, file_location):
       self.file_location = file_location
 
     def __str__(self):
       return 'File("%s")' % self.file_location
 
     def GetPath(self):
       return os.path.split(self.file_location)[0]
 
@@ skipping 485 matching lines @@
         pm.update()
       if type(deps[d]) == str:
         url = deps[d]
         entries[d] = url
         if run_scm:
           self._options.revision = revision_overrides.get(d)
           scm = gclient_scm.CreateSCM(url, self.root_dir(), d)
           scm.RunCommand(command, self._options, args, file_list)
           self._options.revision = None
       elif isinstance(deps[d], self.FileImpl):
+        if command in (None, 'cleanup', 'diff', 'pack', 'status'):
+          continue
         file_dep = deps[d]
         self._options.revision = file_dep.GetRevision()
         if run_scm:
-          scm = gclient_scm.CreateSCM(file_dep.GetPath(), self.root_dir(), d)
-          scm.RunCommand("updatesingle", self._options,
+          scm = gclient_scm.SVNWrapper(file_dep.GetPath(), self.root_dir(), d)
+          scm.RunCommand('updatesingle', self._options,
                          args + [file_dep.GetFilename()], file_list)
 
     if command == 'update' and not self._options.verbose:
       pm.end()
 
     # Second pass for inherited deps (via the From keyword)
     for d in deps_to_process:
       if isinstance(deps[d], self.FromImpl):
         # Getting the URL from the sub_deps file can involve having to resolve
         # a File() or having to resolve a relative URL.  To resolve relative
@@ skipping 521 matching lines @@
     def Parse(args):
       (options, args) = old_parser(args)
       level = None
       if options.verbose == 2:
         level = logging.INFO
       elif options.verbose > 2:
         level = logging.DEBUG
       logging.basicConfig(level=level,
           format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
       options.entries_filename = options.config_filename + '_entries'
+
+      # These hacks need to die.
       if not hasattr(options, 'revisions'):
         # GClient.RunOnDeps expects it even if not applicable.
         options.revisions = []
       if not hasattr(options, 'head'):
         options.head = None
       if not hasattr(options, 'nohooks'):
         options.nohooks = True
       if not hasattr(options, 'deps_os'):
         options.deps_os = None
+      if not hasattr(options, 'manually_grab_svn_rev'):
+        options.manually_grab_svn_rev = None
+      if not hasattr(options, 'force'):
+        options.force = None
       return (options, args)
     parser.parse_args = Parse
     # We don't want wordwrapping in epilog (usually examples)
     parser.format_epilog = lambda _: parser.epilog or ''
     if argv:
       command = Command(argv[0])
       if command:
         # 'fix' the usage and the description now that we know the subcommand.
         GenUsage(parser, argv[0])
         return command(parser, argv[1:])
     # Not a known command. Default to help.
     GenUsage(parser, 'help')
     return CMDhelp(parser, argv)
   except gclient_utils.Error, 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: