Remove scm.SVN.Run() and all stdout argument to more calls.

gclient_scm.py

 # 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 652 matching lines @@
                                 (args[0], sp.returncode))
     if output is not None:
       return output.strip()
 
 
 class SVNWrapper(SCMWrapper):
   """ Wrapper for SVN """
 
   def cleanup(self, options, args, file_list):
     """Cleanup working copy."""
-    scm.SVN.Run(['cleanup'] + args,
-                cwd=os.path.join(self._root_dir, self.relpath))
+    self._Run(['cleanup'] + args, options)
 
   def diff(self, options, args, file_list):
     # NOTE: This function does not currently modify file_list.
     path = os.path.join(self._root_dir, self.relpath)
     if not os.path.isdir(path):
       raise gclient_utils.Error('Directory %s is not present.' % path)
-    scm.SVN.Run(['diff'] + args, cwd=path)
+    self._Run(['diff'] + args, options)
 
   def export(self, options, args, file_list):
     """Export a clean directory tree into the given path."""
     assert len(args) == 1
     export_path = os.path.abspath(os.path.join(args[0], self.relpath))
     try:
       os.makedirs(export_path)
     except OSError:
       pass
     assert os.path.exists(export_path)
-    scm.SVN.Run(['export', '--force', '.', export_path],
-                cwd=os.path.join(self._root_dir, self.relpath))
+    self._Run(['export', '--force', '.', export_path], options)
 
   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)
     if not os.path.isdir(path):
       raise gclient_utils.Error('Directory %s is not present.' % path)
     command = ['svn', 'diff', '-x', '--ignore-eol-style']
     command.extend(args)
 
@@ skipping 34 matching lines @@
       url = '%s@%s' % (url, revision)
       rev_str = ' at %s' % revision
     else:
       forced_revision = False
       rev_str = ''
 
     if not os.path.exists(checkout_path):
       # We need to checkout.
       command = ['checkout', url, checkout_path]
       command = self._AddAdditionalUpdateFlags(command, options, revision)
-      scm.SVN.RunAndGetFileList(options.verbose, command, self._root_dir,
-          file_list)
+      self._RunAndGetFileList(command, options, file_list, self._root_dir)
       return
 
     # Get the existing scm url and the revision number of the current checkout.
     from_info = scm.SVN.CaptureInfo(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)
 
     # Look for locked directories.
     dir_info = scm.SVN.CaptureStatus(os.path.join(checkout_path, '.'))
     if [True for d in dir_info if d[0][2] == 'L' and d[1] == checkout_path]:
       # The current directory is locked, clean it up.
-      scm.SVN.Run(['cleanup'], cwd=checkout_path)
+      self._Run(['cleanup'], options)
 
     # Retrieve the current HEAD version because svn is slow at null updates.
     if options.manually_grab_svn_rev and not revision:
       from_info_live = scm.SVN.CaptureInfo(from_info['URL'], '.')
       revision = str(from_info_live['Revision'])
       rev_str = ' at %s' % revision
 
     if from_info['URL'] != base_url:
       # The repository url changed, need to switch.
       to_info = scm.SVN.CaptureInfo(url, '.')
@@ skipping 11 matching lines @@
         # to reflect where we "are now."  (This is the same way that
         # Subversion itself handles the metadata when switch --relocate
         # is used.)  This makes the checks below for whether we
         # can update to a revision or have to switch to a different
         # branch work as expected.
         # TODO(maruel):  TEST ME !
         command = ['switch', '--relocate',
                    from_info['Repository Root'],
                    to_info['Repository Root'],
                    self.relpath]
-        scm.SVN.Run(command, cwd=self._root_dir)
+        self._Run(command, options, cwd=self._root_dir)
         from_info['URL'] = from_info['URL'].replace(
             from_info['Repository Root'],
             to_info['Repository Root'])
       else:
         if not options.force and not options.reset:
           # Look for local modifications but ignore unversioned files.
           for status in scm.SVN.CaptureStatus(checkout_path):
             if status[0] != '?':
               raise gclient_utils.Error(
                   ('Can\'t switch the checkout to %s; UUID 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]
         command = self._AddAdditionalUpdateFlags(command, options, revision)
-        scm.SVN.RunAndGetFileList(options.verbose, command, self._root_dir,
-            file_list)
+        self._RunAndGetFileList(command, options, file_list, self._root_dir)
         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]
     command = self._AddAdditionalUpdateFlags(command, options, revision)
-    scm.SVN.RunAndGetFileList(options.verbose, command, self._root_dir,
-        file_list)
+    self._RunAndGetFileList(command, options, file_list, self._root_dir)
 
   def updatesingle(self, options, args, file_list):
     checkout_path = os.path.join(self._root_dir, self.relpath)
     filename = args.pop()
     if scm.SVN.AssertVersion("1.5")[0]:
       if not os.path.exists(os.path.join(checkout_path, '.svn')):
         # Create an empty checkout and then update the one file we want.  Future
         # operations will only apply to the one file we checked out.
         command = ["checkout", "--depth", "empty", self.url, checkout_path]
-        scm.SVN.Run(command, cwd=self._root_dir)
+        self._Run(command, options, cwd=self._root_dir)
         if os.path.exists(os.path.join(checkout_path, filename)):
           os.remove(os.path.join(checkout_path, filename))
         command = ["update", filename]
-        scm.SVN.RunAndGetFileList(options.verbose, command, checkout_path,
-            file_list)
+        self._RunAndGetFileList(command, options, file_list)
       # After the initial checkout, we can use update as if it were any other
       # dep.
       self.update(options, args, file_list)
     else:
       # If the installed version of SVN doesn't support --depth, fallback to
       # just exporting the file.  This has the downside that revision
       # information is not stored next to the file, so we will have to
       # re-export the file every time we sync.
       if not os.path.exists(checkout_path):
         os.makedirs(checkout_path)
       command = ["export", os.path.join(self.url, filename),
                  os.path.join(checkout_path, filename)]
       command = self._AddAdditionalUpdateFlags(command, options,
           options.revision)
-      scm.SVN.Run(command, cwd=self._root_dir)
+      self._Run(command, options, cwd=self._root_dir)
 
   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 42 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.
-      scm.SVN.RunAndGetFileList(options.verbose,
-                                ['update', '--revision', 'BASE'], path,
-                                file_list)
+      self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
+          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 revinfo(self, options, args, file_list):
     """Display revision"""
     return scm.SVN.CaptureBaseRevision(self.checkout_path)
 
   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)
+    command = ['status'] + 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:
-      scm.SVN.RunAndGetFileList(options.verbose, command, path, file_list)
+      self._RunAndGetFileList(command, options, file_list)
 
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url
 
+  def _Run(self, args, options, **kwargs):
+    """Runs a commands that goes to stdout."""
+    kwargs.setdefault('cwd', os.path.join(self._root_dir, self.relpath))
+    gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
+        always=options.verbose, stdout=options.stdout, **kwargs)
+
+  def _RunAndGetFileList(self, args, options, file_list, cwd=None):
+    """Runs a commands that goes to stdout and grabs the file listed."""
+    cwd = cwd or os.path.join(self._root_dir, self.relpath)
+    scm.SVN.RunAndGetFileList(options.verbose, args, cwd=cwd,
+        file_list=file_list, stdout=options.stdout)
+
   @staticmethod
   def _AddAdditionalUpdateFlags(command, options, revision):
     """Add additional flags to command depending on what options are set.
     command should be a list of strings that represents an svn command.
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command