Revert "Un-revert the reverted 28058, so that we get quiet again."

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 8cf32d64619c5faa08de94549f2507445d37720a..fba971cea1e93c628b150308796fde4889df52bb 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -251,7 +251,7 @@ class SVNWrapper(SCMWrapper):
       command = ['checkout', url, checkout_path]
       if revision:
         command.extend(['--revision', str(revision)])
-      RunSVNAndGetFileList(options, command, self._root_dir, file_list)
+      RunSVNAndGetFileList(command, self._root_dir, file_list)
       return
 
     # Get the existing scm url and the revision number of the current checkout.
@@ -262,12 +262,12 @@ class SVNWrapper(SCMWrapper):
                                 "and try again." %
                                 checkout_path)
 
-    # Retrieve the current HEAD version because svn is slow at null updates.
-    if not revision:
-      from_info_live = CaptureSVNInfo(from_info['URL'], '.')
-      revision = str(from_info_live['Revision'])
-      rev_str = ' at %s' % revision
-      forced_revision = True
+    if options.manually_grab_svn_rev:
+      # Retrieve the current HEAD version because svn is slow at null updates.
+      if not revision:
+        from_info_live = CaptureSVNInfo(from_info['URL'], '.')
+        revision = str(from_info_live['Revision'])
+        rev_str = ' at %s' % revision
 
     if from_info['URL'] != components[0]:
       to_info = CaptureSVNInfo(url, '.')
@@ -309,7 +309,7 @@ class SVNWrapper(SCMWrapper):
         command = ['checkout', url, checkout_path]
         if revision:
           command.extend(['--revision', str(revision)])
-        RunSVNAndGetFileList(options, command, self._root_dir, file_list)
+        RunSVNAndGetFileList(command, self._root_dir, file_list)
         return
 
 
@@ -323,7 +323,7 @@ class SVNWrapper(SCMWrapper):
     command = ["update", checkout_path]
     if revision:
       command.extend(['--revision', str(revision)])
-    RunSVNAndGetFileList(options, command, self._root_dir, file_list)
+    RunSVNAndGetFileList(command, self._root_dir, file_list)
 
   def revert(self, options, args, file_list):
     """Reverts local modifications. Subversion specific.
@@ -374,7 +374,7 @@ class SVNWrapper(SCMWrapper):
     try:
       # svn revert is so broken we don't even use it. Using
       # "svn up --revision BASE" achieve the same effect.
-      RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path, 
+      RunSVNAndGetFileList(['update', '--revision', 'BASE'], path,
                            file_list)
     except OSError, e:
       # Maybe the directory disapeared meanwhile. We don't want it to throw an
@@ -396,7 +396,7 @@ class SVNWrapper(SCMWrapper):
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
-      RunSVNAndGetFileList(options, command, path, file_list)
+      RunSVNAndGetFileList(command, path, file_list)
 
   def pack(self, options, args, file_list):
     """Generates a patch file which can be applied to the root of the
@@ -546,7 +546,7 @@ def CaptureSVN(args, in_directory=None, print_error=True):
                           stderr=stderr).communicate()[0]
 
 
-def RunSVNAndGetFileList(options, args, in_directory, file_list):
+def RunSVNAndGetFileList(args, in_directory, file_list):
   """Runs svn checkout, update, or status, output to stdout.
 
   The first item in args must be either "checkout", "update", or "status".
@@ -556,7 +556,6 @@ def RunSVNAndGetFileList(options, args, in_directory, file_list):
   sys.stdout as in RunSVN.
 
   Args:
-    options: command line options to gclient
     args: A sequence of command line parameters to be passed to svn.
     in_directory: The directory where svn is to be run.
 
@@ -596,7 +595,7 @@ def RunSVNAndGetFileList(options, args, in_directory, file_list):
 
   RunSVNAndFilterOutput(args,
                         in_directory,
-                        options.verbose,
+                        True,
                         True,
                         CaptureMatchingLines)