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

gclient_scm.py

 # Copyright 2009 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
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 233 matching lines @@
 
     rev_str = ""
     if revision:
       rev_str = ' at %s' % revision
 
     if not os.path.exists(checkout_path):
       # We need to checkout.
       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.
     from_info = CaptureSVNInfo(os.path.join(checkout_path, '.'), '.')
     if not from_info:
       raise gclient_utils.Error("Can't update/checkout %r if an unversioned "
                                 "directory is present. Delete the directory "
                                 "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, '.')
       if not to_info.get('Repository Root') or not to_info.get('UUID'):
         # The url is invalid or the server is not accessible, it's safer to bail
         # out right now.
         raise gclient_utils.Error('This url is unreachable: %s' % url)
       can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
                     and (from_info['UUID'] == to_info['UUID']))
       if can_switch:
@@ skipping 21 matching lines @@
                                     "don't match and there is local changes "
                                     "in %s. Delete the directory and "
                                     "try again." % (url, checkout_path))
         # Ok delete it.
         print("\n_____ switching %s to a new checkout" % self.relpath)
         gclient_utils.RemoveDirectory(checkout_path)
         # We need to checkout.
         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
 
 
     # If the provided url has a revision number that matches the revision
     # number of the existing directory, then we don't need to bother updating.
     if not options.force and str(from_info['Revision']) == revision:
       if options.verbose or not forced_revision:
         print("\n_____ %s%s" % (self.relpath, rev_str))
       return
 
     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.
 
     All reverted files will be appended to file_list, even if Subversion
     doesn't know about them.
     """
     path = os.path.join(self._root_dir, self.relpath)
     if not os.path.isdir(path):
       # svn revert won't work if the directory doesn't exist. It needs to
@@ skipping 30 matching lines @@
           gclient_utils.RemoveDirectory(file_path)
         else:
           logging.error('no idea what is %s.\nYou just found a bug in gclient'
                         ', please ping maruel@chromium.org ASAP!' % file_path)
       except EnvironmentError:
         logging.error('Failed to remove %s.' % file_path)
 
     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
       # exception.
       logging.error('Failed to update:\n%s' % str(e))
 
   def runhooks(self, options, args, file_list):
     self.status(options, args, file_list)
 
   def status(self, options, args, file_list):
     """Display status information."""
     path = os.path.join(self._root_dir, self.relpath)
     command = ['status']
     command.extend(args)
     if not os.path.isdir(path):
       # svn status won't work if the directory doesn't exist.
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.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
     repository."""
     path = os.path.join(self._root_dir, self.relpath)
     command = ['diff']
     command.extend(args)
     # Simple class which tracks which file is being diffed and
     # replaces instances of its file name in the original and
     # working copy lines of the svn diff output.
@@ skipping 129 matching lines @@
   stderr = None
   if not print_error:
     stderr = subprocess.PIPE
   return subprocess.Popen(c,
                           cwd=in_directory,
                           shell=(sys.platform == 'win32'),
                           stdout=subprocess.PIPE,
                           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".
 
   svn's stdout is parsed to collect a list of files checked out or updated.
   These files are appended to file_list.  svn's stdout is also printed to
   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.
 
   Raises:
     Error: An error occurred while running the svn command.
   """
   command = [SVN_COMMAND]
   command.extend(args)
 
   # svn update and svn checkout use the same pattern: the first three columns
@@ skipping 19 matching lines @@
 
   compiled_pattern = re.compile(pattern)
 
   def CaptureMatchingLines(line):
     match = compiled_pattern.search(line)
     if match:
       file_list.append(match.group(1))
 
   RunSVNAndFilterOutput(args,
                         in_directory,
-                        options.verbose,
+                        True,
                         True,
                         CaptureMatchingLines)
 
 def RunSVNAndFilterOutput(args,
                           in_directory,
                           print_messages,
                           print_stdout,
                           filter):
   """Runs svn checkout, update, status, or diff, optionally outputting
   to stdout.
@@ skipping 145 matching lines @@
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         # Col 4
         if wc_status[0].getAttribute('switched') == 'true':
           statuses[4] = 'S'
         # TODO(maruel): Col 5 and 6
         item = (''.join(statuses), file)
         results.append(item)
   return results