Remove 'options' usage from scm.py

scm.py

 # Copyright (c) 2006-2009 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import os
 import re
@@ skipping 368 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]
 
   @staticmethod
-  def RunAndGetFileList(options, args, in_directory, file_list):
+  def RunAndGetFileList(verbose, 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 Run.
 
     Args:
-      options: command line options to gclient
       args: A sequence of command line parameters to be passed to svn.

[nsylvain, 2010/08/16 16:51:45]

add verbose here?

       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
     # are for file status, property status, and lock status.  This is followed
@@ skipping 24 matching lines @@
       def CaptureMatchingLines(line):
         match = compiled_pattern.search(line)
         if match:
           file_list.append(match.group(1))
         if line.startswith('svn: '):
           failure.append(line)
 
       try:
         SVN.RunAndFilterOutput(args,
                                in_directory,
-                               options.verbose,
+                               verbose,
                                True,
                                CaptureMatchingLines)
       except gclient_utils.Error:
         # Subversion client is really misbehaving with Google Code.
         if args[0] == 'checkout':
           # Ensure at least one file was checked out, otherwise *delete* the
           # directory.
           if len(file_list) == previous_list_len:
             for x in failure:
               if ('502 Bad Gateway' in x or
@@ skipping 484 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)