Revert "Modify the output of gclient update, gclient status to only print out"

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 874 matching lines @@
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise Error("client not configured; see 'gclient config'")
   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.ConfigContent())
+  options.verbose = True
   return client.RunOnDeps('cleanup', args)
 
 
 def DoConfig(options, args):
   """Handle the config subcommand.
 
   Args:
     options: If options.spec set, a string providing contents of config file.
     args: The command line args.  If spec is not set,
           then args[0] is a string URL to get for config file.
@@ skipping 58 matching lines @@
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise Error("client not configured; see 'gclient config'")
   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.ConfigContent())
+  options.verbose = True
   return client.RunOnDeps('pack', args)
 
 
 def DoStatus(options, args):
   """Handle the status subcommand.
 
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise Error("client not configured; see 'gclient config'")
   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.ConfigContent())
+  options.verbose = True
   return client.RunOnDeps('status', args)
 
 
 def DoUpdate(options, args):
   """Handle the update and sync subcommands.
 
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
@@ skipping 34 matching lines @@
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise Error("client not configured; see 'gclient config'")
   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.ConfigContent())
+  options.verbose = True
   return client.RunOnDeps('diff', args)
 
 
 def DoRevert(options, args):
   """Handle the revert subcommand.
 
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
@@ skipping 79 matching lines @@
   option_parser.add_option("", "--deps", default=None, dest="deps_os",
                            metavar="OS_LIST",
                            help=("(update/sync only) sync deps for the "
                                  "specified (comma-separated) platform(s); "
                                  "'all' will sync all platforms"))
   option_parser.add_option("", "--spec", default=None,
                            help=("(config only) create a gclient file "
                                  "containing the provided string"))
   option_parser.add_option("", "--verbose", action="store_true", default=False,
                            help="produce additional output for diagnostics")
+  option_parser.add_option("", "--manually_grab_svn_rev", action="store_true",
+                           default=False,
+                           help="Skip svn up whenever possible by requesting "
+                                "actual HEAD revision from the repository")
   option_parser.add_option("", "--head", action="store_true", default=False,
                            help=("skips any safesync_urls specified in "
                                  "configured solutions"))
   option_parser.add_option("", "--delete_unversioned_trees",
                            action="store_true", default=False,
                            help=("on update, delete any unexpected "
                                  "unversioned trees that are in the checkout"))
 
   if len(argv) < 2:
     # Users don't need to be told to use the 'help' command.
@@ skipping 29 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: