Incremental changes towards more efficient refactoring of gclient.py

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.
 
 """A wrapper script to manage a set of client modules in different SCM.
 
 This script is intended to be used to help basic management of client
 program sources residing in one or more Subversion modules and Git
 repositories, along with other modules it depends on, also in Subversion or Git,
@@ skipping 139 matching lines @@
       """Implements the Var syntax."""
       if var_name in self._custom_vars:
         return self._custom_vars[var_name]
       elif var_name in self._local_scope.get("vars", {}):
         return self._local_scope["vars"][var_name]
       raise gclient_utils.Error("Var is not defined: %s" % var_name)
 
 
 class GClient(GClientKeywords):
   """Object that represent a gclient checkout."""
+  DEPS_FILE = 'DEPS'
 
   SUPPORTED_COMMANDS = [
     'cleanup', 'diff', 'export', 'pack', 'revert', 'status', 'update',
     'runhooks'
   ]
 
   DEPS_OS_CHOICES = {
     "win32": "win",
     "win": "win",
     "cygwin": "win",
     "darwin": "mac",
     "mac": "mac",
     "unix": "unix",
     "linux": "unix",
     "linux2": "unix",
   }
 
-  DEPS_FILE = 'DEPS'
-
   DEFAULT_CLIENT_FILE_TEXT = ("""\
 solutions = [
   { "name"        : "%(solution_name)s",
     "url"         : "%(solution_url)s",
     "custom_deps" : {
     },
     "safesync_url": "%(safesync_url)s"
   },
 ]
 """)
@@ skipping 844 matching lines @@
   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)
   options.force = True
   options.nohooks = False
   return client.RunOnDeps('runhooks', args)
 
 
 def CMDrevinfo(parser, args):
-  """Outputs details for every dependencies."""
-  parser.add_option("--deps", dest="deps_os", metavar="OS_LIST",
-                    help="override deps for the specified (comma-separated) "
-                         "platform(s); 'all' will process all deps_os "
-                         "references")
-  parser.add_option("-s", "--snapshot", action="store_true",
-                    help="create a snapshot file of the current "
-                         "version of all repositories")
+  """Output revision info mapping for the client and its dependencies.
+
+  This allows the capture of an overall "revision" for the source tree that
+  can be used to reproduce the same tree in the future. It is only useful for
+  "unpinned dependencies", i.e. DEPS/deps references without a svn revision
+  number or a git hash. A git branch name isn't "pinned" since the actual
+  commit can change.
+  """
+  parser.add_option('--deps', dest='deps_os', metavar='OS_LIST',
+                    help='override deps for the specified (comma-separated) '
+                         'platform(s); \'all\' will process all deps_os '
+                         'references')
+  parser.add_option('-s', '--snapshot', action='store_true',
+                    help='creates a snapshot .gclient file of the current '
+                         'version of all repositories to reproduce the tree, '
+                         'implies -a')
   (options, args) = parser.parse_args(args)
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise gclient_utils.Error("client not configured; see 'gclient config'")
   client.PrintRevInfo()
   return 0
 
 
 def Command(name):
   return getattr(sys.modules[__name__], 'CMD' + name, None)
@@ skipping 71 matching lines @@
     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: