Add a flag not print errors in CaptureSVN()

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 473 matching lines @@
 
   Raises:
     Error: An error occurred while running the svn command.
   """
   c = [SVN_COMMAND]
   c.extend(args)
 
   SubprocessCall(c, in_directory)
 
 
-def CaptureSVN(args, in_directory):
+def CaptureSVN(args, in_directory=None, print_error=True):
   """Runs svn, capturing output sent to stdout as a string.
 
   Args:
     args: A sequence of command line parameters to be passed to svn.
     in_directory: The directory where svn is to be run.
 
   Returns:
     The output sent to stdout as a string.
   """
   c = [SVN_COMMAND]
   c.extend(args)
 
   # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for
   # the svn.exe executable, but shell=True makes subprocess on Linux fail
   # when it's called with a list because it only tries to execute the
   # first string ("svn").
+  stderr = None
+  if print_error:
+    stderr = subprocess.PIPE
   return subprocess.Popen(c,
                           cwd=in_directory,
                           shell=(sys.platform == 'win32'),
-                          stdout=subprocess.PIPE).communicate()[0]
+                          stdout=subprocess.PIPE,
+                          stderr=stderr).communicate()[0]
 
 
 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.
@@ skipping 28 matching lines @@
         'status':   status_pattern,
         'update':   update_pattern,
       }[args[0]]
 
   SubprocessCallAndCapture(command,
                            in_directory,
                            pattern=pattern,
                            capture_list=file_list)
 
 
-def CaptureSVNInfo(relpath, in_directory=None):
+def CaptureSVNInfo(relpath, in_directory=None, print_error=True):
   """Returns a dictionary from the svn info output for the given file.
 
   Args:
     relpath: The directory where the working copy resides relative to
       the directory given by in_directory.
     in_directory: The directory where svn is to be run.
   """
-  output = CaptureSVN(["info", "--xml", relpath], in_directory)
+  output = CaptureSVN(["info", "--xml", relpath], in_directory, print_error)
   dom = ParseXML(output)
   result = {}
   if dom:
     def C(item, f):
       if item is not None: return f(item)
     # /info/entry/
     #   url
     #   reposityory/(root|uuid)
     #   wc-info/(schedule|depth)
     #   commit/(author|date)
@@ skipping 1127 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: